Merge branch 'plugin_dependencies'

CMake/ctkMacroValidateBuildOptions.cmake

@@ -115,10 +115,10 @@ MACRO(ctkMacroValidateBuildOptions dir executable target_directories)
       # Obtain dependency path
       ctkMacroSetPaths("${QT_INSTALLED_LIBRARY_DIR}")
       EXECUTE_PROCESS(
-        COMMAND "${executable}" "${CTK_BINARY_DIR}/DGraphInput-alldep.txt" -paths ${target_project_name}
+        COMMAND "${executable}" "${CTK_BINARY_DIR}/DGraphInput-alldep.txt" -sort ${target_project_name}
         WORKING_DIRECTORY ${CTK_BINARY_DIR}
         RESULT_VARIABLE RESULT_VAR
-        OUTPUT_VARIABLE dep_paths
+        OUTPUT_VARIABLE dep_path
         ERROR_VARIABLE error
         OUTPUT_STRIP_TRAILING_WHITESPACE
         )
@@ -126,23 +126,20 @@ MACRO(ctkMacroValidateBuildOptions dir executable target_directories)
         MESSAGE(FATAL_ERROR "Failed to obtain dependence path of ${subir}.\n${RESULT_VAR}\n${CTK_BINARY_DIR}\n${error}")
       ENDIF()
 
-      FOREACH(dep_path ${dep_paths})
+      # Convert 'dep_path' to a list
+      STRING(REPLACE " " "\\;" dep_path_list ${dep_path})
+      SET(dep_path_list ${dep_path_list})
 
-        # Convert 'dep_path' to a list
-        STRING(REPLACE " " "\\;" dep_path_list ${dep_path})
-        SET(dep_path_list ${dep_path_list})
-
-        #MESSAGE("path for ${target_project_name} is: ${dep_path}")
+      #MESSAGE("path for ${target_project_name} is: ${dep_path_list}")
         
-        # Check if all target included in the dependency path are enabled
-        FOREACH(dep ${dep_path_list})
-          ctkMacroGetOptionName("${target_directories_with_target_name}" ${dep} dep_option)
-          IF(NOT ${${dep_option}})
-            # Enable option
-            MESSAGE(STATUS "Enabling option [${dep_option}] required by [${target_project_name}]")
-            SET(${dep_option} ON CACHE BOOL "Enable ${target_project_name} library" FORCE)
-          ENDIF()
-        ENDFOREACH()
+      # Check if all target included in the dependency path are enabled
+      FOREACH(dep ${dep_path_list})
+        ctkMacroGetOptionName("${target_directories_with_target_name}" ${dep} dep_option)
+        IF(NOT ${${dep_option}})
+          # Enable option
+          MESSAGE(STATUS "Enabling option [${dep_option}] required by [${target_project_name}]")
+          SET(${dep_option} ON CACHE BOOL "Enable ${target_project_name} library" FORCE)
+        ENDIF()
       ENDFOREACH()
     ENDIF()