Quellcode durchsuchen

FIX: QtMobility: Fixed config string and plugin output directory for
Linux

Sascha Zelzer vor 15 Jahren
Ursprung
Commit
93ee6ee6b3
2 geänderte Dateien mit 12 neuen und 11 gelöschten Zeilen
  1. 3 2
      CMake/ctkMacroBuildPlugin.cmake
  2. 9 9
      CMakeExternals/QtMobility.cmake

+ 3 - 2
CMake/ctkMacroBuildPlugin.cmake

@@ -183,8 +183,9 @@ MACRO(ctkMacroBuildPlugin)
   # Apply properties to the library target.
   SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
     COMPILE_FLAGS "-DQT_PLUGIN"
-	RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins"
-	PREFIX "lib"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins"
+    PREFIX "lib"
     )
 
   # Note: The plugin may be installed in some other location ???

+ 9 - 9
CMakeExternals/QtMobility.cmake

@@ -42,16 +42,16 @@ IF(${add_project})
   SET(qtmobility_install_cmd)
   IF(UNIX OR MINGW)
     SET(qtmobility_make_cmd make)
-	SET(qtmobility_config_args "-${qtmobility_build_type} -libdir ${CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY} -no-docs -modules ${qtmobility_modules}")
-	SET(qtmobility_install_cmd ${qtmobility_make_cmd} install)
+    SET(qtmobility_config_args -${qtmobility_build_type} -libdir ${CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY} -no-docs -modules ${qtmobility_modules})
+    SET(qtmobility_install_cmd ${qtmobility_make_cmd} install)
   ELSEIF(WIN32)
     SET(qtmobility_make_cmd nmake)
-	SET(qtmobility_win32_install_prefix ${ep_source_dir}/${proj}/install/)
-	FILE(TO_NATIVE_PATH ${qtmobility_win32_install_prefix} qtmobility_win32_native_install_prefix)
-	SET(qtmobility_config_args -${qtmobility_build_type} -qt ${QT_BINARY_DIR} -prefix ${qtmobility_win32_native_install_prefix} -no-docs -modules ${qtmobility_modules})
-	
-	CONFIGURE_FILE(${qtmobility_patch_dir}/QtMobility-1.0.0-install-win32.cmake.in
-	               ${qtmobility_configured_patch_dir}/QtMobility-1.0.0-install-win32.cmake @ONLY)
+    SET(qtmobility_win32_install_prefix ${ep_source_dir}/${proj}/install/)
+    FILE(TO_NATIVE_PATH ${qtmobility_win32_install_prefix} qtmobility_win32_native_install_prefix)
+    SET(qtmobility_config_args -${qtmobility_build_type} -qt ${QT_BINARY_DIR} -prefix ${qtmobility_win32_native_install_prefix} -no-docs -modules ${qtmobility_modules})
+  
+    CONFIGURE_FILE(${qtmobility_patch_dir}/QtMobility-1.0.0-install-win32.cmake.in
+                   ${qtmobility_configured_patch_dir}/QtMobility-1.0.0-install-win32.cmake @ONLY)
 				   
     SET(qtmobility_install_cmd ${CMAKE_COMMAND} -D INTERMEDIATE_DIRECTORY:STRING=$(IntDir) -P ${qtmobility_configured_patch_dir}/QtMobility-1.0.0-install-win32.cmake)
   ENDIF()
@@ -65,4 +65,4 @@ IF(${add_project})
     BUILD_IN_SOURCE 1
     )
 	
-ENDIF()
+ENDIF()