Browse Source

Merge branch 'plugin_dependencies'

* plugin_dependencies:
  Revert "COMP: Change option -libdir into -prefix in CMakeExternals/QtMoblity.cmake"
Jean-Christophe Fillion-Robin 15 years ago
parent
commit
cdbe7ee9a3
1 changed files with 5 additions and 4 deletions
  1. 5 4
      CMakeExternals/QtMobility.cmake

+ 5 - 4
CMakeExternals/QtMobility.cmake

@@ -42,10 +42,11 @@ IF(${add_project})
   SET(qtmobility_install_cmd)
   IF(UNIX OR MINGW)
     SET(qtmobility_make_cmd make)
-	  IF(MINGW AND NOT MSYS)
-	    SET(qtmobility_make_cmd mingw32-make)
-	  ENDIF()
-    SET(qtmobility_config_args -${qtmobility_build_type} -prefix ${CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY} -no-docs -modules ${qtmobility_modules})
+	IF(MINGW AND NOT MSYS)
+	  SET(qtmobility_make_cmd mingw32-make)
+	ENDIF()
+	
+    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)