Explorar o código

BUG: In CMakeLists.txt, used '^^' as separator when the list of target directories is built.
On windows, the use of separator ':' was causing problem. It's now replaced with '^^'.

Jean-Christophe Fillion-Robin %!s(int64=15) %!d(string=hai) anos
pai
achega
90b14c4556

+ 1 - 1
CMake/ctkMacroGenerateDGraphInput.cmake

@@ -15,7 +15,7 @@ MACRO(ctkMacroGenerateDGraphInput dir name target_directories)
   FOREACH(target_info ${target_directories})
 
     # extract target_dir and option_name
-    STRING(REPLACE "::" "\\;" target_info ${target_info})
+    STRING(REPLACE "^^" "\\;" target_info ${target_info})
     SET(target_info_list ${target_info})
     LIST(GET target_info_list 0 target_dir)
     LIST(GET target_info_list 1 option_name)

+ 1 - 1
CMake/ctkMacroGenerateProjectXml.cmake

@@ -17,7 +17,7 @@ MACRO(ctkMacroGenerateProjectXml dir name target_directories is_superbuild)
   FOREACH(target_info ${target_directories})
 
     # extract target_dir and option_name
-    STRING(REPLACE "::" "\\;" target_info ${target_info})
+    STRING(REPLACE "^^" "\\;" target_info ${target_info})
     SET(target_info_list ${target_info})
     LIST(GET target_info_list 0 target_dir)
     LIST(GET target_info_list 1 option_name)

+ 4 - 5
CMakeLists.txt

@@ -200,26 +200,26 @@ SET(target_directories)
 FOREACH(lib ${CTK_LIBS})
   SET(option_name CTK_LIB_${lib})
   IF(${${option_name}})
-    LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Libs/${lib}::${option_name}")
+    LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Libs/${lib}^^${option_name}")
   ENDIF()
 ENDFOREACH()
 
 FOREACH(plugin ${CTK_PLUGINS})
   SET(option_name CTK_PLUGIN_${plugin})
   IF(${${option_name}})
-    LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Plugins/${plugin}::${option_name}")
+    LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Plugins/${plugin}^^${option_name}")
   ENDIF()
 ENDFOREACH()
 
 FOREACH(app ${CTK_APPLICATIONS})
   SET(option_name CTK_APP_${app})
   IF(${${option_name}})
-    LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${app}::${option_name}")
+    LIST(APPEND target_directories "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${app}^^${option_name}")
   ENDIF()
 ENDFOREACH()
 
 #MESSAGE(STATUS target_directories:${target_directories})
-MESSAGE( "HERE: ${CTK_BINARY_DIR}")
+
 # Generate Project.xml file expected by the CTest driver script
 ctkMacroGenerateProjectXml(${CTK_BINARY_DIR} ${PROJECT_NAME} "${target_directories}" ${CTK_SUPERBUILD})
 
@@ -246,7 +246,6 @@ FIND_PROGRAM(DGraph_EXECUTABLE DGraph
   "${CTK_BINARY_DIR}/Utilities/DGraph/bin/"
   "${CTK_BINARY_DIR}/Utilities/DGraph/Debug/"
   "${CTK_BINARY_DIR}/Utilities/DGraph/Release/")
-#SET(DGraph_EXECUTABLE ${CTK_BINARY_DIR}/Utilities/DGraph/DGraph)
 
 # Obtain list of target ordered topologically
 EXECUTE_PROCESS(