diff options
| -rw-r--r-- | modules/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | modules/FindGNUWIN32.cmake | 6 | ||||
| -rw-r--r-- | modules/FindKDEWIN32.cmake | 20 | ||||
| -rw-r--r-- | modules/MacroGetenvWinPath.cmake | 5 | ||||
| -rw-r--r-- | modules/MacroLibrary.cmake | 1 |
5 files changed, 12 insertions, 21 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index f9c7c45a..2b7a53a2 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -8,6 +8,7 @@ install_files(${module_install_dir} FILES kde4init_dummy.cpp.in ${cmakeFiles} ) # the files listed here will be removed by remove_obsoleted_cmake_files.cmake, Alex set(FILES_TO_REMOVE + ${CMAKE_INSTALL_PREFIX}${module_install_dir}/MacroGetenvWinPath.cmake ${CMAKE_INSTALL_PREFIX}${module_install_dir}/FindKDE4.cmake ${CMAKE_INSTALL_PREFIX}${module_install_dir}/UsePkgconfig.cmake ${CMAKE_INSTALL_PREFIX}${module_install_dir}/FindKDE3.cmake diff --git a/modules/FindGNUWIN32.cmake b/modules/FindGNUWIN32.cmake index 622fd3cf..8b1b15a6 100644 --- a/modules/FindGNUWIN32.cmake +++ b/modules/FindGNUWIN32.cmake @@ -1,10 +1,8 @@ if (WIN32) -INCLUDE(MacroGetenvWinPath) +file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles) -MACRO_GETENV_WIN_PATH(_progFiles PROGRAMFILES) - -FIND_FILE(GNUWIN32_DIR gnuwin32 +find_file(GNUWIN32_DIR gnuwin32 ${_progFiles} "C:/" ) 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) diff --git a/modules/MacroGetenvWinPath.cmake b/modules/MacroGetenvWinPath.cmake deleted file mode 100644 index b18f7f63..00000000 --- a/modules/MacroGetenvWinPath.cmake +++ /dev/null @@ -1,5 +0,0 @@ - -MACRO (MACRO_GETENV_WIN_PATH var name) - set(${var} $ENV{${name}}) - STRING(REGEX REPLACE "\\\\" "/" ${var} "${${var}}") -ENDMACRO (MACRO_GETENV_WIN_PATH var name) diff --git a/modules/MacroLibrary.cmake b/modules/MacroLibrary.cmake index 517141e9..ce741f7b 100644 --- a/modules/MacroLibrary.cmake +++ b/modules/MacroLibrary.cmake @@ -4,6 +4,5 @@ INCLUDE(MacroOptionalFindPackage) INCLUDE(MacroAdditionalCleanFiles) INCLUDE(MacroAddFileDependencies) -INCLUDE(MacroGetenvWinPath) INCLUDE(MacroEnsureOutOfSourceBuild) INCLUDE(MacroBoolTo01) |