Skip to content

Commit bc5db53

Browse files
committed
#2474: cmake: try a different solution due to cmake version not supporting policy
1 parent 1d09389 commit bc5db53

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

ci/build_cpp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
172172
-Dvt_tests_num_nodes="${VT_TESTS_NUM_NODES:-}" \
173173
-Dvt_external_fmt="${VT_EXTERNAL_FMT:-0}" \
174174
-Dfmt_DIR="${FMT_DIR}" \
175-
-DLIBUNWIND_ROOT="${LIBUNWIND_ROOT:-/usr}" \
175+
-DLIBUNWIND_ROOT="${libunwind_ROOT:-/usr}" \
176176
-Dvt_no_color_enabled="${VT_NO_COLOR_ENABLED:-0}" \
177177
-DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
178178
-DBUILD_SHARED_LIBS="${BUILD_SHARED_LIBS:-0}" \

cmake/load_libunwind.cmake

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
set(vt_feature_cmake_libunwind "0")
22

3-
cmake_policy(PUSH)
4-
5-
cmake_policy(SET CMP0144 NEW)
6-
7-
if(NOT DEFINED LIBUNWIND_ROOT)
8-
set(LIBUNWIND_ROOT "/usr")
3+
if(NOT DEFINED libunwind_ROOT)
4+
set(libunwind_ROOT "/usr")
95
endif()
106

117
find_package(libunwind)
128

13-
cmake_policy(POP)
14-
15-
if(LIBUNWIND_FOUND)
9+
if(libunwind_FOUND)
1610
set(vt_feature_cmake_libunwind "1")
1711
endif()

0 commit comments

Comments
 (0)