Parcourir la source

BUG: Fix SuperBuild.cmake - ctk_*_bool_vars were generated using the wrong list.

"CTK_{LIBS, PLUGINS, APPLICATIONS}_SUBDIRS" is now used instead of "ctk_{libs, plugins, applications}"
Jean-Christophe Fillion-Robin il y a 15 ans
Parent
commit
3da0354bf9
1 fichiers modifiés avec 8 ajouts et 3 suppressions
  1. 8 3
      SuperBuild.cmake

+ 8 - 3
SuperBuild.cmake

@@ -327,17 +327,17 @@ ExternalProject_Add(${proj}
 # Generate cmake variable name corresponding to Libs, Plugins and Applications
 # Generate cmake variable name corresponding to Libs, Plugins and Applications
 #
 #
 SET(ctk_libs_bool_vars)
 SET(ctk_libs_bool_vars)
-FOREACH(lib ${ctk_libs})
+FOREACH(lib ${CTK_LIBS_SUBDIRS})
   LIST(APPEND ctk_libs_bool_vars CTK_LIB_${lib})
   LIST(APPEND ctk_libs_bool_vars CTK_LIB_${lib})
 ENDFOREACH()
 ENDFOREACH()
 
 
 SET(ctk_plugins_bool_vars)
 SET(ctk_plugins_bool_vars)
-FOREACH(plugin ${ctk_plugins})
+FOREACH(plugin ${CTK_PLUGINS_SUBDIRS})
   LIST(APPEND ctk_plugins_bool_vars CTK_PLUGIN_${plugin})
   LIST(APPEND ctk_plugins_bool_vars CTK_PLUGIN_${plugin})
 ENDFOREACH()
 ENDFOREACH()
 
 
 SET(ctk_applications_bool_vars)
 SET(ctk_applications_bool_vars)
-FOREACH(app ${ctk_applications})
+FOREACH(app ${CTK_APPLICATIONS_SUBDIRS})
   LIST(APPEND ctk_applications_bool_vars CTK_APP_${app})
   LIST(APPEND ctk_applications_bool_vars CTK_APP_${app})
 ENDFOREACH()
 ENDFOREACH()
 
 
@@ -369,6 +369,11 @@ FOREACH(ctk_cmake_arg ${ctk_cmake_boolean_args})
   LIST(APPEND ctk_superbuild_boolean_args -D${ctk_cmake_arg}:BOOL=${superbuild_${ctk_cmake_arg}})
   LIST(APPEND ctk_superbuild_boolean_args -D${ctk_cmake_arg}:BOOL=${superbuild_${ctk_cmake_arg}})
 ENDFOREACH()
 ENDFOREACH()
 
 
+# MESSAGE("CMake args:")
+# FOREACH(arg ${ctk_superbuild_boolean_args})
+#   MESSAGE("  ${arg}")
+# ENDFOREACH()
+
 #-----------------------------------------------------------------------------
 #-----------------------------------------------------------------------------
 # CTK Configure
 # CTK Configure
 #
 #