Skip to content

Commit 7174c1f

Browse files
committed
more build fixes
1 parent d762582 commit 7174c1f

4 files changed

Lines changed: 26 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@ if(USE_CONAN AND CONAN_TOOLCHAIN_FOUND)
135135
list(APPEND CONAN_LIBS RxCpp::RxCpp)
136136
message(STATUS "Found rxcpp from Conan")
137137
endif()
138+
# Add openssl explicitly to ensure headers are available
139+
if(TARGET openssl::openssl)
140+
list(APPEND CONAN_LIBS openssl::openssl)
141+
message(STATUS "Found openssl from Conan")
142+
endif()
138143
else()
139144
message(FATAL_ERROR "Required Conan packages not found as targets")
140145
if(NOT TARGET fmt::fmt)

scripts/build.bat

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,26 @@ cd "%BUILD_DIR%"
1515
REM Install dependencies with Conan if not already done
1616
if not exist "conan_toolchain.cmake" if not exist "generators\conan_toolchain.cmake" (
1717
echo Installing dependencies with Conan...
18-
conan install .. --build=missing --output-folder=. -s build_type=%BUILD_TYPE%
18+
conan install .. --build=missing --output-folder=. -s build_type=%BUILD_TYPE% -s compiler.cppstd=20
19+
if errorlevel 1 (
20+
echo ERROR: Conan install failed
21+
exit /b 1
22+
)
1923
)
2024

2125
REM Configure
2226
cmake .. -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_CXX_STANDARD=20
27+
if errorlevel 1 (
28+
echo ERROR: CMake configuration failed
29+
exit /b 1
30+
)
2331

2432
REM Build
2533
cmake --build . --config %BUILD_TYPE%
34+
if errorlevel 1 (
35+
echo ERROR: CMake build failed
36+
exit /b 1
37+
)
2638

2739
echo Build complete! Binaries are in %BUILD_DIR%\bin\Release
2840

scripts/start-influxdb.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ cd /d %~dp0\..
55

66
echo Starting InfluxDB with docker-compose...
77
docker-compose up -d
8+
if errorlevel 1 (
9+
echo ERROR: Failed to start InfluxDB
10+
exit /b 1
11+
)
812

913
echo Waiting for InfluxDB to be ready...
1014
timeout /t 5 /nobreak >nul

scripts/stop-influxdb.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ cd /d %~dp0\..
55

66
echo Stopping InfluxDB...
77
docker-compose down
8+
if errorlevel 1 (
9+
echo WARNING: Failed to stop InfluxDB properly
10+
exit /b 1
11+
)
812

913
echo InfluxDB stopped.
1014

0 commit comments

Comments
 (0)