浏览代码

Fix QtMobility lib names on MinGW.

unknown 14 年之前
父节点
当前提交
d73c2dcc38
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 4 0
      CMakeExternals/QtMobility.cmake
  2. 3 2
      Utilities/QtMobility/QtMobility-1.0.0-install-win32.cmake.in

+ 4 - 0
CMakeExternals/QtMobility.cmake

@@ -60,8 +60,12 @@ IF(${add_project})
       CONFIGURE_FILE("${qtmobility_config_in}" "${qtmobility_config_out}" @ONLY)
     ELSEIF(WIN32)
       SET(qtmobility_make_cmd nmake)
+      SET(qtmobility_servicefw_libname_debug QtServiceFrameworkd.lib)
+      SET(qtmobility_servicefw_libname_release QtServiceFramework.lib)
       IF(MINGW AND NOT MSYS)
         SET(qtmobility_make_cmd mingw32-make)
+        SET(qtmobility_servicefw_libname_debug libQtServiceFrameworkd.a)
+        SET(qtmobility_servicefw_libname_release libQtServiceFramework.a)
       ENDIF()
 
       SET(qtmobility_win32_install_prefix "${ep_source_dir}/${proj}/install/")

+ 3 - 2
Utilities/QtMobility/QtMobility-1.0.0-install-win32.cmake.in

@@ -27,9 +27,10 @@ FOREACH(_file ${_files})
 ENDFOREACH()
 
 SET(QTMOBILITY_QTSERVICEFW_INCLUDE_DIR "@qtmobility_win32_install_prefix@/include")
+
 SET(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG
-    "@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/QtServiceFrameworkd.lib")
+    "@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/@qtmobility_servicefw_libname_debug@")
 SET(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE
-    "@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/QtServiceFramework.lib")
+    "@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/@qtmobility_servicefw_libname_release@")
     
 CONFIGURE_FILE("@qtmobility_config_in@" "@qtmobility_config_out@" @ONLY)