adopt them to the new win32 library names

svn path=/trunk/KDE/kdelibs/; revision=712919

4 files changed, 121 insertions, 50 deletions

diff --git a/modules/FindBlitz.cmake b/modules/FindBlitz.cmake
index 10b97f86..ae337d95 100644
--- a/modules/FindBlitz.cmake
+++ b/modules/FindBlitz.cmake
@@ -23,16 +23,32 @@ find_path(BLITZ_INCLUDES
   ${KDE4_INCLUDE_DIR}
   ${INCLUDE_INSTALL_DIR}
 )
+if(MSVC)
+  FIND_LIBRARY(BLITZ_LIBRARIES_DEBUG NAMES qimageblitzd)
+  FIND_LIBRARY(BLITZ_LIBRARIES_RELEASE NAMES qimageblitz)
 
-FIND_LIBRARY(BLITZ_LIBRARIES
- NAMES
- qimageblitz
- qimageblitzd
- PATHS
- $ENV{QIMAGEBLITZDIR}/lib
- ${KDE4_LIB_DIR}
- ${LIB_INSTALL_DIR}
-)
+  if(BLITZ_LIBRARIES_DEBUG AND BLITZ_LIBRARIES_RELEASE)
+    set(BLITZ_LIBRARIES optimized ${BLITZ_LIBRARIES_RELEASE}
+                        debug ${BLITZ_LIBRARIES_DEBUG})
+  else(BLITZ_LIBRARIES_DEBUG AND BLITZ_LIBRARIES_RELEASE)
+    if(BLITZ_LIBRARIES_DEBUG)
+      set(BLITZ_LIBRARIES ${BLITZ_LIBRARIES_DEBUG})
+    else(BLITZ_LIBRARIES_DEBUG)
+      if(BLITZ_LIBRARIES_RELEASE)
+        set(BLITZ_LIBRARIES ${BLITZ_LIBRARIES_RELEASE})
+      endif(BLITZ_LIBRARIES_RELEASE)
+    endif(BLITZ_LIBRARIES_DEBUG)
+  endif(BLITZ_LIBRARIES_DEBUG AND BLITZ_LIBRARIES_RELEASE)
+else(MSVC)
+  FIND_LIBRARY(BLITZ_LIBRARIES
+  NAMES
+   qimageblitz
+   PATHS
+   $ENV{QIMAGEBLITZDIR}/lib
+   ${KDE4_LIB_DIR}
+   ${LIB_INSTALL_DIR}
+  )
+endif(MSVC)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Blitz DEFAULT_MSG 
diff --git a/modules/FindQCA2.cmake b/modules/FindQCA2.cmake
index 87c93b96..d8b74733 100644
--- a/modules/FindQCA2.cmake
+++ b/modules/FindQCA2.cmake
@@ -34,8 +34,23 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
       NO_DEFAULT_PATH
     )
   ELSE (NOT WIN32)
+    FIND_LIBRARY(QCA2_LIBRARIES_DEBUG NAMES qcad)
+    FIND_LIBRARY(QCA2_LIBRARIES_RELEASE NAMES qca)
+
+    if(QCA2_LIBRARIES_DEBUG AND QCA2_LIBRARIES_RELEASE)
+      set(QCA2_LIBRARIES optimized ${QCA2_LIBRARIES_RELEASE}
+                          debug ${QCA2_LIBRARIES_DEBUG})
+    else(QCA2_LIBRARIES_DEBUG AND QCA2_LIBRARIES_RELEASE)
+      if(QCA2_LIBRARIES_DEBUG)
+        set(QCA2_LIBRARIES ${QCA2_LIBRARIES_DEBUG})
+      else(QCA2_LIBRARIES_DEBUG)
+        if(QCA2_LIBRARIES_RELEASE)
+          set(QCA2_LIBRARIES ${QCA2_LIBRARIES_RELEASE})
+        endif(QCA2_LIBRARIES_RELEASE)
+      endif(QCA2_LIBRARIES_DEBUG)
+    endif(QCA2_LIBRARIES_DEBUG AND QCA2_LIBRARIES_RELEASE)
+
     FIND_PATH(QCA2_INCLUDE_DIR QtCrypto/qca.h)
