Skip to content

Commit

Permalink
try using env variables'
Browse files Browse the repository at this point in the history
  • Loading branch information
cwaldren-ld committed Oct 2, 2024
1 parent 2d25c68 commit ce0cda0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ jobs:
# so that the test projects will know where to find Boost and OpenSSL. More info in the README.
BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
- name: Run CMake Integration Tests
- run: |
export CTEST_OUTPUT_ON_FAILURE=1
cd build/cmake-tests && ctest
env:
# Note: these are consumed by the SDK's CMake project, and then will be passed into the cmake integration tests
# so that the test projects will know where to find Boost and OpenSSL. More info in the README.
BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
4 changes: 0 additions & 4 deletions cmake-tests/declareProjectTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ macro(declare_add_subdirectory_test name)
-DLAUNCHDARKLY_SOURCE_DIR=${PROJECT_SOURCE_DIR}
# Do not setup all of the SDK's testing machinery, which would normally happen when calling add_subdirectory.
-DBUILD_TESTING=OFF
# Forward variables from the SDK project to the test project, if set.
$<$<BOOL:${CMAKE_GENERATOR_PLATFORM}>:-DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}>
${CMAKE_CURRENT_SOURCE_DIR}/project
)

Expand Down Expand Up @@ -78,8 +76,6 @@ macro(declare_find_package_test name)
# Since project/CMakeLists.txt uses find_package(), it needs to know where to find
# ldserverapiConfig.cmake. That can be found where the SDK is installed, which is CMAKE_INSTALL_PREFIX.
-DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX}
# Forward variables from the SDK project to the test project, if set.
$<$<BOOL:${CMAKE_GENERATOR_PLATFORM}>:-DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}>
${CMAKE_CURRENT_SOURCE_DIR}/project
)

Expand Down

0 comments on commit ce0cda0

Please sign in to comment.