Przeglądaj źródła

COMP: QtMobility: Fix the build system for MinGW. Installation of the
dll and the header files is now properly done.

Sascha Zelzer 15 lat temu
rodzic
commit
dd6b7964a4

+ 9 - 8
CMakeExternals/QtMobility.cmake

@@ -40,20 +40,21 @@ IF(${add_project})
   
   
   SET(qtmobility_make_cmd)
   SET(qtmobility_make_cmd)
   SET(qtmobility_install_cmd)
   SET(qtmobility_install_cmd)
-  IF(UNIX OR MINGW)
+  IF(UNIX)
     SET(qtmobility_make_cmd make)
     SET(qtmobility_make_cmd make)
-	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_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_install_cmd ${qtmobility_make_cmd} install)
   ELSEIF(WIN32)
   ELSEIF(WIN32)
     SET(qtmobility_make_cmd nmake)
     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)
+    IF(MINGW AND NOT MSYS)
+      SET(qtmobility_make_cmd mingw32-make)
+    ENDIF()
+
+    SET(qtmobility_win32_install_prefix "${ep_source_dir}/${proj}/install/")
+    STRING(REPLACE "/" "\\" qtmobility_win32_native_install_prefix ${qtmobility_win32_install_prefix})
+
     SET(qtmobility_config_args -${qtmobility_build_type} -qt ${QT_BINARY_DIR} -prefix ${qtmobility_win32_native_install_prefix} -no-docs -modules ${qtmobility_modules})
     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
     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)
                    ${qtmobility_configured_patch_dir}/QtMobility-1.0.0-install-win32.cmake @ONLY)
 				   
 				   

+ 4 - 1
Utilities/QtMobility/QtMobility-1.0.0-install-win32.cmake.in

@@ -5,7 +5,10 @@ IF(_output)
   MESSAGE(${_output})
   MESSAGE(${_output})
 ENDIF()
 ENDIF()
 
 
-GET_FILENAME_COMPONENT(_int_dir ${INTERMEDIATE_DIRECTORY} NAME)
+SET(_int_dir )
+IF(INTERMEDIATE_DIRECTORY)
+  GET_FILENAME_COMPONENT(_int_dir ${INTERMEDIATE_DIRECTORY} NAME)
+ENDIF()
 
 
 FILE(GLOB _files "@qtmobility_win32_install_prefix@/lib/*")
 FILE(GLOB _files "@qtmobility_win32_install_prefix@/lib/*")
 FOREACH(_file ${_files})
 FOREACH(_file ${_files})