COMP: Fix extensions build ensuring build-type is set

Fixes a regression introduced in 7ed6f2f (COMP: Remove obsolete EXTENSION_COMMAND_BUILD_CONF_ARG_LIST CMake var).
mhdiop · Sep 26, 2023 · 89eae31 · 89eae31
1 parent 23df3ce
commit 89eae31
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Extensions/CMake/SlicerBlockBuildPackageAndUploadExtensions.cmake b/Extensions/CMake/SlicerBlockBuildPackageAndUploadExtensions.cmake
@@ -236,7 +236,7 @@ foreach(EXTENSION_NAME ${EXTENSION_LIST})
     SOURCE_DIR ${EXTENSION_SOURCE_DIR}
     BINARY_DIR ${EXTENSION_SUPERBUILD_BINARY_DIR}
     CONFIGURE_COMMAND ""
-    BUILD_COMMAND ${CMAKE_COMMAND} -DCTEST_BUILD_CONFIGURATION=${CTEST_BUILD_CONFIGURATION} -P ${build_extension_wrapper_script}
+    BUILD_COMMAND ${CMAKE_COMMAND} -DCTEST_BUILD_CONFIGURATION=$<CONFIG> -P ${build_extension_wrapper_script}
     INSTALL_COMMAND ""
     ${EP_ARG_EXTENSION_DEPENDS}
     )

diff --git a/Extensions/CMake/SlicerBlockUploadExtension.cmake b/Extensions/CMake/SlicerBlockUploadExtension.cmake
@@ -129,8 +129,7 @@ if(CTEST_EXTRA_VERBOSE)
 endif()
 
 #-----------------------------------------------------------------------------
-# The CTEST_BUILD_CONFIGURATION variable associated with the upload and test commands
-# defined below is set in the extension dashboard script.
+set(dollar "$")
 set(EXTENSION_COMMAND_BUILD_CONF_WRAPPER_ARG_LIST
   -C ${dollar}{CTEST_BUILD_CONFIGURATION}
   -DCTEST_BUILD_CONFIGURATION:STRING=${dollar}{CTEST_BUILD_CONFIGURATION}