#1891: Update ci scrips and cmake config files

DARMA-tasking · Sep 20, 2024 · 023edc8 · 023edc8
1 parent 136de2e
commit 023edc8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -120,7 +120,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
       -DCMAKE_CXX_COMPILER="${CXX:-c++}" \
       -DCMAKE_C_COMPILER="${CC:-cc}" \
       -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS:-}" \
-      -Dcheckpoint_DIR="$CHECKPOINT_BUILD/install" \
+      -Dcheckpoint_ROOT="$CHECKPOINT_BUILD/install" \
       -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH:-}" \
       -DCMAKE_INSTALL_PREFIX="$VT_BUILD/install" \
       -Dvt_ci_build="${VT_CI_BUILD:-0}" \

diff --git a/ci/ctest_job_script.cmake b/ci/ctest_job_script.cmake
@@ -148,7 +148,7 @@ set(configureOpts
     "-DCMAKE_CXX_COMPILER=$ENV{CXX}"
     "-DCMAKE_C_COMPILER=$ENV{CC}"
     "-DCMAKE_EXE_LINKER_FLAGS=$ENV{CMAKE_EXE_LINKER_FLAGS}"
-    "-Dcheckpoint_DIR=$ENV{CHECKPOINT_BUILD}/install"
+    "-Dcheckpoint_ROOT=$ENV{CHECKPOINT_BUILD}/install"
     "-DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}"
     "-DCMAKE_INSTALL_PREFIX=$ENV{VT_BUILD}/install"
     "-Dvt_ci_build=$ENV{VT_CI_BUILD}"

diff --git a/cmake/local_package.cmake b/cmake/local_package.cmake
@@ -1,4 +1,5 @@
 macro(find_package_local pkg_name pkg_other_name)
+  set(${pkg_name}_PACKAGE_LOADED 0)
   if(hasParent)
     # Skip this logic when this macro was not invoked from the
     # top-level CMakeLists.txt file under the assumption that this
@@ -21,5 +22,6 @@ macro(find_package_local pkg_name pkg_other_name)
       QUIET
       REQUIRED
     )
+    set(${pkg_name}_PACKAGE_LOADED 1)
   endif()
 endmacro(find_package_local)