瀏覽代碼

FIX: DAH: Trying to fix build issues on Windows.

The tarball is the original .zip file from the official download site,
but repacked as tar.gz. There are still linker errors.
Sascha Zelzer 14 年之前
父節點
當前提交
3f7f5a1383

+ 1 - 1
CMakeExternals/QtSOAP.cmake

@@ -11,7 +11,7 @@ IF(${add_project})
   SET(QtSOAP_DEPENDS ${proj})
 
   IF(WIN32)
-    SET(_qtsoap_url "http://get.qt.nokia.com/qt/solutions/lgpl/qtsoap-2.7_1-opensource.zip")
+    SET(_qtsoap_url "${CTK_SOURCE_DIR}/Utilities/QtSOAP/qtsoap-2.7_1-opensource-win32.tar.gz")
     SET(_make_cmd nmake)
     IF(MINGW)
       SET(_make_cmd mingw32-make)

+ 9 - 1
Utilities/QtSOAP/InstallScript.cmake.in

@@ -13,7 +13,15 @@ FOREACH(_file ${_files})
 ENDFOREACH()
 
 
-SET(_qtsoap_config "FIND_LIBRARY(QTSOAP_LIBRARY QtSolutions_SOAP-2.7 \"@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/\")
+SET(_qtsoap_config "
+FIND_LIBRARY(QTSOAP_LIBRARY_RELEASE QtSolutions_SOAP-2.7 \"@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/\")
+FIND_LIBRARY(QTSOAP_LIBRARY_DEBUG QtSolutions_SOAP-2.7d \"@CTK_CMAKE_LIBRARY_OUTPUT_DIRECTORY@/${_int_dir}/\")
+IF(QTSOAP_LIBRARY_DEBUG-FOUND)
+SET(QTSOAP_LIBRARY \"debug ${QTSOAP_LIBRARY_DEBUG}\")
+ENDIF()
+IF(QTSOAP_LIBRARY_RELEASE-FOUND)
+SET(QTSOAP_LIBRARY ${QTSOAP_LIBRARY} \"optimized ${QTSOAP_LIBRARY_RELEASE}\")
+ENDIF()
 SET(QTSOAP_INCLUDE_DIR \"${proj_dir}/src/\")")
 
 FILE(WRITE "@CTK_BINARY_DIR@/Utilities/QtSOAP/QtSOAPConfig.cmake" ${_qtsoap_config})

二進制
Utilities/QtSOAP/qtsoap-2.7_1-opensource-win32.tar.gz