Ver código fonte

BUG: Fix ctkMacroGenerateDGraphInput, ctkMacroGenerateProjectXml and main CMakeLists to use of ${${option_name}} instead of ${option_name}

Jean-Christophe Fillion-Robin 15 anos atrás
pai
commit
4acb9a7bbb

+ 2 - 2
CMake/ctkMacroGenerateDGraphInput.cmake

@@ -27,8 +27,8 @@ MACRO(ctkMacroGenerateDGraphInput dir name target_directories)
       MESSAGE(FATAL_ERROR "Target directory ${target_dir}/CMakeLists.txt doesn't exists !")
     ENDIF()
 
-    IF(${option_name})
-    
+      SET(include_dep ${${option_name}})
+    IF(${include_dep})
       # extract project name from CMakeLists.txt
       FILE(STRINGS "${target_dir}/CMakeLists.txt" project_string
         REGEX "^ *(P|p)(R|r)(O|o)(J|j)(E|e)(C|c)(T|t)\\("

+ 1 - 1
CMake/ctkMacroGenerateProjectXml.cmake

@@ -29,7 +29,7 @@ MACRO(ctkMacroGenerateProjectXml dir name target_directories is_superbuild)
       MESSAGE(FATAL_ERROR "Target directory ${target_dir}/CMakeLists.txt doesn't exists !")
     ENDIF()
 
-    IF(${option_name})
+    IF(${${option_name}})
 
       # extract project name from CMakeLists.txt
       FILE(STRINGS "${target_dir}/CMakeLists.txt" project_string

+ 10 - 15
CMakeLists.txt

@@ -313,23 +313,17 @@ SET(target_directories)
 
 FOREACH(lib ${CTK_LIBS_SUBDIRS})
   SET(option_name CTK_LIB_${lib})
-  IF(${${option_name}})
-    LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Libs/${lib}^^${option_name}")
-  ENDIF()
+  LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Libs/${lib}^^${option_name}")
 ENDFOREACH()
 
 FOREACH(plugin ${CTK_PLUGINS_SUBDIRS})
   SET(option_name CTK_PLUGIN_${plugin})
-  IF(${${option_name}})
-    LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Plugins/${plugin}^^${option_name}")
-  ENDIF()
+  LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Plugins/${plugin}^^${option_name}")
 ENDFOREACH()
 
 FOREACH(app ${CTK_APPLICATIONS_SUBDIRS})
   SET(option_name CTK_APP_${app})
-  IF(${${option_name}})
-    LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${app}^^${option_name}")
-  ENDIF()
+  LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${app}^^${option_name}")
 ENDFOREACH()
 
 #MESSAGE(STATUS target_directories:${target_directories})
@@ -338,12 +332,6 @@ ENDFOREACH()
 ctkMacroGenerateProjectXml(${CTK_BINARY_DIR} ${PROJECT_NAME} "${target_directories}" ${CTK_SUPERBUILD})
 
 #-----------------------------------------------------------------------------
-# DGraph
-#
-
-# Generate DGraph input file expected by DGraph
-ctkMacroGenerateDGraphInput(${CTK_BINARY_DIR} ${PROJECT_NAME} "${target_directories}")
-
 # Compile DGraph - An application allowing to check for cycle in DAG and also obtain the
 # topological order.
 TRY_COMPILE(RESULT_VAR ${CTK_BINARY_DIR}/Utilities/DGraph ${CTK_SOURCE_DIR}/Utilities/DGraph
@@ -362,6 +350,13 @@ FIND_PROGRAM(DGraph_EXECUTABLE DGraph
   "${CTK_BINARY_DIR}/Utilities/DGraph/Release/")
 MARK_AS_ADVANCED(DGraph_EXECUTABLE)
 
+#-----------------------------------------------------------------------------
+# DGraph
+#
+
+# Generate DGraph input file expected by DGraph
+ctkMacroGenerateDGraphInput(${CTK_BINARY_DIR} "${target_directories}" TRUE)
+
 # Obtain list of target ordered topologically
 EXECUTE_PROCESS(
   COMMAND ${DGraph_EXECUTABLE} ${CTK_BINARY_DIR}/DGraphInput.txt