boost_root instead of boost_include_dir

F2I-Consulting · Jul 26, 2024 · 5d5d9b9 · 5d5d9b9
1 parent 8b9c0a7
commit 5d5d9b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -211,17 +211,17 @@ jobs:
             sed -i 's/install (TARGETS avrogencpp RUNTIME DESTINATION bin)//' avro-cpp-1.11.3/CMakeLists.txt &&
             mkdir avro-build &&
             cd avro-build &&
-            cmake3 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=/boost-install -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/avro-install /avro-cpp-1.11.3 &&
+            cmake3 -Wno-dev -Wno-deprecated -DBoost_ROOT=/boost-install -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/avro-install /avro-cpp-1.11.3 &&
             cmake3 --build . -j2 --target avrocpp_s --config Release &&
             cmake3 --install . &&
             cd / &&
             mkdir build &&
             cd build &&
-            cmake3 -DCMAKE_BUILD_TYPE=Release -DBoost_INCLUDE_DIR=/boost-install -DAVRO_ROOT=/avro-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_PYTHON_WRAPPING=TRUE -DCMAKE_INSTALL_PREFIX:STRING=/fetpapi-install {project} &&
+            cmake3 -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=/boost-install -DAVRO_ROOT=/avro-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_PYTHON_WRAPPING=TRUE -DCMAKE_INSTALL_PREFIX:STRING=/fetpapi-install {project} &&
             cmake3 --build . -j2 --config Release &&
             cmake3 --install .
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
-            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/fesapi-install/lib64 &&
+            export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/fetpapi-install/lib64 &&
             auditwheel repair -w {dest_dir} {wheel}
         with:
           package-dir: ./python

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -151,6 +151,7 @@ if (WITH_ETP_SSL)
 		find_package(OpenSSL REQUIRED)
 	endif()
 	target_link_libraries(${PROJECT_NAME} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
+	# OpenSSL::applink is recommended under MSVC : https://cmake.org/cmake/help/latest/module/FindOpenSSL.html
 	if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 		target_link_libraries(${PROJECT_NAME} PRIVATE OpenSSL::applink)
 	endif ()