-    FIND_LIBRARY(QCA2_LIBRARIES NAMES qca)
     IF(QCA2_INCLUDE_DIR)
       SET(QCA2_INCLUDE_DIR ${QCA2_INCLUDE_DIR}/QtCrypto CACHE TYPE PATH FORCE)
     ENDIF(QCA2_INCLUDE_DIR)
diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake
index 096d9b3f..c2b4774c 100644
--- a/modules/FindSoprano.cmake
+++ b/modules/FindSoprano.cmake
@@ -14,42 +14,47 @@ else(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES)
     ${KDE4_INCLUDE_DIR}
     ${INCLUDE_INSTALL_DIR}
     )
-  
-  FIND_LIBRARY(SOPRANO_LIBRARIES 
-    NAMES
-    soprano
-    PATHS
-    ${KDE4_LIB_DIR}
-    ${LIB_INSTALL_DIR}
-    )
-  if(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES)
-    set(Soprano_FOUND TRUE)
-  endif(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES)
 
   if(MSVC)
-    FIND_LIBRARY(SOPRANO_LIBRARIES_DEBUG 
+    FIND_LIBRARY(SOPRANO_LIBRARIES_DEBUG
       NAMES
       sopranod
       PATHS
       ${KDE4_LIB_DIR}
       ${LIB_INSTALL_DIR}
-      )
-    if(NOT SOPRANO_LIBRARIES_DEBUG)
-      set(Soprano_FOUND FALSE)
-    endif(NOT SOPRANO_LIBRARIES_DEBUG)
-    
-    if(MSVC_IDE)
-      if( NOT SOPRANO_LIBRARIES_DEBUG OR NOT SOPRANO_LIBRARIES)
-        message(FATAL_ERROR "\nCould NOT find the debug AND release version of the Soprano library.\nYou need to have both to use MSVC projects.\nPlease build and install both soprano libraries first.\n")
-      endif( NOT SOPRANO_LIBRARIES_DEBUG OR NOT SOPRANO_LIBRARIES)
-    else(MSVC_IDE)
-      string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
-      if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+    )
+    FIND_LIBRARY(SOPRANO_LIBRARIES_RELEASE
+      NAMES
+      soprano
+      PATHS
+      ${KDE4_LIB_DIR}
+      ${LIB_INSTALL_DIR}
+    )
+
+    if(SOPRANO_LIBRARIES_DEBUG AND SOPRANO_LIBRARIES_RELEASE)
+      set(SOPRANO_LIBRARIES optimized ${SOPRANO_LIBRARIES_RELEASE}
+                            debug ${SOPRANO_LIBRARIES_DEBUG})
+    else(SOPRANO_LIBRARIES_DEBUG AND SOPRANO_LIBRARIES_RELEASE)
+      if(SOPRANO_LIBRARIES_DEBUG)
         set(SOPRANO_LIBRARIES ${SOPRANO_LIBRARIES_DEBUG})
-      else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-        set(SOPRANO_LIBRARIES ${SOPRANO_LIBRARIES})
-      endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-    endif(MSVC_IDE)
+      else(SOPRANO_LIBRARIES_DEBUG)
+        if(SOPRANO_LIBRARIES_RELEASE)
+          set(SOPRANO_LIBRARIES ${SOPRANO_LIBRARIES_RELEASE})
+        endif(SOPRANO_LIBRARIES_RELEASE)
+      endif(SOPRANO_LIBRARIES_DEBUG)
+    endif(SOPRANO_LIBRARIES_DEBUG AND SOPRANO_LIBRARIES_RELEASE)
+
+  else(MSVC)
+    FIND_LIBRARY(SOPRANO_LIBRARIES
+      NAMES
+      soprano
+      PATHS
+      ${KDE4_LIB_DIR}
+      ${LIB_INSTALL_DIR}
+      )
+    if(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES)
+      set(Soprano_FOUND TRUE)
+    endif(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES)
   endif(MSVC)
 
   if(Soprano_FOUND)
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake
index 55fec492..1a323706 100644
--- a/modules/FindStrigi.cmake
+++ b/modules/FindStrigi.cmake
@@ -20,19 +20,54 @@ find_path(STRIGI_INCLUDE_DIR strigi/streamanalyzer.h
   ${_program_FILES_DIR}/strigi/include
 )
 
