diff options
| author | Paulo Moura Guedes <moura@kdewebdev.org> | 2006-05-16 11:48:43 +0000 |
|---|---|---|
| committer | Paulo Moura Guedes <moura@kdewebdev.org> | 2006-05-16 11:48:43 +0000 |
| commit | ca1a3bc8885a44fec51e8fb2b3d53bc1fc9dda35 (patch) | |
| tree | a6a0e909ee2ea57d5b61a6464d6a66bf5285beb0 | |
| parent | bb19c2a64367b530e5c6f55d07da5c7fc4149823 (diff) | |
| download | extra-cmake-modules-ca1a3bc8885a44fec51e8fb2b3d53bc1fc9dda35.tar.gz extra-cmake-modules-ca1a3bc8885a44fec51e8fb2b3d53bc1fc9dda35.tar.bz2 | |
Even better. Suggested by Peter.
CCMAIL: Peter Kummel [syntheticpp@gmx.net]
svn path=/trunk/KDE/kdelibs/; revision=541478
| -rw-r--r-- | modules/FindKDEWIN32.cmake | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index a71ba499..98c4f5db 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -20,24 +20,21 @@ 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) -if (CMAKE_BUILD_TYPE MATCHES Debug) - set(_KDEWIN32_POSTFIX d) -else (CMAKE_BUILD_TYPE MATCHES Debug) - set(_KDEWIN32_POSTFIX ) -endif (CMAKE_BUILD_TYPE MATCHES Debug) +set(_KDEWIN32_SEARCHNAMES kdewin32 kdewin32d) -FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32${_KDEWIN32_POSTFIX} - PATHS - ${_program_FILES_DIR}/kdewin32/lib -) +#overwrite when using msvc, which cannot mix debug/release libraries +if(MSVC) + if(CMAKE_BUILD_TYPE MATCHES Debug) + set(_KDEWIN32_SEARCHNAMES kdewin32d ) + else(CMAKE_BUILD_TYPE MATCHES Debug) + set(_KDEWIN32_SEARCHNAMES kdewin32 ) + endif(CMAKE_BUILD_TYPE MATCHES Debug) +endif(MSVC) -if (NOT KDEWIN32_LIBRARY AND NOT MSVC) - # We can mix release/debug builds - FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 kdewin32d - PATHS - ${_program_FILES_DIR}/kdewin32/lib - ) -endif (NOT KDEWIN32_LIBRARY AND NOT MSVC) +FIND_LIBRARY(KDEWIN32_LIBRARY NAMES ${_KDEWIN32_SEARCHNAMES} + PATHS + ${_program_FILES_DIR}/kdewin32/lib +) # kdelibs/win/ has to be built before the rest of kdelibs/ # eventually it will be moved out from kdelibs/ |