Procházet zdrojové kódy

BUG: When executing DGraph using ctkFunctionExecuteProcess, each path should be quoted

Also fix a problem withing ctkFunctionExecuteProcess.cmake, MU_PATH_LIST should be
instead of PATH_LIST
Jean-Christophe Fillion-Robin před 15 roky
rodič
revize
424686839f

+ 1 - 1
CMake/ctkFunctionExecuteProcess.cmake

@@ -47,7 +47,7 @@ FUNCTION(ctkFunctionExecuteProcess)
     ENDIF()
   ENDFOREACH()
 
-  SET(CONFIG_PATH_LIST ${PATH_LIST})
+  SET(CONFIG_PATH_LIST ${MY_PATH_LIST})
   SET(VARNAME_RESULT_VARIABLE ${MY_RESULT_VARIABLE})
   SET(VARNAME_OUTPUT_VARIABLE ${MY_OUTPUT_VARIABLE})
   SET(VARNAME_ERROR_VARIABLE ${MY_ERROR_VARIABLE})

+ 7 - 0
CMake/ctkMacroSetupQt.cmake

@@ -23,6 +23,13 @@ MACRO(ctkMacroSetupQt)
     SET(QT_USE_QTTEST ${BUILD_TESTING})
     INCLUDE(${QT_USE_FILE})
 
+    # Set variable QT_INSTALLED_LIBRARY_DIR that will contains
+    # Qt shared library
+    SET(QT_INSTALLED_LIBRARY_DIR ${QT_LIBRARY_DIR})
+    IF (WIN32)
+      GET_FILENAME_COMPONENT(QT_INSTALLED_LIBRARY_DIR ${QT_QMAKE_EXECUTABLE} PATH)
+    ENDIF()
+
   ELSE(QT4_FOUND)
     MESSAGE(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
   ENDIF(QT4_FOUND)

+ 1 - 1
CMake/ctkMacroValidateBuildOptions.cmake

@@ -95,7 +95,7 @@ MACRO(ctkMacroValidateBuildOptions dir executable target_directories)
       # Obtain dependency path
       ctkFunctionExecuteProcess(
         COMMAND "${executable}" "${CTK_BINARY_DIR}/DGraphInput-alldep.txt" -paths ${target_project_name}
-        PATH_LIST ${QT_LIBRARY_DIR}
+        PATH_LIST \"${QT_INSTALLED_LIBRARY_DIR}\"
         WORKING_DIRECTORY ${CTK_BINARY_DIR}
         RESULT_VARIABLE RESULT_VAR
         OUTPUT_VARIABLE dep_paths

+ 1 - 1
CMakeLists.txt

@@ -360,7 +360,7 @@ ctkFunctionGenerateDGraphInput(${CTK_BINARY_DIR} "${target_directories}" TRUE)
 # Obtain list of target ordered topologically
 ctkFunctionExecuteProcess(
   COMMAND "${DGraph_EXECUTABLE}" "${CTK_BINARY_DIR}/DGraphInput.txt"
-  PATH_LIST ${QT_LIBRARY_DIR}
+  PATH_LIST \"${QT_INSTALLED_LIBRARY_DIR}\"
   WORKING_DIRECTORY ${CTK_BINARY_DIR}
   RESULT_VARIABLE RESULT_VAR
   OUTPUT_VARIABLE CTEST_PROJECT_SUBPROJECTS