-find_library(STRIGI_STREAMANALYZER_LIBRARY NAMES streamanalyzer
-  PATHS
-  $ENV{STRIGI_HOME}/lib
-  ${CMAKE_INSTALL_PREFIX}/lib
-  ${_program_FILES_DIR}/strigi/lib
-)
+if(MSVC)
+  FIND_LIBRARY(STREAMANALYZER_LIBRARY_DEBUG NAMES streamanalyzerd)
+  FIND_LIBRARY(STREAMANALYZER_LIBRARY_RELEASE NAMES streamanalyzer)
 
-find_library(STRIGI_STREAMS_LIBRARY NAMES streams
-  PATHS
-  $ENV{STRIGI_HOME}/lib
-  ${CMAKE_INSTALL_PREFIX}/lib
-  ${_program_FILES_DIR}/strigi/lib
-)
+  if(STREAMANALYZER_LIBRARY_DEBUG AND STREAMANALYZER_LIBRARY_RELEASE)
+    set(STREAMANALYZER_LIBRARY optimized ${STREAMANALYZER_LIBRARY_RELEASE}
+                          debug ${STREAMANALYZER_LIBRARY_DEBUG})
+  else(STREAMANALYZER_LIBRARY_DEBUG AND STREAMANALYZER_LIBRARY_RELEASE)
+    if(STREAMANALYZER_LIBRARY_DEBUG)
+      set(STREAMANALYZER_LIBRARY ${STREAMANALYZER_LIBRARY_DEBUG})
+    else(STREAMANALYZER_LIBRARY_DEBUG)
+      if(STREAMANALYZER_LIBRARY_RELEASE)
+        set(STREAMANALYZER_LIBRARY ${STREAMANALYZER_LIBRARY_RELEASE})
+      endif(STREAMANALYZER_LIBRARY_RELEASE)
+    endif(STREAMANALYZER_LIBRARY_DEBUG)
+  endif(STREAMANALYZER_LIBRARY_DEBUG AND STREAMANALYZER_LIBRARY_RELEASE)
+
+  FIND_LIBRARY(STREAMS_LIBRARY_DEBUG NAMES streamsd)
+  FIND_LIBRARY(STREAMS_LIBRARY_RELEASE NAMES streams)
+
+  if(STREAMS_LIBRARY_DEBUG AND STREAMS_LIBRARY_RELEASE)
+    set(STREAMS_LIBRARY optimized ${STREAMS_LIBRARY_RELEASE}
+                          debug ${STREAMS_LIBRARY_DEBUG})
+  else(STREAMS_LIBRARY_DEBUG AND STREAMS_LIBRARY_RELEASE)
+    if(STREAMS_LIBRARY_DEBUG)
+      set(STREAMS_LIBRARY ${STREAMS_LIBRARY_DEBUG})
+    else(STREAMS_LIBRARY_DEBUG)
+      if(STREAMS_LIBRARY_RELEASE)
+        set(STREAMS_LIBRARY ${STREAMS_LIBRARY_RELEASE})
+      endif(STREAMS_LIBRARY_RELEASE)
+    endif(STREAMS_LIBRARY_DEBUG)
+  endif(STREAMS_LIBRARY_DEBUG AND STREAMS_LIBRARY_RELEASE)
+
+else(MSVC)
+  find_library(STRIGI_STREAMANALYZER_LIBRARY NAMES streamanalyzer
+    PATHS
+    $ENV{STRIGI_HOME}/lib
+    ${CMAKE_INSTALL_PREFIX}/lib
+    ${_program_FILES_DIR}/strigi/lib
+  )
+
+  find_library(STRIGI_STREAMS_LIBRARY NAMES streams
+    PATHS
+    $ENV{STRIGI_HOME}/lib
+    ${CMAKE_INSTALL_PREFIX}/lib
+    ${_program_FILES_DIR}/strigi/lib
+  )
+endif(MSVC)
 
 if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION)
   include(UsePkgConfig)