Bladeren bron

COMP: DAH: Fix QtSOAP link libraries on Linux, if only debug or
release lib is available.

Sascha Zelzer 15 jaren geleden
bovenliggende
commit
31883d9c53
1 gewijzigde bestanden met toevoegingen van 8 en 9 verwijderingen
  1. 8 9
      Utilities/QtSOAP/QtSOAPConfig.cmake.in

+ 8 - 9
Utilities/QtSOAP/QtSOAPConfig.cmake.in

@@ -1,16 +1,15 @@
 FIND_LIBRARY(QTSOAP_LIBRARY_RELEASE QtSolutions_SOAP-2.7 "@_qtsoap_lib_dir@")
 FIND_LIBRARY(QTSOAP_LIBRARY_DEBUG QtSolutions_SOAP-2.7d "@_qtsoap_lib_dir@")
 
-IF(QTSOAP_LIBRARY_DEBUG)
-  SET(QTSOAP_LIBRARY "debug;${QTSOAP_LIBRARY_DEBUG}")
-ENDIF()
-
-IF(QTSOAP_LIBRARY_RELEASE)
-  SET(QTSOAP_LIBRARY "${QTSOAP_LIBRARY};optimized;${QTSOAP_LIBRARY_RELEASE}")
+IF(QTSOAP_LIBRARY_DEBUG AND QTSOAP_LIBRARY_RELEASE)
+  SET(QTSOAP_LIBRARY "debug;${QTSOAP_LIBRARY_DEBUG};optimized;${QTSOAP_LIBRARY_RELEASE}")
+ELSEIF(QTSOAP_LIBRARY_DEBUG)
+  SET(QTSOAP_LIBRARY "${QTSOAP_LIBRARY_DEBUG}")
+ELSEIF(QTSOAP_LIBRARY_RELEASE)
+  SET(QTSOAP_LIBRARY "${QTSOAP_LIBRARY_RELEASE}")
+ELSE()
+  MESSAGE(FATAL_ERROR "No debug or release version of QtSOAP found.")
 ENDIF()
 
 SET(QTSOAP_INCLUDE_DIR "@_qtsoap_include_dir@")
 
-IF(NOT QTSOAP_LIBRARY_DEBUG AND NOT QTSOAP_LIBRARY_RELEASE)
-  MESSAGE(FATAL_ERROR "No debug or release version of QtSOAP found.")
-ENDIF()