Bläddra i källkod

ENH: Support for include path inheritance

Sascha Zelzer 14 år sedan
förälder
incheckning
3bdef1ec02
2 ändrade filer med 16 tillägg och 2 borttagningar
  1. 8 2
      CMake/ctkFunctionGenerateDGraphInput.cmake
  2. 8 0
      CMakeExternals/QtMobility.cmake

+ 8 - 2
CMake/ctkFunctionGenerateDGraphInput.cmake

@@ -21,11 +21,17 @@
 #
 #
 # Generate a DGrapgh input file expected by DGraph executable.
 # Generate a DGrapgh input file expected by DGraph executable.
 #
 #
-FUNCTION(ctkFunctionGenerateDGraphInput dir target_directories with_option)
+FUNCTION(ctkFunctionGenerateDGraphInput dir target_directories)
   IF(NOT EXISTS ${dir})
   IF(NOT EXISTS ${dir})
     MESSAGE(FATAL_ERROR "Directory ${dir} doesn't exist!")
     MESSAGE(FATAL_ERROR "Directory ${dir} doesn't exist!")
   ENDIF()
   ENDIF()
 
 
+  CtkMacroParseArguments(MY
+    ""
+    "WITH_OPTION;WITH_EXTERNALS"
+    ${ARGN}
+    )
+
   SET(dgraph_list )
   SET(dgraph_list )
 
 
   SET(edges)
   SET(edges)
@@ -48,7 +54,7 @@ FUNCTION(ctkFunctionGenerateDGraphInput dir target_directories with_option)
     ENDIF()
     ENDIF()
 
 
     SET(include_dep 1)
     SET(include_dep 1)
-    IF(${with_option})
+    IF(MY_WITH_OPTION)
       SET(include_dep ${${option_name}})
       SET(include_dep ${${option_name}})
     ENDIF()
     ENDIF()
     IF(${include_dep})
     IF(${include_dep})

+ 8 - 0
CMakeExternals/QtMobility.cmake

@@ -72,5 +72,13 @@ IF(${add_project})
     
     
   # Since the full path of QtMobility library is used, there is not need to add 
   # Since the full path of QtMobility library is used, there is not need to add 
   # its corresponding library output directory to CTK_EXTERNAL_LIBRARY_DIRS
   # its corresponding library output directory to CTK_EXTERNAL_LIBRARY_DIRS
+
+  IF(UNIX)
+    SET(QTMOBILITY_QTSERVICEFW_LIBRARIES_INCLUDE_DIRS 
+        "${CTK_BINARY_DIR}/../CMakeExternals/Source/QtMobility/install/include")
+  ELSE()
+    SET(QTMOBILITY_QTSERVICEFW_LIBRARIES_INCLUDE_DIRS
+        "${qtmobility_win32_install_prefix}/include")
+  ENDIF()
 	
 	
 ENDIF()
 ENDIF()