diff options
Diffstat (limited to 'modules/FindKDEWIN32.cmake')
| -rw-r--r-- | modules/FindKDEWIN32.cmake | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index eb0bfbbf..cf3a7b11 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -7,15 +7,13 @@ if (WIN32) -INCLUDE(MacroGetenvWinPath) +file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) -MACRO_GETENV_WIN_PATH(_program_FILES_DIR PROGRAMFILES) +if(NOT QT4_FOUND) + find_package(Qt4 REQUIRED) +endif(NOT QT4_FOUND) -IF(NOT QT4_FOUND) -FIND_PACKAGE(Qt4 REQUIRED) -ENDIF(NOT QT4_FOUND) - -FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h +find_path(KDEWIN32_INCLUDE_DIR winposix_export.h ${_program_FILES_DIR}/kdewin32/include ) @@ -23,14 +21,14 @@ FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ # search for kdewin32 in the default install directory for applications (default of (n)make install) -FIND_LIBRARY(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 +find_library(KDEWIN32_LIBRARY_RELEASE NAMES kdewin32 PATHS ${_program_FILES_DIR}/kdewin32/lib ) # msvc makes a difference between debug and release if(MSVC) - FIND_LIBRARY(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d + find_library(KDEWIN32_LIBRARY_DEBUG NAMES kdewin32d PATHS ${_program_FILES_DIR}/kdewin32/lib ) @@ -41,7 +39,7 @@ if(MSVC) endif( NOT KDEWIN32_LIBRARY_DEBUG OR NOT KDEWIN32_LIBRARY_RELEASE) SET(KDEWIN32_LIBRARY optimized ${KDEWIN32_LIBRARY_RELEASE} debug ${KDEWIN32_LIBRARY_DEBUG}) else(MSVC_IDE) - STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) + string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) set(KDEWIN32_LIBRARY ${KDEWIN32_LIBRARY_DEBUG}) else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) @@ -65,7 +63,7 @@ if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) else (MINGW) # msvc compiler # add the MS SDK include directory if available - MACRO_GETENV_WIN_PATH(MSSDK_DIR MSSDK) + file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) endif (MINGW) |