diff options
| -rw-r--r-- | modules/CheckIncludeFiles.cmake | 6 | ||||
| -rw-r--r-- | modules/FindGIF.cmake | 2 | ||||
| -rw-r--r-- | modules/FindKDE4.cmake | 11 |
3 files changed, 13 insertions, 6 deletions
diff --git a/modules/CheckIncludeFiles.cmake b/modules/CheckIncludeFiles.cmake index 52870101..03676fb5 100644 --- a/modules/CheckIncludeFiles.cmake +++ b/modules/CheckIncludeFiles.cmake @@ -13,8 +13,10 @@ MACRO(CHECK_INCLUDE_FILES INCLUDE VARIABLE) IF("${VARIABLE}" MATCHES "^${VARIABLE}$") - SET(CHECK_INCLUDE_FILES_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}") -# STRING(REGEX REPLACE ";" "\\\\;" CHECK_INCLUDE_FILES_INCLUDE_DIRS "${CHECK_INCLUDE_FILES_INCLUDE_DIRS}") + SET(CHECK_INCLUDE_FILES_INCLUDE_DIRS) + IF(CMAKE_REQUIRED_INCLUDES) + SET(CHECK_INCLUDE_FILES_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}") + ENDIF(CMAKE_REQUIRED_INCLUDES) SET(CHECK_INCLUDE_FILES_CONTENT "/* */\n") SET(MACRO_CHECK_INCLUDE_FILES_FLAGS ${CMAKE_REQUIRED_FLAGS}) diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake index c243deb8..b1dc4a57 100644 --- a/modules/FindGIF.cmake +++ b/modules/FindGIF.cmake @@ -13,7 +13,7 @@ FIND_PATH(GIF_INCLUDE_DIR gif_lib.h /usr/local/include ) -FIND_LIBRARY(GIF_LIBRARY NAMES gif libgif ungif libungif +FIND_LIBRARY(GIF_LIBRARY NAMES gif libgif ungif libungif giflib PATHS /usr/lib /usr/local/lib diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index e4f0a2d6..a6d016ef 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -81,11 +81,16 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) + # adjust dcopidl and the library output path depending on the platform IF (WIN32) - SET(KDE4_DCOPIDL_EXECUTABLE call ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl.bat ) + # under windows dcopidl.bat has to be used, except when using MSYS, then the perl script has to be used, Alex + IF ("${CMAKE_GENERATOR}" MATCHES "MSYS") + SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl ) + ELSE ("${CMAKE_GENERATOR}" MATCHES "MSYS") + SET(KDE4_DCOPIDL_EXECUTABLE call ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl.bat ) + ENDIF ("${CMAKE_GENERATOR}" MATCHES "MSYS") + SET(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) -# SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - # todo: copy Dlls only to ${CMAKE_BINARY_DIR}/lib ELSE (WIN32) SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl ) SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) |