Ver código fonte

COMP: Since DGraph outputs a space separated list, make sure CTEST_PROJECT_SUBPROJECTS is converted to a list

Jean-Christophe Fillion-Robin 14 anos atrás
pai
commit
ec6ca8251e
1 arquivos alterados com 7 adições e 2 exclusões
  1. 7 2
      CMakeLists.txt

+ 7 - 2
CMakeLists.txt

@@ -425,14 +425,19 @@ ctkFunctionExecuteProcess(
   PATH_LIST \"${QT_INSTALLED_LIBRARY_DIR}\"
   WORKING_DIRECTORY ${CTK_BINARY_DIR}
   RESULT_VARIABLE RESULT_VAR
-  OUTPUT_VARIABLE CTEST_PROJECT_SUBPROJECTS
+  OUTPUT_VARIABLE CTEST_PROJECT_SUBPROJECTS_OUTPUT
   ERROR_VARIABLE error
   OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
+  )      
 IF(RESULT_VAR)
   MESSAGE(FATAL_ERROR "Failed to obtain list of target ordered topologically.\n${RESULT_VAR}\n${CTK_BINARY_DIR}\n${error}")
 ENDIF()
 
+
+# Convert 'CTEST_PROJECT_SUBPROJECTS_OUTPUT' to a list
+STRING(REPLACE " " "\\;" CTEST_PROJECT_SUBPROJECTS ${CTEST_PROJECT_SUBPROJECTS_OUTPUT})
+SET(CTEST_PROJECT_SUBPROJECTS ${CTEST_PROJECT_SUBPROJECTS})
+
 # If the list of subproject is empty, let's at least build CTKCore
 LIST(LENGTH CTEST_PROJECT_SUBPROJECTS subproject_count)
 IF (subproject_count EQUAL 0)