diff options
| author | Adrian Page <adrian@pagenet.plus.com> | 2007-09-15 21:37:24 +0000 |
|---|---|---|
| committer | Adrian Page <adrian@pagenet.plus.com> | 2007-09-15 21:37:24 +0000 |
| commit | 3751c933b71201dd7de44141be3585254347154f (patch) | |
| tree | 79ba46f29608356b15bb58f78d57623f8286556f | |
| parent | f6033e468574a60eeeea2658872e8d906be85aa5 (diff) | |
| download | extra-cmake-modules-3751c933b71201dd7de44141be3585254347154f.tar.gz extra-cmake-modules-3751c933b71201dd7de44141be3585254347154f.tar.bz2 | |
Fix find for msvc.
svn path=/trunk/KDE/kdelibs/; revision=712967
| -rw-r--r-- | modules/FindSoprano.cmake | 7 | ||||
| -rw-r--r-- | modules/FindStrigi.cmake | 12 |
2 files changed, 10 insertions, 9 deletions
diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index c2b4774c..30491fca 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -52,11 +52,12 @@ else(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES) ${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_INCLUDE_DIR AND SOPRANO_LIBRARIES) + set(Soprano_FOUND TRUE) + endif(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES) + if(Soprano_FOUND) if(NOT Soprano_FIND_QUIETLY) message(STATUS "Found Soprano: ${SOPRANO_LIBRARIES}") diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 1a323706..a9f854db 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -25,14 +25,14 @@ if(MSVC) FIND_LIBRARY(STREAMANALYZER_LIBRARY_RELEASE NAMES streamanalyzer) if(STREAMANALYZER_LIBRARY_DEBUG AND STREAMANALYZER_LIBRARY_RELEASE) - set(STREAMANALYZER_LIBRARY optimized ${STREAMANALYZER_LIBRARY_RELEASE} + set(STRIGI_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}) + set(STRIGI_STREAMANALYZER_LIBRARY ${STREAMANALYZER_LIBRARY_DEBUG}) else(STREAMANALYZER_LIBRARY_DEBUG) if(STREAMANALYZER_LIBRARY_RELEASE) - set(STREAMANALYZER_LIBRARY ${STREAMANALYZER_LIBRARY_RELEASE}) + set(STRIGI_STREAMANALYZER_LIBRARY ${STREAMANALYZER_LIBRARY_RELEASE}) endif(STREAMANALYZER_LIBRARY_RELEASE) endif(STREAMANALYZER_LIBRARY_DEBUG) endif(STREAMANALYZER_LIBRARY_DEBUG AND STREAMANALYZER_LIBRARY_RELEASE) @@ -41,14 +41,14 @@ if(MSVC) FIND_LIBRARY(STREAMS_LIBRARY_RELEASE NAMES streams) if(STREAMS_LIBRARY_DEBUG AND STREAMS_LIBRARY_RELEASE) - set(STREAMS_LIBRARY optimized ${STREAMS_LIBRARY_RELEASE} + set(STRIGI_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}) + set(STRIGI_STREAMS_LIBRARY ${STREAMS_LIBRARY_DEBUG}) else(STREAMS_LIBRARY_DEBUG) if(STREAMS_LIBRARY_RELEASE) - set(STREAMS_LIBRARY ${STREAMS_LIBRARY_RELEASE}) + set(STRIGI_STREAMS_LIBRARY ${STREAMS_LIBRARY_RELEASE}) endif(STREAMS_LIBRARY_RELEASE) endif(STREAMS_LIBRARY_DEBUG) endif(STREAMS_LIBRARY_DEBUG AND STREAMS_LIBRARY_RELEASE) |