diff options
| -rw-r--r-- | modules/FindLibraryWithDebug.cmake | 5 | ||||
| -rw-r--r-- | modules/FindStrigi.cmake | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/modules/FindLibraryWithDebug.cmake b/modules/FindLibraryWithDebug.cmake index 9022d80c..a2593974 100644 --- a/modules/FindLibraryWithDebug.cmake +++ b/modules/FindLibraryWithDebug.cmake @@ -31,10 +31,7 @@ MACRO(FIND_LIBRARY_WITH_DEBUG var_name win32_dbg_postfix_name dgb_postfix libnam ELSE(NOT WIN32) # 1. get all possible libnames - LIST(LENGTH ARGN listCount) - if (listCount GREATER 0) - set (args ${ARGN}) - endif (listCount GREATER 0) + SET(args ${ARGN}) SET(newargs "") SET(libnames_release "") SET(libnames_debug "") diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index f90e3bd6..c15e57e2 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -14,14 +14,18 @@ endif(NOT STRIGI_MIN_VERSION) if (WIN32) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) + string(REPLACE "\\" "/" _program_FILES_DIR ${_program_FILES_DIR}) set(STRIGI_NO_DEF_PATH "") else(WIN32) set(STRIGI_NO_DEF_PATH NO_DEFAULT_PATH) endif(WIN32) +string(REPLACE "\\" "/" strigi_home $ENV{STRIGI_HOME}) +message(STATUS "strigi_home: ${strigi_home}") + find_path(STRIGI_INCLUDE_DIR strigi/streamanalyzer.h PATHS - $ENV{STRIGI_HOME}/include + ${strigi_home}/include ${CMAKE_INSTALL_PREFIX}/include ${_program_FILES_DIR}/strigi/include ${STRIGI_NO_DEF_PATH} @@ -31,7 +35,7 @@ find_library_with_debug(STRIGI_STREAMANALYZER_LIBRARY WIN32_DEBUG_POSTFIX d NAMES streamanalyzer PATHS - $ENV{STRIGI_HOME}/lib + ${strigi_home}/lib ${CMAKE_INSTALL_PREFIX}/lib ${_program_FILES_DIR}/strigi/lib ${STRIGI_NO_DEF_PATH} @@ -41,7 +45,7 @@ find_library_with_debug(STRIGI_STREAMS_LIBRARY WIN32_DEBUG_POSTFIX d NAMES streams PATHS - $ENV{STRIGI_HOME}/lib + ${strigi_home}/lib ${CMAKE_INSTALL_PREFIX}/lib ${_program_FILES_DIR}/strigi/lib ${STRIGI_NO_DEF_PATH} @@ -51,7 +55,7 @@ find_library_with_debug(STRIGI_STRIGIQTDBUSCLIENT_LIBRARY WIN32_DEBUG_POSTFIX d NAMES strigiqtdbusclient PATHS - $ENV{STRIGI_HOME}/lib + ${strigi_home}/lib ${CMAKE_INSTALL_PREFIX}/lib ${_program_FILES_DIR}/strigi/lib ${STRIGI_NO_DEF_PATH} |