Skip to content

Commit 8229144

Browse files
committed
#1891: Update ci scrips and cmake config files
1 parent 0ce0475 commit 8229144

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

ci/build_cpp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
120120
-DCMAKE_CXX_COMPILER="${CXX:-c++}" \
121121
-DCMAKE_C_COMPILER="${CC:-cc}" \
122122
-DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS:-}" \
123-
-Dcheckpoint_DIR="$CHECKPOINT_BUILD/install" \
123+
-Dcheckpoint_ROOT="$CHECKPOINT_BUILD/install" \
124124
-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH:-}" \
125125
-DCMAKE_INSTALL_PREFIX="$VT_BUILD/install" \
126126
-Dvt_ci_build="${VT_CI_BUILD:-0}" \

ci/ctest_job_script.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ set(configureOpts
148148
"-DCMAKE_CXX_COMPILER=$ENV{CXX}"
149149
"-DCMAKE_C_COMPILER=$ENV{CC}"
150150
"-DCMAKE_EXE_LINKER_FLAGS=$ENV{CMAKE_EXE_LINKER_FLAGS}"
151-
"-Dcheckpoint_DIR=$ENV{CHECKPOINT_BUILD}/install"
151+
"-Dcheckpoint_ROOT=$ENV{CHECKPOINT_BUILD}/install"
152152
"-DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}"
153153
"-DCMAKE_INSTALL_PREFIX=$ENV{VT_BUILD}/install"
154154
"-Dvt_ci_build=$ENV{VT_CI_BUILD}"

cmake/local_package.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
macro(find_package_local pkg_name pkg_other_name)
2+
set(${pkg_name}_PACKAGE_LOADED 0)
23
if(hasParent)
34
# Skip this logic when this macro was not invoked from the
45
# top-level CMakeLists.txt file under the assumption that this
@@ -21,5 +22,6 @@ macro(find_package_local pkg_name pkg_other_name)
2122
QUIET
2223
REQUIRED
2324
)
25+
set(${pkg_name}_PACKAGE_LOADED 1)
2426
endif()
2527
endmacro(find_package_local)

0 commit comments

Comments
 (0)