fix obsolete usage of ${proj}_EXTRA_CMAKE_ARGS_LIST

The user is instructed to set ${proj}_EXTRA_CMAKE_ARGS. We forgot to remove usage of ${proj}_EXTRA_CMAKE_ARGS_LIST for all projects except ITK. Fixes SyneRBI#616
KrisThielemans · Aug 20, 2021 · 027e1b1 · 027e1b1
1 parent da27720
commit 027e1b1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/CMake/SetExternalProjectFlags.cmake b/CMake/SetExternalProjectFlags.cmake
@@ -23,8 +23,7 @@
 
 macro(SetExternalProjectFlags proj)
 
-	set(${proj}_EXTRA_CMAKE_ARGS "" CACHE STRING "Optional extra CMake arguments to be appended to the flags set by the SuperBuild(use semi-colons for multiple arguments)")
+	set(${proj}_EXTRA_CMAKE_ARGS "" CACHE STRING "Optional extra CMake arguments to be appended to the flags set by the SuperBuild (use semi-colons for multiple arguments)")
 	mark_as_advanced(${proj}_EXTRA_CMAKE_ARGS)
-	# string(REPLACE " " ";" ${proj}_EXTRA_CMAKE_ARGS_LIST "${${proj}_EXTRA_CMAKE_ARGS}")
 	message(STATUS ${proj}_EXTRA_CMAKE_ARGS= "${${proj}_EXTRA_CMAKE_ARGS}")
 endmacro()
diff --git a/SuperBuild/External_JSON.cmake b/SuperBuild/External_JSON.cmake
@@ -45,7 +45,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
     ${${proj}_EP_ARGS_DIRS}
     CMAKE_ARGS
       -DJSON_BuildTests:BOOL=${BUILD_TESTING_${proj}}
-       ${${proj}_EXTRA_CMAKE_ARGS_LIST}
+       ${${proj}_EXTRA_CMAKE_ARGS}
     DEPENDS ${${proj}_DEPENDENCIES}
   )
 

diff --git a/SuperBuild/External_NIFTYREG.cmake b/SuperBuild/External_NIFTYREG.cmake
@@ -73,7 +73,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
       -DUSE_OPENMP:BOOL=${${proj}_ENABLE_OPENMP}
       -DBUILD_ALL_DEP:BOOL=ON
       -DUSE_CUDA:BOOL=${${proj}_USE_CUDA}
-       ${${proj}_EXTRA_CMAKE_ARGS_LIST}
+       ${${proj}_EXTRA_CMAKE_ARGS}
     DEPENDS ${${proj}_DEPENDENCIES})
 
     set(${proj}_ROOT        ${${proj}_SOURCE_DIR})

diff --git a/SuperBuild/External_NiftyPET.cmake b/SuperBuild/External_NiftyPET.cmake
@@ -71,7 +71,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
       -DPYTHON_EXECUTABLE=${NiftyPET_PYTHON_EXECUTABLE}
       -DPYTHON_INCLUDE_DIR:PATH=${NiftyPET_PYTHON_INCLUDE_DIR}
       -DPYTHON_LIBRARY=${NiftyPET_PYTHON_LIBRARY}
-      ${${proj}_EXTRA_CMAKE_ARGS_LIST}
+      ${${proj}_EXTRA_CMAKE_ARGS}
     DEPENDS
         ${${proj}_DEPENDENCIES}
 

diff --git a/SuperBuild/External_SIRF.cmake b/SuperBuild/External_SIRF.cmake
@@ -106,7 +106,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
       -DOPENMP_LIBRARIES:PATH=${OPENMP_LIBRARIES}
 		  ${extra_args}
       -DGadgetron_USE_CUDA=${Gadgetron_USE_CUDA}
-      ${${proj}_EXTRA_CMAKE_ARGS_LIST}
+      ${${proj}_EXTRA_CMAKE_ARGS}
     DEPENDS
         ${${proj}_DEPENDENCIES}
   )

diff --git a/SuperBuild/External_STIR.cmake b/SuperBuild/External_STIR.cmake
@@ -141,7 +141,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
        ${STIR_CMAKE_ARGS}
        ${Boost_CMAKE_ARGS}
        ${HDF5_CMAKE_ARGS}
-       ${${proj}_EXTRA_CMAKE_ARGS_LIST}
+       ${${proj}_EXTRA_CMAKE_ARGS}
     DEPENDS
         ${${proj}_DEPENDENCIES}
   )

diff --git a/SuperBuild/External_TomoPhantom.cmake b/SuperBuild/External_TomoPhantom.cmake
@@ -54,7 +54,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
         ${PYTHONLIBS_CMAKE_ARGS}
     	-DPYTHON_DEST_DIR:PATH=${PYTHON_DEST_DIR}
     	-DPYTHON_STRATEGY=${PYTHON_STRATEGY}
-      ${${proj}_EXTRA_CMAKE_ARGS_LIST}
+      ${${proj}_EXTRA_CMAKE_ARGS}
     # TODO this relies on using "make", but we could be build with something else
     #INSTALL_COMMAND make TomoPhantom
     DEPENDS

diff --git a/SuperBuild/External_parallelproj.cmake b/SuperBuild/External_parallelproj.cmake
@@ -53,7 +53,7 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
     ${${proj}_EP_ARGS_DIRS}
 
     CMAKE_ARGS ${${proj}_CMAKE_ARGS}
-    ${${proj}_EXTRA_CMAKE_ARGS_LIST}
+    ${${proj}_EXTRA_CMAKE_ARGS}
     DEPENDS
         ${${proj}_DEPENDENCIES}
   )