Skip to content

Commit a8229dd

Browse files
committed
Update for CMake 4
Tilde-expansion isn't done by CMake anymore
1 parent b7987c4 commit a8229dd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -387,14 +387,14 @@ jobs:
387387
run: |
388388
cd "$BOOST_ROOT"
389389
mkdir __build_cmake_install_test__ && cd __build_cmake_install_test__
390-
cmake -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBOOST_INCLUDE_LIBRARIES=$SELF -DBUILD_SHARED_LIBS=${{matrix.build_shared}} -DCMAKE_INSTALL_PREFIX=~/.local -DBoost_VERBOSE=ON -DBoost_DEBUG=ON ..
390+
cmake -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBOOST_INCLUDE_LIBRARIES=$SELF -DBUILD_SHARED_LIBS=${{matrix.build_shared}} -DCMAKE_INSTALL_PREFIX=$HOME/local -DBoost_VERBOSE=ON -DBoost_DEBUG=ON ..
391391
cmake --build . --target install --config ${{matrix.build_type}} -j$B2_JOBS
392392
- name: Run CMake install tests
393393
run: |
394394
cmake_test_folder="$BOOST_ROOT/libs/$SELF/test/cmake_test" # New unified folder
395395
[ -d "$cmake_test_folder" ] || cmake_test_folder="$BOOST_ROOT/libs/$SELF/test/cmake_install_test"
396396
cd "$cmake_test_folder"
397397
mkdir __build_cmake_install_test__ && cd __build_cmake_install_test__
398-
cmake -G "${{matrix.generator}}" -DBOOST_CI_INSTALL_TEST=ON -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.build_shared}} -DCMAKE_PREFIX_PATH=~/.local ..
398+
cmake -G "${{matrix.generator}}" -DBOOST_CI_INSTALL_TEST=ON -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.build_shared}} -DCMAKE_PREFIX_PATH=$HOME/local ..
399399
cmake --build . --config ${{matrix.build_type}} -j$B2_JOBS
400400
ctest --output-on-failure --build-config ${{matrix.build_type}}

.github/workflows/ci_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
- name: Configure
9797
working-directory: build
9898
run: |
99-
extraFlags="-DBoost_DEBUG=ON -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_INSTALL_PREFIX=~/.local"
99+
extraFlags="-DBoost_DEBUG=ON -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_INSTALL_PREFIX=$HOME/local"
100100
if ! [[ "${{matrix.generator}}" =~ "Visual Studio" ]]; then
101101
# Enable warning to find missing defines, especially important for the standalone version
102102
extraFlags="$extraFlags -DCMAKE_CXX_FLAGS=-Wundef"
@@ -124,7 +124,7 @@ jobs:
124124
working-directory: build
125125
run: |
126126
rm -r *
127-
cmake -DBOOST_NOWIDE_INSTALL_TEST=ON -DBoost_ARCHITECTURE=-x64 -DCMAKE_PREFIX_PATH=~/.local -G "${{matrix.generator}}" ../test/cmake_test
127+
cmake -DBOOST_NOWIDE_INSTALL_TEST=ON -DBoost_ARCHITECTURE=-x64 -DCMAKE_PREFIX_PATH=$HOME/local -G "${{matrix.generator}}" ../test/cmake_test
128128
cmake --build . --config ${{matrix.buildType}}
129129
ctest --output-on-failure -C ${{matrix.buildType}}
130130

0 commit comments

Comments
 (0)