From a68af641bd965fbdd8eddac300f3908c41ad0f2a Mon Sep 17 00:00:00 2001 From: Tom Benson Date: Mon, 6 May 2024 11:01:16 -0400 Subject: [PATCH] Fix existing-source builds of Clara --- scripts/superbuild/CMakeLists.txt | 2 -- scripts/superbuild/clara/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/superbuild/CMakeLists.txt b/scripts/superbuild/CMakeLists.txt index a4506ca2d23..1231c0f0efa 100644 --- a/scripts/superbuild/CMakeLists.txt +++ b/scripts/superbuild/CMakeLists.txt @@ -106,8 +106,6 @@ lbann_sb_add_packages( # {Conduit, OpenCV, Hydrogen}, so I'm just going to let you do that). # Add the TPL subdirectories -set(_GIT_REPOSITORY_TAG "GIT_REPOSITORY") -set(_GIT_TAG_TAG "GIT_TAG") foreach (pkg ${LBANN_SB_BUILD_PKGS}) if (LBANN_SB_BUILD_${pkg}) string(TOLOWER "${pkg}" pkg_lower) diff --git a/scripts/superbuild/clara/CMakeLists.txt b/scripts/superbuild/clara/CMakeLists.txt index 4c9fe65cfa5..215425c2517 100644 --- a/scripts/superbuild/clara/CMakeLists.txt +++ b/scripts/superbuild/clara/CMakeLists.txt @@ -40,8 +40,8 @@ ExternalProject_Add(Clara INSTALL_DIR ${LBANN_SB_Clara_PREFIX} BUILD_IN_SOURCE 1 - ${_GIT_REPOSITORY_TAG} ${LBANN_SB_Clara_URL} - ${_GIT_TAG_TAG} ${LBANN_SB_Clara_TAG} + ${LBANN_SB_GIT_REPOSITORY_TAG} ${LBANN_SB_Clara_URL} + ${LBANN_SB_GIT_TAG_TAG} ${LBANN_SB_Clara_TAG} USES_TERMINAL_INSTALL 1 LOG_DOWNLOAD 1