diff options
| author | David Faure <faure@kde.org> | 2006-02-15 10:47:36 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-02-15 10:47:36 +0000 |
| commit | ffc69376dc591eae7b0ed2e974a599fb1b8b2aa8 (patch) | |
| tree | 8b96c99e279d45990ba048081fe4584ff877e066 | |
| parent | 527ca576efb8fd69d60d0a838ef1669642f39bdb (diff) | |
| download | extra-cmake-modules-ffc69376dc591eae7b0ed2e974a599fb1b8b2aa8.tar.gz extra-cmake-modules-ffc69376dc591eae7b0ed2e974a599fb1b8b2aa8.tar.bz2 | |
Lowercase some common keywords to improve readability
svn path=/trunk/KDE/kdelibs/; revision=509624
34 files changed, 983 insertions, 983 deletions
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 85c9279d..8ccb8c3b 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(CMAKE_INSTALL_PREFIX ${CMAKE_ROOT} ) +set(CMAKE_INSTALL_PREFIX ${CMAKE_ROOT} ) FILE(GLOB cmakeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.cmake") diff --git a/modules/CheckPrototypeExists.cmake b/modules/CheckPrototypeExists.cmake index 1c0d7c13..1c994ed4 100644 --- a/modules/CheckPrototypeExists.cmake +++ b/modules/CheckPrototypeExists.cmake @@ -9,12 +9,12 @@ INCLUDE(CheckCXXSourceCompiles) MACRO(CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT) - SET(_INCLUDE_FILES) - FOREACH(it ${_HEADER}) - SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n") - ENDFOREACH(it) + set(_INCLUDE_FILES) + foreach(it ${_HEADER}) + set(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n") + endforeach(it) - SET(_CHECK_PROTO_EXISTS_SOURCE_CODE " + set(_CHECK_PROTO_EXISTS_SOURCE_CODE " ${_INCLUDE_FILES} int main() { diff --git a/modules/CheckTypeSize.cmake b/modules/CheckTypeSize.cmake index e0f21371..ec1af0ab 100755 --- a/modules/CheckTypeSize.cmake +++ b/modules/CheckTypeSize.cmake @@ -7,36 +7,36 @@ # HAVE_${VARIABLE} - does the variable exists or not
MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
- SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
- IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
- SET(CHECK_TYPE_SIZE_TYPE "${TYPE}")
- SET(MACRO_CHECK_TYPE_SIZE_FLAGS
+ set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
+ if("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+ set(CHECK_TYPE_SIZE_TYPE "${TYPE}")
+ set(MACRO_CHECK_TYPE_SIZE_FLAGS
"${CMAKE_REQUIRED_FLAGS}")
- FOREACH(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H)
- IF("${def}")
- SET(MACRO_CHECK_TYPE_SIZE_FLAGS
+ foreach(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H)
+ if("${def}")
+ set(MACRO_CHECK_TYPE_SIZE_FLAGS
"${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
- ENDIF("${def}")
- ENDFOREACH(def)
- SET(CHECK_TYPE_SIZE_PREINCLUDE)
- SET(CHECK_TYPE_SIZE_PREMAIN)
- FOREACH(def ${CMAKE_EXTRA_INCLUDE_FILES})
- SET(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n")
- ENDFOREACH(def)
+ endif("${def}")
+ endforeach(def)
+ set(CHECK_TYPE_SIZE_PREINCLUDE)
+ set(CHECK_TYPE_SIZE_PREMAIN)
+ foreach(def ${CMAKE_EXTRA_INCLUDE_FILES})
+ set(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n")
+ endforeach(def)
CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CheckTypeSize.c.in"
"${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c" IMMEDIATE @ONLY)
FILE(READ "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckTypeSize.c"
CHECK_TYPE_SIZE_FILE_CONTENT)
- MESSAGE(STATUS "Check size of ${TYPE}")
- IF(CMAKE_REQUIRED_LIBRARIES)
- SET(CHECK_TYPE_SIZE_ADD_LIBRARIES
+ message(STATUS "Check size of ${TYPE}")
+ if(CMAKE_REQUIRED_LIBRARIES)
+ set(CHECK_TYPE_SIZE_ADD_LIBRARIES
"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
- ENDIF(CMAKE_REQUIRED_LIBRARIES)
+ endif(CMAKE_REQUIRED_LIBRARIES)
- IF(CMAKE_REQUIRED_INCLUDES)
- SET(CHECK_TYPE_SIZE_ADD_INCLUDES
+ if(CMAKE_REQUIRED_INCLUDES)
+ set(CHECK_TYPE_SIZE_ADD_INCLUDES
"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
- ENDIF(CMAKE_REQUIRED_INCLUDES)
+ endif(CMAKE_REQUIRED_INCLUDES)
TRY_RUN(${VARIABLE} HAVE_${VARIABLE}
${CMAKE_BINARY_DIR}
@@ -45,15 +45,15 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE) "${CHECK_TYPE_SIZE_ADD_INCLUDES}"
"${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
OUTPUT_VARIABLE OUTPUT)
- IF(HAVE_${VARIABLE})
- MESSAGE(STATUS "Check size of ${TYPE} - done")
+ if(HAVE_${VARIABLE})
+ message(STATUS "Check size of ${TYPE} - done")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
"Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n")
- ELSE(HAVE_${VARIABLE})
- MESSAGE(STATUS "Check size of ${TYPE} - failed")
+ else(HAVE_${VARIABLE})
+ message(STATUS "Check size of ${TYPE} - failed")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
"Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\nCheckTypeSize.c:\n${CHECK_TYPE_SIZE_FILE_CONTENT}\n\n")
- ENDIF(HAVE_${VARIABLE})
- ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
- SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )
+ endif(HAVE_${VARIABLE})
+ endif("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+ set(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )
ENDMACRO(CHECK_TYPE_SIZE)
diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake index ed02a46c..2ea1ead5 100644 --- a/modules/FindAGG.cmake +++ b/modules/FindAGG.cmake @@ -14,7 +14,7 @@ INCLUDE(UsePkgConfig) PKGCONFIG(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags) -SET(AGG_DEFINITIONS ${_AGGCflags}) +set(AGG_DEFINITIONS ${_AGGCflags}) FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h ${_AGGIncDir} @@ -29,18 +29,18 @@ FIND_LIBRARY(AGG_LIBRARIES NAMES agg /usr/local/lib ) -IF(AGG_INCLUDE_DIR AND AGG_LIBRARIES) - SET(AGG_FOUND TRUE) -ENDIF(AGG_INCLUDE_DIR AND AGG_LIBRARIES) - -IF(AGG_FOUND) - IF(NOT AGG_FIND_QUIETLY) - MESSAGE(STATUS "Found AGG: ${AGG_LIBRARIES}") - ENDIF(NOT AGG_FIND_QUIETLY) -ELSE(AGG_FOUND) - IF(AGG_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find AGG") - ENDIF(AGG_FIND_REQUIRED) -ENDIF(AGG_FOUND) +if(AGG_INCLUDE_DIR AND AGG_LIBRARIES) + set(AGG_FOUND TRUE) +endif(AGG_INCLUDE_DIR AND AGG_LIBRARIES) + +if(AGG_FOUND) + if(not AGG_FIND_QUIETLY) + message(STATUS "Found AGG: ${AGG_LIBRARIES}") + endif(not AGG_FIND_QUIETLY) +else(AGG_FOUND) + if(AGG_FIND_REQUIRED) + message(FATAL_ERROR "Could not find AGG") + endif(AGG_FIND_REQUIRED) +endif(AGG_FOUND) MARK_AS_ADVANCED(AGG_INCLUDE_DIR AGG_LIBRARIES) diff --git a/modules/FindASPELL.cmake b/modules/FindASPELL.cmake index 1233c976..f2ca068c 100644 --- a/modules/FindASPELL.cmake +++ b/modules/FindASPELL.cmake @@ -19,18 +19,18 @@ FIND_LIBRARY(ASPELL_LIBRARIES NAMES aspell aspell-15 /usr/local/lib ) -IF(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) - SET(ASPELL_FOUND TRUE) -ENDIF(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) +if(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) + set(ASPELL_FOUND TRUE) +endif(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARIES) -IF(ASPELL_FOUND) - IF(NOT ASPELL_FIND_QUIETLY) - MESSAGE(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}") - ENDIF(NOT ASPELL_FIND_QUIETLY) -ELSE(ASPELL_FOUND) - IF(ASPELL_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find ASPELL") - ENDIF(ASPELL_FIND_REQUIRED) -ENDIF(ASPELL_FOUND) +if(ASPELL_FOUND) + if(not ASPELL_FIND_QUIETLY) + message(STATUS "Found ASPELL: ${ASPELL_LIBRARIES}") + endif(not ASPELL_FIND_QUIETLY) +else(ASPELL_FOUND) + if(ASPELL_FIND_REQUIRED) + message(FATAL_ERROR "Could not find ASPELL") + endif(ASPELL_FIND_REQUIRED) +endif(ASPELL_FOUND) MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARIES) diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake index 21f4a825..5e9faad9 100644 --- a/modules/FindBZip2.cmake +++ b/modules/FindBZip2.cmake @@ -20,20 +20,20 @@ FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2 /usr/local/lib ) -IF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) - SET(BZIP2_FOUND TRUE) +if(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) + set(BZIP2_FOUND TRUE) INCLUDE(CheckLibraryExists) CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX) -ENDIF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) +endif(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES) -IF(BZIP2_FOUND) - IF(NOT BZip2_FIND_QUIETLY) - MESSAGE(STATUS "Found BZip2: ${BZIP2_LIBRARIES}") - ENDIF(NOT BZip2_FIND_QUIETLY) -ELSE(BZIP2_FOUND) - IF(BZip2_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find BZip2") - ENDIF(BZip2_FIND_REQUIRED) -ENDIF(BZIP2_FOUND) +if(BZIP2_FOUND) + if(not BZip2_FIND_QUIETLY) + message(STATUS "Found BZip2: ${BZIP2_LIBRARIES}") + endif(not BZip2_FIND_QUIETLY) +else(BZIP2_FOUND) + if(BZip2_FIND_REQUIRED) + message(FATAL_ERROR "Could not find BZip2") + endif(BZip2_FIND_REQUIRED) +endif(BZIP2_FOUND) MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES) diff --git a/modules/FindCarbon.cmake b/modules/FindCarbon.cmake index ffcd114a..f2fa376b 100644 --- a/modules/FindCarbon.cmake +++ b/modules/FindCarbon.cmake @@ -2,7 +2,7 @@ INCLUDE(CMakeFindFrameworks) CMAKE_FIND_FRAMEWORKS(Carbon) -IF(Carbon_FRAMEWORKS) - SET (CARBON_LIBRARY "-framework Carbon" CACHE FILEPATH "Carbon framework" FORCE) - SET (CARBON_FOUND 1) -ENDIF(Carbon_FRAMEWORKS) +if(Carbon_FRAMEWORKS) + set (CARBON_LIBRARY "-framework Carbon" CACHE FILEPATH "Carbon framework" FORCE) + set (CARBON_FOUND 1) +endif(Carbon_FRAMEWORKS) diff --git a/modules/FindCups.cmake b/modules/FindCups.cmake index fa97b6f1..f0689036 100644 --- a/modules/FindCups.cmake +++ b/modules/FindCups.cmake @@ -19,18 +19,18 @@ FIND_LIBRARY(CUPS_LIBRARIES NAMES cups /usr/local/lib ) -IF(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES) - SET(CUPS_FOUND TRUE) -ENDIF(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES) +if(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES) + set(CUPS_FOUND TRUE) +endif(CUPS_INCLUDE_DIR AND CUPS_LIBRARIES) -IF(CUPS_FOUND) - IF(NOT Cups_FIND_QUIETLY) - MESSAGE(STATUS "Found Cups: ${CUPS_LIBRARIES}") - ENDIF(NOT Cups_FIND_QUIETLY) -ELSE(CUPS_FOUND) - IF(Cups_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Cups") - ENDIF(Cups_FIND_REQUIRED) -ENDIF(CUPS_FOUND) +if(CUPS_FOUND) + if(not Cups_FIND_QUIETLY) + message(STATUS "Found Cups: ${CUPS_LIBRARIES}") + endif(not Cups_FIND_QUIETLY) +else(CUPS_FOUND) + if(Cups_FIND_REQUIRED) + message(FATAL_ERROR "Could not find Cups") + endif(Cups_FIND_REQUIRED) +endif(CUPS_FOUND) MARK_AS_ADVANCED(CUPS_INCLUDE_DIR CUPS_LIBRARIES) diff --git a/modules/FindDNSSD.cmake b/modules/FindDNSSD.cmake index 7b6f81e3..e13956f1 100644 --- a/modules/FindDNSSD.cmake +++ b/modules/FindDNSSD.cmake @@ -20,18 +20,18 @@ FIND_LIBRARY(DNSSD_LIBRARIES NAMES dns_sd /usr/local/lib ) -IF(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES) - SET(DNSSD_FOUND TRUE) -ENDIF(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES) +if(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES) + set(DNSSD_FOUND TRUE) +endif(DNSSD_INCLUDE_DIR AND DNSSD_LIBRARIES) -IF(DNSSD_FOUND) - IF(NOT DNSSD_FIND_QUIETLY) - MESSAGE(STATUS "Found DNSSD: ${DNSSD_LIBRARIES}") - ENDIF(NOT DNSSD_FIND_QUIETLY) -ELSE(DNSSD_FOUND) - IF(DNSSD_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find DNSSD") - ENDIF(DNSSD_FIND_REQUIRED) -ENDIF(DNSSD_FOUND) +if(DNSSD_FOUND) + if(not DNSSD_FIND_QUIETLY) + message(STATUS "Found DNSSD: ${DNSSD_LIBRARIES}") + endif(not DNSSD_FIND_QUIETLY) +else(DNSSD_FOUND) + if(DNSSD_FIND_REQUIRED) + message(FATAL_ERROR "Could not find DNSSD") + endif(DNSSD_FIND_REQUIRED) +endif(DNSSD_FOUND) MARK_AS_ADVANCED(DNSSD_INCLUDE_DIR DNSSD_LIBRARIES) diff --git a/modules/FindFAM.cmake b/modules/FindFAM.cmake index 0479bc8f..b61fc4e7 100644 --- a/modules/FindFAM.cmake +++ b/modules/FindFAM.cmake @@ -17,20 +17,20 @@ FIND_LIBRARY(FAM_LIBRARIES NAMES fam ) -IF(FAM_INCLUDE_DIR AND FAM_LIBRARIES) - SET(FAM_FOUND TRUE) -ENDIF(FAM_INCLUDE_DIR AND FAM_LIBRARIES) - - -IF(FAM_FOUND) - IF(NOT FAM_FIND_QUIETLY) - MESSAGE(STATUS "Found fam: ${FAM_LIBRARIES}") - ENDIF(NOT FAM_FIND_QUIETLY) -ELSE(FAM_FOUND) - IF(FAM_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find fam library") - ENDIF(FAM_FIND_REQUIRED) -ENDIF(FAM_FOUND) +if(FAM_INCLUDE_DIR AND FAM_LIBRARIES) + set(FAM_FOUND TRUE) +endif(FAM_INCLUDE_DIR AND FAM_LIBRARIES) + + +if(FAM_FOUND) + if(not FAM_FIND_QUIETLY) + message(STATUS "Found fam: ${FAM_LIBRARIES}") + endif(not FAM_FIND_QUIETLY) +else(FAM_FOUND) + if(FAM_FIND_REQUIRED) + message(FATAL_ERROR "Could not find fam library") + endif(FAM_FIND_REQUIRED) +endif(FAM_FOUND) MARK_AS_ADVANCED(FAM_INCLUDE_DIR FAM_LIBRARIES) diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake index 94e75388..6222b0d8 100644 --- a/modules/FindGIF.cmake +++ b/modules/FindGIF.cmake @@ -19,18 +19,18 @@ FIND_LIBRARY(GIF_LIBRARIES NAMES gif libgif ungif libungif giflib /usr/local/lib ) -IF(GIF_INCLUDE_DIR AND GIF_LIBRARIES) - SET(GIF_FOUND TRUE) -ENDIF(GIF_INCLUDE_DIR AND GIF_LIBRARIES) +if(GIF_INCLUDE_DIR AND GIF_LIBRARIES) + set(GIF_FOUND TRUE) +endif(GIF_INCLUDE_DIR AND GIF_LIBRARIES) -IF(GIF_FOUND) - IF(NOT GIF_FIND_QUIETLY) - MESSAGE(STATUS "Found GIF: ${GIF_LIBRARIES}") - ENDIF(NOT GIF_FIND_QUIETLY) -ELSE(GIF_FOUND) - IF(GIF_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find GIF") - ENDIF(GIF_FIND_REQUIRED) -ENDIF(GIF_FOUND) +if(GIF_FOUND) + if(not GIF_FIND_QUIETLY) + message(STATUS "Found GIF: ${GIF_LIBRARIES}") + endif(not GIF_FIND_QUIETLY) +else(GIF_FOUND) + if(GIF_FIND_REQUIRED) + message(FATAL_ERROR "Could not find GIF") + endif(GIF_FIND_REQUIRED) +endif(GIF_FOUND) MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARIES) diff --git a/modules/FindGNUWIN32.cmake b/modules/FindGNUWIN32.cmake index fc57f022..d1c2422f 100644 --- a/modules/FindGNUWIN32.cmake +++ b/modules/FindGNUWIN32.cmake @@ -1,4 +1,4 @@ -IF (WIN32) +if (WIN32) INCLUDE(MacroGetenvWinPath) @@ -9,24 +9,24 @@ FIND_FILE(GNUWIN32_DIR GNUWIN32 "C:/" ) -IF(GNUWIN32_DIRECTORY) - SET(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include) - SET(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib) - SET(GNUWIN32_BINARY_DIR ${GNUWIN32_DIR}/bin) - SET(GNUWIN32_FOUND TRUE) -ELSE(GNUWIN32_DIRECTORY) - SET(GNUWIN32_FOUND) -ENDIF(GNUWIN32_DIRECTORY) +if(GNUWIN32_DIRECTORY) + set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include) + set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib) + set(GNUWIN32_BINARY_DIR ${GNUWIN32_DIR}/bin) + set(GNUWIN32_FOUND TRUE) +else(GNUWIN32_DIRECTORY) + set(GNUWIN32_FOUND) +endif(GNUWIN32_DIRECTORY) -IF(GNUWIN32_FOUND) - IF(NOT GNUWIN32_FIND_QUIETLY) - MESSAGE(STATUS "Found GNUWIN32: ${GNUWIN32_DIR}") - ENDIF(NOT GNUWIN32_FIND_QUIETLY) -ELSE(GNUWIN32_FOUND) - IF(GNUWIN32_FIND_REQUIRED) - MESSAGE(SEND_ERROR "Could not find GNUWIN32") - ENDIF(GNUWIN32_FIND_REQUIRED) -ENDIF(GNUWIN32_FOUND) +if(GNUWIN32_FOUND) + if(not GNUWIN32_FIND_QUIETLY) + message(STATUS "Found GNUWIN32: ${GNUWIN32_DIR}") + endif(not GNUWIN32_FIND_QUIETLY) +else(GNUWIN32_FOUND) + if(GNUWIN32_FIND_REQUIRED) + message(SEND_ERROR "Could not find GNUWIN32") + endif(GNUWIN32_FIND_REQUIRED) +endif(GNUWIN32_FOUND) -ENDIF (WIN32) +endif (WIN32) diff --git a/modules/FindHSPELL.cmake b/modules/FindHSPELL.cmake index 0ae31553..b0681d43 100644 --- a/modules/FindHSPELL.cmake +++ b/modules/FindHSPELL.cmake @@ -19,19 +19,19 @@ FIND_LIBRARY(HSPELL_LIBRARIES NAMES hspell /usr/local/lib ) -IF(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) - SET(HSPELL_FOUND TRUE) -ENDIF(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) +if(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) + set(HSPELL_FOUND TRUE) +endif(HSPELL_INCLUDE_DIR AND HSPELL_LIBRARIES) -IF(HSPELL_FOUND) - IF(NOT HSPELL_FIND_QUIETLY) - MESSAGE(STATUS "Found HSPELL: ${HSPELL_LIBRARIES}") - ENDIF(NOT HSPELL_FIND_QUIETLY) -ELSE(HSPELL_FOUND) - IF(HSPELL_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find HSPELL") - ENDIF(HSPELL_FIND_REQUIRED) -ENDIF(HSPELL_FOUND) +if(HSPELL_FOUND) + if(not HSPELL_FIND_QUIETLY) + message(STATUS "Found HSPELL: ${HSPELL_LIBRARIES}") + endif(not HSPELL_FIND_QUIETLY) +else(HSPELL_FOUND) + if(HSPELL_FIND_REQUIRED) + message(FATAL_ERROR "Could not find HSPELL") + endif(HSPELL_FIND_REQUIRED) +endif(HSPELL_FOUND) MARK_AS_ADVANCED(HSPELL_INCLUDE_DIR HSPELL_LIBRARIES) diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake index 44f0a7a4..4de93039 100644 --- a/modules/FindJasper.cmake +++ b/modules/FindJasper.cmake @@ -18,20 +18,20 @@ FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper FIND_PACKAGE(JPEG) -IF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) - SET(JASPER_FOUND TRUE) - SET(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} ) -ENDIF(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) +if(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) + set(JASPER_FOUND TRUE) + set(JASPER_LIBRARIES ${JASPER_LIBRARY} ${JPEG_LIBRARIES} ) +endif(JASPER_INCLUDE_DIR AND JASPER_LIBRARIES AND JPEG_LIBRARIES) -IF(JASPER_FOUND) - IF(NOT Jasper_FIND_QUIETLY) - MESSAGE(STATUS "Found jasper: ${JASPER_LIBRARIES}") - ENDIF(NOT Jasper_FIND_QUIETLY) -ELSE(JASPER_FOUND) - IF(Jasper_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find jasper library") - ENDIF(Jasper_FIND_REQUIRED) -ENDIF(JASPER_FOUND) +if(JASPER_FOUND) + if(not Jasper_FIND_QUIETLY) + message(STATUS "Found jasper: ${JASPER_LIBRARIES}") + endif(not Jasper_FIND_QUIETLY) +else(JASPER_FOUND) + if(Jasper_FIND_REQUIRED) + message(FATAL_ERROR "Could not find jasper library") + endif(Jasper_FIND_REQUIRED) +endif(JASPER_FOUND) MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARIES) diff --git a/modules/FindKDE3.cmake b/modules/FindKDE3.cmake index dba73688..498dffec 100644 --- a/modules/FindKDE3.cmake +++ b/modules/FindKDE3.cmake @@ -27,8 +27,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.2) -SET(QT_MT_REQUIRED TRUE) -#SET(QT_MIN_VERSION "3.0.0") +set(QT_MT_REQUIRED TRUE) +#set(QT_MIN_VERSION "3.0.0") #this line includes FindQt.cmake, which searches the Qt library and headers FIND_PACKAGE(Qt3 REQUIRED) @@ -37,20 +37,20 @@ FIND_PACKAGE(X11 REQUIRED) #add the definitions found by FindQt to the current definitions #ADD_DEFINITIONS(${QT_DEFINITIONS} -DQT_CLEAN_NAMESPACE) -SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} kdecore) +set(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} kdecore) #add some KDE specific stuff -SET(KDE3_DEFINITIONS -DQT_CLEAN_NAMESPACE -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common) +set(KDE3_DEFINITIONS -DQT_CLEAN_NAMESPACE -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common) #only on linux, but not e.g. on FreeBSD: -IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - SET(KDE3_DEFINITIONS ${KDE3_DEFINITIONS} -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) -ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + set(KDE3_DEFINITIONS ${KDE3_DEFINITIONS} -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) +endif(CMAKE_SYSTEM_NAME MATCHES "Linux") -#SET(CMAKE_SHARED_LINKER_FLAGS "-avoid-version -module -Wl,--no-undefined -Wl,--allow-shlib-undefined") -#SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") -#SET(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") +#set(CMAKE_SHARED_LINKER_FLAGS "-avoid-version -module -Wl,--no-undefined -Wl,--allow-shlib-undefined") +#set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") +#set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") #now try to find some kde stuff @@ -103,59 +103,59 @@ FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS INCLUDE(KDE3Macros) #set KDE3_FOUND -IF (KDE3_INCLUDE_DIR AND KDE3_LIB_DIR AND KDE3_SERVICETYPES_DIR AND KDE3_DCOPIDL_EXECUTABLE AND KDE3_DCOPIDL2CPP_EXECUTABLE AND KDE3_KCFGC_EXECUTABLE) - SET(KDE3_FOUND TRUE) -ELSE (KDE3_INCLUDE_DIR AND KDE3_LIB_DIR AND KDE3_SERVICETYPES_DIR AND KDE3_DCOPIDL_EXECUTABLE AND KDE3_DCOPIDL2CPP_EXECUTABLE AND KDE3_KCFGC_EXECUTABLE) - SET(KDE3_FOUND FALSE) -ENDIF (KDE3_INCLUDE_DIR AND KDE3_LIB_DIR AND KDE3_SERVICETYPES_DIR AND KDE3_DCOPIDL_EXECUTABLE AND KDE3_DCOPIDL2CPP_EXECUTABLE AND KDE3_KCFGC_EXECUTABLE) +if (KDE3_INCLUDE_DIR AND KDE3_LIB_DIR AND KDE3_SERVICETYPES_DIR AND KDE3_DCOPIDL_EXECUTABLE AND KDE3_DCOPIDL2CPP_EXECUTABLE AND KDE3_KCFGC_EXECUTABLE) + set(KDE3_FOUND TRUE) +else (KDE3_INCLUDE_DIR AND KDE3_LIB_DIR AND KDE3_SERVICETYPES_DIR AND KDE3_DCOPIDL_EXECUTABLE AND KDE3_DCOPIDL2CPP_EXECUTABLE AND KDE3_KCFGC_EXECUTABLE) + set(KDE3_FOUND FALSE) +endif (KDE3_INCLUDE_DIR AND KDE3_LIB_DIR AND KDE3_SERVICETYPES_DIR AND KDE3_DCOPIDL_EXECUTABLE AND KDE3_DCOPIDL2CPP_EXECUTABLE AND KDE3_KCFGC_EXECUTABLE) MACRO (KDE3_PRINT_RESULTS) - IF(KDE3_INCLUDE_DIR) - MESSAGE(STATUS "Found KDE3 include dir: ${KDE3_INCLUDE_DIR}") - ELSE(KDE3_INCLUDE_DIR) - MESSAGE(STATUS "Didn't find KDE3 headers") - ENDIF(KDE3_INCLUDE_DIR) - - IF(KDE3_LIB_DIR) - MESSAGE(STATUS "Found KDE3 library dir: ${KDE3_LIB_DIR}") - ELSE(KDE3_LIB_DIR) - MESSAGE(STATUS "Didn't find KDE3 core library") - ENDIF(KDE3_LIB_DIR) - - IF(KDE3_DCOPIDL_EXECUTABLE) - MESSAGE(STATUS "Found KDE3 dcopidl preprocessor: ${KDE3_DCOPIDL_EXECUTABLE}") - ELSE(KDE3_DCOPIDL_EXECUTABLE) - MESSAGE(STATUS "Didn't find the KDE3 dcopidl preprocessor") - ENDIF(KDE3_DCOPIDL_EXECUTABLE) - - IF(KDE3_DCOPIDL2CPP_EXECUTABLE) - MESSAGE(STATUS "Found KDE3 dcopidl2cpp preprocessor: ${KDE3_DCOPIDL2CPP_EXECUTABLE}") - ELSE(KDE3_DCOPIDL2CPP_EXECUTABLE) - MESSAGE(STATUS "Didn't find the KDE3 dcopidl2cpp preprocessor") - ENDIF(KDE3_DCOPIDL2CPP_EXECUTABLE) - - IF(KDE3_KCFGC_EXECUTABLE) - MESSAGE(STATUS "Found KDE3 kconfig_compiler preprocessor: ${KDE3_KCFGC_EXECUTABLE}") - ELSE(KDE3_KCFGC_EXECUTABLE) - MESSAGE(STATUS "Didn't find the KDE3 kconfig_compiler preprocessor") - ENDIF(KDE3_KCFGC_EXECUTABLE) + if(KDE3_INCLUDE_DIR) + message(STATUS "Found KDE3 include dir: ${KDE3_INCLUDE_DIR}") + else(KDE3_INCLUDE_DIR) + message(STATUS "Didn't find KDE3 headers") + endif(KDE3_INCLUDE_DIR) + + if(KDE3_LIB_DIR) + message(STATUS "Found KDE3 library dir: ${KDE3_LIB_DIR}") + else(KDE3_LIB_DIR) + message(STATUS "Didn't find KDE3 core library") + endif(KDE3_LIB_DIR) + + if(KDE3_DCOPIDL_EXECUTABLE) + message(STATUS "Found KDE3 dcopidl preprocessor: ${KDE3_DCOPIDL_EXECUTABLE}") + else(KDE3_DCOPIDL_EXECUTABLE) + message(STATUS "Didn't find the KDE3 dcopidl preprocessor") + endif(KDE3_DCOPIDL_EXECUTABLE) + + if(KDE3_DCOPIDL2CPP_EXECUTABLE) + message(STATUS "Found KDE3 dcopidl2cpp preprocessor: ${KDE3_DCOPIDL2CPP_EXECUTABLE}") + else(KDE3_DCOPIDL2CPP_EXECUTABLE) + message(STATUS "Didn't find the KDE3 dcopidl2cpp preprocessor") + endif(KDE3_DCOPIDL2CPP_EXECUTABLE) + + if(KDE3_KCFGC_EXECUTABLE) + message(STATUS "Found KDE3 kconfig_compiler preprocessor: ${KDE3_KCFGC_EXECUTABLE}") + else(KDE3_KCFGC_EXECUTABLE) + message(STATUS "Didn't find the KDE3 kconfig_compiler preprocessor") + endif(KDE3_KCFGC_EXECUTABLE) ENDMACRO (KDE3_PRINT_RESULTS) -IF (KDE3_FIND_REQUIRED AND NOT KDE3_FOUND) +if (KDE3_FIND_REQUIRED AND not KDE3_FOUND) #bail out if something wasn't found KDE3_PRINT_RESULTS() - MESSAGE(FATAL_ERROR "Could not find everything required for compiling KDE 3 programs") + message(FATAL_ERROR "Could not find everything required for compiling KDE 3 programs") -ENDIF (KDE3_FIND_REQUIRED AND NOT KDE3_FOUND) +endif (KDE3_FIND_REQUIRED AND not KDE3_FOUND) -IF (NOT KDE3_FIND_QUIETLY) +if (not KDE3_FIND_QUIETLY) KDE3_PRINT_RESULTS() -ENDIF (NOT KDE3_FIND_QUIETLY) +endif (not KDE3_FIND_QUIETLY) #add the found Qt and KDE include directories to the current include path -SET(KDE3_INCLUDE_DIRS ${QT_INCLUDE_DIR} ${KDE3_INCLUDE_DIR}) +set(KDE3_INCLUDE_DIRS ${QT_INCLUDE_DIR} ${KDE3_INCLUDE_DIR}) #INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${KDE3_INCLUDE_DIR} .) #LINK_DIRECTORIES(${KDE3_LIB_DIR}) diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index 6e69ee42..6a81de18 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -33,39 +33,39 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.3.3) #this line includes FindQt.cmake, which searches the Qt library and headers FIND_PACKAGE(Qt4 REQUIRED) -SET(QT_AND_KDECORE_LIBS ${QT_QTCORE_LIBRARY} kdecore) +set(QT_AND_KDECORE_LIBS ${QT_QTCORE_LIBRARY} kdecore) INCLUDE (MacroLibrary) #add some KDE specific stuff -SET(KDE4_DIR ${CMAKE_INSTALL_PREFIX}) -SET(KDE4_APPS_DIR /share/applnk) -SET(KDE4_CONFIG_DIR /share/config) -SET(KDE4_DATA_DIR /share/apps) -SET(KDE4_HTML_DIR /share/doc/HTML) -SET(KDE4_ICON_DIR /share/icons) -SET(KDE4_KCFG_DIR /share/config.kcfg) -SET(KDE4_LIBS_HTML_DIR /share/doc/HTML) -SET(KDE4_LOCALE_DIR /share/locale) -SET(KDE4_MIME_DIR /share/mimelnk) -SET(KDE4_SERVICES_DIR /share/services) -SET(KDE4_SERVICETYPES_DIR /share/servicetypes) -SET(KDE4_SOUND_DIR /share/sounds) -SET(KDE4_TEMPLATES_DIR /share/templates) -SET(KDE4_WALLPAPER_DIR /share/wallpapers) -SET(KDE4_KCONF_UPDATE_DIR /share/apps/kconf_update/ ) -SET(XDG_APPS_DIR /share/applications/kde) -SET(XDG_DIRECTORY_DIR /share/desktop-directories) +set(KDE4_DIR ${CMAKE_INSTALL_PREFIX}) +set(KDE4_APPS_DIR /share/applnk) +set(KDE4_CONFIG_DIR /share/config) +set(KDE4_DATA_DIR /share/apps) +set(KDE4_HTML_DIR /share/doc/HTML) +set(KDE4_ICON_DIR /share/icons) +set(KDE4_KCFG_DIR /share/config.kcfg) +set(KDE4_LIBS_HTML_DIR /share/doc/HTML) +set(KDE4_LOCALE_DIR /share/locale) +set(KDE4_MIME_DIR /share/mimelnk) +set(KDE4_SERVICES_DIR /share/services) +set(KDE4_SERVICETYPES_DIR /share/servicetypes) +set(KDE4_SOUND_DIR /share/sounds) +set(KDE4_TEMPLATES_DIR /share/templates) +set(KDE4_WALLPAPER_DIR /share/wallpapers) +set(KDE4_KCONF_UPDATE_DIR /share/apps/kconf_update/ ) +set(XDG_APPS_DIR /share/applications/kde) +set(XDG_DIRECTORY_DIR /share/desktop-directories) # the following are directories where stuff will be installed to -#SET(KDE4_SYSCONF_INSTALL_DIR "/etc" CACHE STRING "The kde sysconfig install dir (default /etc)") -SET(KDE4_MAN_INSTALL_DIR "/man" CACHE STRING "The kde man install dir (default prefix/man/)") -SET(KDE4_INFO_INSTALL_DIR "/info" CACHE STRING "The kde info install dir (default prefix/info)") -SET(KDE4_LIB_INSTALL_DIR "/lib" CACHE STRING "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)") -SET(KDE4_PLUGIN_INSTALL_DIR "${KDE4_LIB_INSTALL_DIR}/kde4" CACHE STRING "The subdirectory relative to the install prefix where plugins will be installed (default is ${KDE4_LIB_INSTALL_DIR}/kde4)") +#set(KDE4_SYSCONF_INSTALL_DIR "/etc" CACHE STRING "The kde sysconfig install dir (default /etc)") +set(KDE4_MAN_INSTALL_DIR "/man" CACHE STRING "The kde man install dir (default prefix/man/)") +set(KDE4_INFO_INSTALL_DIR "/info" CACHE STRING "The kde info install dir (default prefix/info)") +set(KDE4_LIB_INSTALL_DIR "/lib" CACHE STRING "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)") +set(KDE4_PLUGIN_INSTALL_DIR "${KDE4_LIB_INSTALL_DIR}/kde4" CACHE STRING "The subdirectory relative to the install prefix where plugins will be installed (default is ${KDE4_LIB_INSTALL_DIR}/kde4)") @@ -74,46 +74,46 @@ SET(KDE4_PLUGIN_INSTALL_DIR "${KDE4_LIB_INSTALL_DIR}/kde4" CACHE STRING "The su #are we trying to compile kdelibs ? #then enter bootstrap mode -IF(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) +if(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) - MESSAGE(STATUS "Building kdelibs...") + message(STATUS "Building kdelibs...") - SET(KDE4_INCLUDE_DIR ${CMAKE_SOURCE_DIR}) + set(KDE4_INCLUDE_DIR ${CMAKE_SOURCE_DIR}) - SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) + set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) # adjust dcopidl and the library output path depending on the platform - IF (WIN32) + if (WIN32) # 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") + 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} ) - ELSE (WIN32) - SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl ) - SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - ENDIF (WIN32) - - SET(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}) - SET(KDE4_KALYPTUS_DIR ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/ ) + set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) + else (WIN32) + set(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl ) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) + endif (WIN32) + + set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}) + set(KDE4_KALYPTUS_DIR ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/ ) # CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC - SET(KDE4_DCOPIDL2CPP_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp ) - SET(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) + set(KDE4_DCOPIDL2CPP_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/dcopidl2cpp ) + set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) # when building kdelibs, make the dcop and kcfg rules depend on the binaries... - SET( _KDE4_DCOPIDL2CPP_DEP dcopidl2cpp) - SET( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) + set( _KDE4_DCOPIDL2CPP_DEP dcopidl2cpp) + set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) -ELSE(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) +else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) # ... but not otherwise - SET( _KDE4_DCOPIDL2CPP_DEP ) - SET( _KDE4_KCONFIG_COMPILER_DEP) + set( _KDE4_DCOPIDL2CPP_DEP ) + set( _KDE4_KCONFIG_COMPILER_DEP) # at first the KDE include direcory # this should better check for a header which didn't exist in KDE < 4 @@ -164,95 +164,95 @@ ELSE(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) /opt/kde4/bin ) -ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) +endif(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) # this is already in cmake cvs and can be removed once we require it -IF (WIN32) +if (WIN32) GET_FILENAME_COMPONENT(_tmp_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME_WE) - IF ( _tmp_COMPILER_NAME MATCHES cl ) - SET(MSVC TRUE) - ENDIF ( _tmp_COMPILER_NAME MATCHES cl ) -ENDIF (WIN32) + if ( _tmp_COMPILER_NAME MATCHES cl ) + set(MSVC TRUE) + endif ( _tmp_COMPILER_NAME MATCHES cl ) +endif (WIN32) ##################### and now the platform specific stuff ############################ -IF(UNIX AND NOT APPLE) +if(UNIX AND not APPLE) FIND_PACKAGE(X11 REQUIRED) - SET(_KDE4_PLATFORM_INCLUDE_DIRS ${X11_INCLUDE_DIR} ) -ENDIF(UNIX AND NOT APPLE) + set(_KDE4_PLATFORM_INCLUDE_DIRS ${X11_INCLUDE_DIR} ) +endif(UNIX AND not APPLE) -IF (WIN32) +if (WIN32) - IF(CYGWIN) - MESSAGE(FATAL_ERROR "Support for Cygwin not yet implemented, please edit FindKDE4.cmake to enable it") - ENDIF(CYGWIN) + if(CYGWIN) + message(FATAL_ERROR "Support for Cygwin not yet implemented, please edit FindKDE4.cmake to enable it") + endif(CYGWIN) FIND_PACKAGE(KDEWIN32 REQUIRED) - SET( _KDE4_PLATFORM_INCLUDE_DIRS ${KDEWIN32_INCLUDES}) - SET( QT_AND_KDECORE_LIBS ${QT_AND_KDECORE_LIBS} ${KDEWIN32_LIBRARIES} ) + set( _KDE4_PLATFORM_INCLUDE_DIRS ${KDEWIN32_INCLUDES}) + set( QT_AND_KDECORE_LIBS ${QT_AND_KDECORE_LIBS} ${KDEWIN32_LIBRARIES} ) # windows, mingw - IF(MINGW) + if(MINGW) #hmmm, something special to do here ? - ENDIF(MINGW) + endif(MINGW) # windows, microsoft compiler - IF(MSVC) - SET( _KDE4_PLATFORM_DEFINITIONS -DKDE_FULL_TEMPLATE_EXPORT_INSTANTIATION -DWIN32_LEAN_AND_MEAN -DUNICODE ) - ENDIF(MSVC) + if(MSVC) + set( _KDE4_PLATFORM_DEFINITIONS -DKDE_FULL_TEMPLATE_EXPORT_INSTANTIATION -DWIN32_LEAN_AND_MEAN -DUNICODE ) + endif(MSVC) -ENDIF (WIN32) +endif (WIN32) # only on linux, but not e.g. on FreeBSD: -IF(CMAKE_SYSTEM_NAME MATCHES Linux) - SET ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) - SET ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") - SET ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") - SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common") - SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -fno-exceptions -fno-check-new -fno-common") -ENDIF(CMAKE_SYSTEM_NAME MATCHES Linux) +if(CMAKE_SYSTEM_NAME MATCHES Linux) + set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) + set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") + set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common") + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -fno-exceptions -fno-check-new -fno-common") +endif(CMAKE_SYSTEM_NAME MATCHES Linux) # works on FreeBSD, not tested on NetBSD and OpenBSD -IF(CMAKE_SYSTEM_NAME MATCHES BSD) - SET ( _KDE4_PLATFORM_DEFINITIONS -D_GNU_SOURCE ) - SET ( CMAKE_SHARED_LINKER_FLAGS "-avoid-version -lc") - SET ( CMAKE_MODULE_LINKER_FLAGS "-avoid-version -lc") - SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common") - SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common") -ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD) +if(CMAKE_SYSTEM_NAME MATCHES BSD) + set ( _KDE4_PLATFORM_DEFINITIONS -D_GNU_SOURCE ) + set ( CMAKE_SHARED_LINKER_FLAGS "-avoid-version -lc") + set ( CMAKE_MODULE_LINKER_FLAGS "-avoid-version -lc") + set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common") + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common") +endif(CMAKE_SYSTEM_NAME MATCHES BSD) # This will need to be modified later to support either Qt/X11 or Qt/Mac builds -IF(APPLE) +if(APPLE) - SET ( _KDE4_PLATFORM_DEFINITIONS -D__APPLE_KDE__ ) + set ( _KDE4_PLATFORM_DEFINITIONS -D__APPLE_KDE__ ) # we need to set MACOSX_DEPLOYMENT_TARGET to (I believe) at least 10.2 or maybe 10.3 to allow # -undefined dynamic_lookup; in the future we should do this programmatically # hmm... why doesn't this work? - SET (ENV{MACOSX_DEPLOYMENT_TARGET} 10.3) + set (ENV{MACOSX_DEPLOYMENT_TARGET} 10.3) # "-undefined dynamic_lookup" means we don't care about missing symbols at link-time by default # this is bad, but unavoidable until there is the equivalent of libtool -no-undefined implemented # or perhaps it already is, and I just don't know where to look ;) - SET (CMAKE_SHARED_LINKER_FLAGS "-single_module -multiply_defined suppress") - SET (CMAKE_MODULE_LINKER_FLAGS "-multiply_defined suppress") - #SET(CMAKE_SHARED_LINKER_FLAGS "-single_module -undefined dynamic_lookup -multiply_defined suppress") - #SET(CMAKE_MODULE_LINKER_FLAGS "-undefined dynamic_lookup -multiply_defined suppress") + set (CMAKE_SHARED_LINKER_FLAGS "-single_module -multiply_defined suppress") + set (CMAKE_MODULE_LINKER_FLAGS "-multiply_defined suppress") + #set(CMAKE_SHARED_LINKER_FLAGS "-single_module -undefined dynamic_lookup -multiply_defined suppress") + #set(CMAKE_MODULE_LINKER_FLAGS "-undefined dynamic_lookup -multiply_defined suppress") - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Os") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Os") -ENDIF(APPLE) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Os") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Os") +endif(APPLE) ########### end of platform specific stuff ########################## @@ -262,59 +262,59 @@ INCLUDE(KDE4Macros) # decide whether KDE4 has been found -IF (KDE4_INCLUDE_DIR AND KDE4_LIB_DIR AND KDE4_SERVICETYPES_DIR AND KDE4_DCOPIDL_EXECUTABLE AND KDE4_DCOPIDL2CPP_EXECUTABLE AND KDE4_KCFGC_EXECUTABLE) - SET(KDE4_FOUND TRUE) -ELSE (KDE4_INCLUDE_DIR AND KDE4_LIB_DIR AND KDE4_SERVICETYPES_DIR AND KDE4_DCOPIDL_EXECUTABLE AND KDE4_DCOPIDL2CPP_EXECUTABLE AND KDE4_KCFGC_EXECUTABLE) - SET(KDE4_FOUND FALSE) -ENDIF (KDE4_INCLUDE_DIR AND KDE4_LIB_DIR AND KDE4_SERVICETYPES_DIR AND KDE4_DCOPIDL_EXECUTABLE AND KDE4_DCOPIDL2CPP_EXECUTABLE AND KDE4_KCFGC_EXECUTABLE) +if (KDE4_INCLUDE_DIR AND KDE4_LIB_DIR AND KDE4_SERVICETYPES_DIR AND KDE4_DCOPIDL_EXECUTABLE AND KDE4_DCOPIDL2CPP_EXECUTABLE AND KDE4_KCFGC_EXECUTABLE) + set(KDE4_FOUND TRUE) +else (KDE4_INCLUDE_DIR AND KDE4_LIB_DIR AND KDE4_SERVICETYPES_DIR AND KDE4_DCOPIDL_EXECUTABLE AND KDE4_DCOPIDL2CPP_EXECUTABLE AND KDE4_KCFGC_EXECUTABLE) + set(KDE4_FOUND FALSE) +endif (KDE4_INCLUDE_DIR AND KDE4_LIB_DIR AND KDE4_SERVICETYPES_DIR AND KDE4_DCOPIDL_EXECUTABLE AND KDE4_DCOPIDL2CPP_EXECUTABLE AND KDE4_KCFGC_EXECUTABLE) MACRO (KDE4_PRINT_RESULTS) - IF(KDE4_INCLUDE_DIR) - MESSAGE(STATUS "Found KDE4 include dir: ${KDE4_INCLUDE_DIR}") - ELSE(KDE4_INCLUDE_DIR) - MESSAGE(STATUS "Didn't find KDE4 headers") - ENDIF(KDE4_INCLUDE_DIR) - - IF(KDE4_LIB_DIR) - MESSAGE(STATUS "Found KDE4 library dir: ${KDE4_LIB_DIR}") - ELSE(KDE4_LIB_DIR) - MESSAGE(STATUS "Didn't find KDE4 core library") - ENDIF(KDE4_LIB_DIR) - - IF(KDE4_DCOPIDL_EXECUTABLE) - MESSAGE(STATUS "Found KDE4 dcopidl preprocessor: ${KDE4_DCOPIDL_EXECUTABLE}") - ELSE(KDE4_DCOPIDL_EXECUTABLE) - MESSAGE(STATUS "Didn't find the KDE4 dcopidl preprocessor") - ENDIF(KDE4_DCOPIDL_EXECUTABLE) - - IF(KDE4_DCOPIDL2CPP_EXECUTABLE) - MESSAGE(STATUS "Found KDE4 dcopidl2cpp preprocessor: ${KDE4_DCOPIDL2CPP_EXECUTABLE}") - ELSE(KDE4_DCOPIDL2CPP_EXECUTABLE) - MESSAGE(STATUS "Didn't find the KDE4 dcopidl2cpp preprocessor") - ENDIF(KDE4_DCOPIDL2CPP_EXECUTABLE) - - IF(KDE4_KCFGC_EXECUTABLE) - MESSAGE(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") - ELSE(KDE4_KCFGC_EXECUTABLE) - MESSAGE(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") - ENDIF(KDE4_KCFGC_EXECUTABLE) + if(KDE4_INCLUDE_DIR) + message(STATUS "Found KDE4 include dir: ${KDE4_INCLUDE_DIR}") + else(KDE4_INCLUDE_DIR) + message(STATUS "Didn't find KDE4 headers") + endif(KDE4_INCLUDE_DIR) + + if(KDE4_LIB_DIR) + message(STATUS "Found KDE4 library dir: ${KDE4_LIB_DIR}") + else(KDE4_LIB_DIR) + message(STATUS "Didn't find KDE4 core library") + endif(KDE4_LIB_DIR) + + if(KDE4_DCOPIDL_EXECUTABLE) + message(STATUS "Found KDE4 dcopidl preprocessor: ${KDE4_DCOPIDL_EXECUTABLE}") + else(KDE4_DCOPIDL_EXECUTABLE) + message(STATUS "Didn't find the KDE4 dcopidl preprocessor") + endif(KDE4_DCOPIDL_EXECUTABLE) + + if(KDE4_DCOPIDL2CPP_EXECUTABLE) + message(STATUS "Found KDE4 dcopidl2cpp preprocessor: ${KDE4_DCOPIDL2CPP_EXECUTABLE}") + else(KDE4_DCOPIDL2CPP_EXECUTABLE) + message(STATUS "Didn't find the KDE4 dcopidl2cpp preprocessor") + endif(KDE4_DCOPIDL2CPP_EXECUTABLE) + + if(KDE4_KCFGC_EXECUTABLE) + message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") + else(KDE4_KCFGC_EXECUTABLE) + message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor") + endif(KDE4_KCFGC_EXECUTABLE) ENDMACRO (KDE4_PRINT_RESULTS) -IF (KDE4_FIND_REQUIRED AND NOT KDE4_FOUND) +if (KDE4_FIND_REQUIRED AND not KDE4_FOUND) #bail out if something wasn't found KDE4_PRINT_RESULTS() - MESSAGE(FATAL_ERROR "Could not find everything required for compiling KDE 4 programs") -ENDIF (KDE4_FIND_REQUIRED AND NOT KDE4_FOUND) + message(FATAL_ERROR "Could not find everything required for compiling KDE 4 programs") +endif (KDE4_FIND_REQUIRED AND not KDE4_FOUND) -IF (NOT KDE4_FIND_QUIETLY) +if (not KDE4_FIND_QUIETLY) KDE4_PRINT_RESULTS() -ENDIF (NOT KDE4_FIND_QUIETLY) +endif (not KDE4_FIND_QUIETLY) #add the found Qt and KDE include directories to the current include path -SET(KDE4_INCLUDE_DIRS ${QT_INCLUDES} ${KDE4_INCLUDE_DIR} ${_KDE4_PLATFORM_INCLUDE_DIRS} ) +set(KDE4_INCLUDE_DIRS ${QT_INCLUDES} ${KDE4_INCLUDE_DIR} ${_KDE4_PLATFORM_INCLUDE_DIRS} ) # not used in Qt4: QT_NO_COMPAT, QT_CLEAN_NAMESPACE, QT_THREAD_SUPPORT -SET(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT3_SUPPORT -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DQT3_SUPPORT_WARNINGS ) +set(KDE4_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT3_SUPPORT -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT -DQT3_SUPPORT_WARNINGS ) diff --git a/modules/FindKDEWIN32.cmake b/modules/FindKDEWIN32.cmake index a71e04d2..0cf90ffd 100644 --- a/modules/FindKDEWIN32.cmake +++ b/modules/FindKDEWIN32.cmake @@ -5,7 +5,7 @@ # KDEWIN32_INCLUDES - the KDEWIN32 include directories # KDEWIN32_LIBRARIES - The libraries needed to use KDEWIN32 -IF (WIN32) +if (WIN32) INCLUDE(MacroGetenvWinPath) @@ -28,31 +28,31 @@ FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 # kdelibs/win/ has to be built before the rest of kdelibs/ # eventually it will be moved out from kdelibs/ -IF (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - SET(KDEWIN32_FOUND TRUE) +if (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + set(KDEWIN32_FOUND TRUE) # add the winsock2 library, using find_library or something like this would probably be better - SET(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) + set(KDEWIN32_LIBRARIES ${KDEWIN32_LIBRARY} user32 shell32 ws2_32) - IF(MINGW) + if(MINGW) #mingw compiler - SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES}) - ELSE(MINGW) + set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES}) + else(MINGW) # msvc compiler # add the MS SDK include directory if available MACRO_GETENV_WIN_PATH(MSSDK_DIR MSSDK) - SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) - ENDIF(MINGW) + set(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) + endif(MINGW) -ENDIF (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) - -IF (KDEWIN32_FOUND) - IF (NOT KDEWIN32_FIND_QUIETLY) - MESSAGE(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}") - ENDIF (NOT KDEWIN32_FIND_QUIETLY) -ELSE (KDEWIN32_FOUND) - IF (KDEWIN32_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find KDEWIN32 library\nPlease build and install kdelibs/win/ first") - ENDIF (KDEWIN32_FIND_REQUIRED) -ENDIF (KDEWIN32_FOUND) - -ENDIF (WIN32) +endif (KDEWIN32_LIBRARY AND KDEWIN32_INCLUDE_DIR) + +if (KDEWIN32_FOUND) + if (not KDEWIN32_FIND_QUIETLY) + message(STATUS "Found KDEWIN32: ${KDEWIN32_LIBRARY}") + endif (not KDEWIN32_FIND_QUIETLY) +else (KDEWIN32_FOUND) + if (KDEWIN32_FIND_REQUIRED) + message(FATAL_ERROR "Could not find KDEWIN32 library\nPlease build and install kdelibs/win/ first") + endif (KDEWIN32_FIND_REQUIRED) +endif (KDEWIN32_FOUND) + +endif (WIN32) diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake index 967e8818..e0226d6c 100644 --- a/modules/FindLibArt.cmake +++ b/modules/FindLibArt.cmake @@ -15,7 +15,7 @@ INCLUDE(UsePkgConfig) # in the FIND_PATH() and FIND_LIBRARY() calls PKGCONFIG(libart-2.0 _libArtIncDir _libArtLinkDir _libArtLinkFlags _libArtCflags) -SET(LIBART_DEFINITIONS ${_libArtCflags}) +set(LIBART_DEFINITIONS ${_libArtCflags}) # under windows, try to find the base gnuwin32 directory, do nothing under UNIX FIND_PACKAGE(GNUWIN32) @@ -36,20 +36,20 @@ FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2 ) -IF(LIBART_INCLUDE_DIR AND LIBART_LIBRARIES) - SET(LIBART_FOUND TRUE) -ENDIF(LIBART_INCLUDE_DIR AND LIBART_LIBRARIES) +if(LIBART_INCLUDE_DIR AND LIBART_LIBRARIES) + set(LIBART_FOUND TRUE) +endif(LIBART_INCLUDE_DIR AND LIBART_LIBRARIES) -IF(LIBART_FOUND) - IF(NOT LibArt_FIND_QUIETLY) - MESSAGE(STATUS "Found libart: ${LIBART_LIBRARIES}") - ENDIF(NOT LibArt_FIND_QUIETLY) -ELSE(LIBART_FOUND) - IF(LibArt_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find libart") - ENDIF(LibArt_FIND_REQUIRED) -ENDIF(LIBART_FOUND) +if(LIBART_FOUND) + if(not LibArt_FIND_QUIETLY) + message(STATUS "Found libart: ${LIBART_LIBRARIES}") + endif(not LibArt_FIND_QUIETLY) +else(LIBART_FOUND) + if(LibArt_FIND_REQUIRED) + message(FATAL_ERROR "Could not find libart") + endif(LibArt_FIND_REQUIRED) +endif(LIBART_FOUND) MARK_AS_ADVANCED(LIBART_INCLUDE_DIR LIBART_LIBRARIES) diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 0ccd8ca2..89737bb6 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -14,7 +14,7 @@ INCLUDE(UsePkgConfig) PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) -SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) +set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) FIND_PACKAGE(GNUWIN32) @@ -33,18 +33,18 @@ FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 ${GNUWIN32_DIR}/lib ) -IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - SET(LIBXML2_FOUND TRUE) -ENDIF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) - -IF(LIBXML2_FOUND) - IF(NOT LibXml2_FIND_QUIETLY) - MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") - ENDIF(NOT LibXml2_FIND_QUIETLY) -ELSE(LIBXML2_FOUND) - IF(LibXml2_FIND_REQUIRED) - MESSAGE(SEND_ERROR "Could not find LibXml2") - ENDIF(LibXml2_FIND_REQUIRED) -ENDIF(LIBXML2_FOUND) +if(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + set(LIBXML2_FOUND TRUE) +endif(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) + +if(LIBXML2_FOUND) + if(not LibXml2_FIND_QUIETLY) + message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}") + endif(not LibXml2_FIND_QUIETLY) +else(LIBXML2_FOUND) + if(LibXml2_FIND_REQUIRED) + message(SEND_ERROR "Could not find LibXml2") + endif(LibXml2_FIND_REQUIRED) +endif(LIBXML2_FOUND) MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
\ No newline at end of file diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake index 0df7e855..2efe52f2 100644 --- a/modules/FindLibXslt.cmake +++ b/modules/FindLibXslt.cmake @@ -14,7 +14,7 @@ INCLUDE(UsePkgConfig) PKGCONFIG(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflags) -SET(LIBXSLT_DEFINITIONS ${_LibXsltCflags}) +set(LIBXSLT_DEFINITIONS ${_LibXsltCflags}) FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h ${_LibXsltIncDir} @@ -29,19 +29,19 @@ FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt /usr/local/lib ) -IF(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) - SET(LIBXSLT_FOUND TRUE) -ENDIF(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) - -IF(LIBXSLT_FOUND) - IF(NOT LibXslt_FIND_QUIETLY) - MESSAGE(STATUS "Found LibXslt: ${LIBXSLT_LIBRARIES}") - ENDIF(NOT LibXslt_FIND_QUIETLY) -ELSE(LIBXSLT_FOUND) - IF(LibXslt_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find LibXslt") - ENDIF(LibXslt_FIND_REQUIRED) -ENDIF(LIBXSLT_FOUND) +if(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) + set(LIBXSLT_FOUND TRUE) +endif(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) + +if(LIBXSLT_FOUND) + if(not LibXslt_FIND_QUIETLY) + message(STATUS "Found LibXslt: ${LIBXSLT_LIBRARIES}") + endif(not LibXslt_FIND_QUIETLY) +else(LIBXSLT_FOUND) + if(LibXslt_FIND_REQUIRED) + message(FATAL_ERROR "Could not find LibXslt") + endif(LibXslt_FIND_REQUIRED) +endif(LIBXSLT_FOUND) MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES) diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index da539972..23ae39a5 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -14,7 +14,7 @@ ${_OpenEXRIncDir}/OpenEXR/ /usr/local/include ) -MESSAGE(STATUS "OPENEXR_INCLUDE_DIR :${OPENEXR_INCLUDE_DIR}") +message(STATUS "OPENEXR_INCLUDE_DIR :${OPENEXR_INCLUDE_DIR}") FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS @@ -46,26 +46,26 @@ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf /usr/local/lib ) -MESSAGE(STATUS "OPENEXR_IMATH_LIBRARIES: ${OPENEXR_IMATH_LIBRARY}, OPENEXR_ILMIMF_LIBRARY: ${OPENEXR_ILMIMF_LIBRARY}, OPENEXR_IEX_LIBRARY: ${OPENEXR_IEX_LIBRARY}, OPENEXR_HALF_LIBRARY: ${OPENEXR_HALF_LIBRARY}") +message(STATUS "OPENEXR_IMATH_LIBRARIES: ${OPENEXR_IMATH_LIBRARY}, OPENEXR_ILMIMF_LIBRARY: ${OPENEXR_ILMIMF_LIBRARY}, OPENEXR_IEX_LIBRARY: ${OPENEXR_IEX_LIBRARY}, OPENEXR_HALF_LIBRARY: ${OPENEXR_HALF_LIBRARY}") -SET( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} +set( OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH__LIBRARY}...) -IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - SET(OPENEXR_FOUND TRUE) - SET( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) -ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - - - -IF (OPENEXR_FOUND) - IF (NOT OpenEXR_FIND_QUIETLY) - MESSAGE(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") - ENDIF (NOT OpenEXR_FIND_QUIETLY) -ELSE (OPENEXR_FOUND) - IF (OpenEXR_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find OPENEXR") - ENDIF (OpenEXR_FIND_REQUIRED) -ENDIF (OPENEXR_FOUND) +if(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + set(OPENEXR_FOUND TRUE) + set( OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY}) +endif(OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + + + +if (OPENEXR_FOUND) + if (not OpenEXR_FIND_QUIETLY) + message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}") + endif (not OpenEXR_FIND_QUIETLY) +else (OPENEXR_FOUND) + if (OpenEXR_FIND_REQUIRED) + message(FATAL_ERROR "Could not find OPENEXR") + endif (OpenEXR_FIND_REQUIRED) +endif (OPENEXR_FOUND) MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIR OPENEXR_LIBRARIES) diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake index 93625b4f..766cbc58 100644 --- a/modules/FindOpenSSL.cmake +++ b/modules/FindOpenSSL.cmake @@ -16,20 +16,20 @@ FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 /usr/local/lib ) -IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) - SET(OPENSSL_FOUND TRUE) -ENDIF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) +if(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) + set(OPENSSL_FOUND TRUE) +endif(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) -IF(OPENSSL_FOUND) - IF(NOT OpenSSL_FIND_QUIETLY) - MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}") - ENDIF(NOT OpenSSL_FIND_QUIETLY) -ELSE(OPENSSL_FOUND) - IF(OpenSSL_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find OpenSSL") - ENDIF(OpenSSL_FIND_REQUIRED) -ENDIF(OPENSSL_FOUND) +if(OPENSSL_FOUND) + if(not OpenSSL_FIND_QUIETLY) + message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}") + endif(not OpenSSL_FIND_QUIETLY) +else(OPENSSL_FOUND) + if(OpenSSL_FIND_REQUIRED) + message(FATAL_ERROR "Could not find OpenSSL") + endif(OpenSSL_FIND_REQUIRED) +endif(OPENSSL_FOUND) MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES) diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake index 5a78c6c1..fbca4eb8 100644 --- a/modules/FindPCRE.cmake +++ b/modules/FindPCRE.cmake @@ -32,21 +32,21 @@ FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix ${GNUWIN32_DIR}/lib ) -SET(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE") - -IF(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES) - SET(PCRE_FOUND TRUE) -ENDIF(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES) - - -IF(PCRE_FOUND) - IF(NOT PCRE_FIND_QUIETLY) - MESSAGE(STATUS "Found PCRE: ${PCRE_LIBRARIES}") - ENDIF(NOT PCRE_FIND_QUIETLY) -ELSE(PCRE_FOUND) - IF(PCRE_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find PCRE") - ENDIF(PCRE_FIND_REQUIRED) -ENDIF(PCRE_FOUND) +set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE") + +if(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES) + set(PCRE_FOUND TRUE) +endif(PCRE_INCLUDE_DIR AND PCRE_LIBRARIES) + + +if(PCRE_FOUND) + if(not PCRE_FIND_QUIETLY) + message(STATUS "Found PCRE: ${PCRE_LIBRARIES}") + endif(not PCRE_FIND_QUIETLY) +else(PCRE_FOUND) + if(PCRE_FIND_REQUIRED) + message(FATAL_ERROR "Could not find PCRE") + endif(PCRE_FIND_REQUIRED) +endif(PCRE_FOUND) MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index c968951c..2012c753 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -117,24 +117,24 @@ # QT_QT_LIBRARY Qt-Library is now splitt # QT_QTMAIN_LIBRARY Qt-Library is now splitt -SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake) +set(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake) -SET( QT_DEFINITIONS "") +set( QT_DEFINITIONS "") -IF (WIN32) - SET(QT_DEFINITIONS -DQT_DLL) -ENDIF(WIN32) +if (WIN32) + set(QT_DEFINITIONS -DQT_DLL) +endif(WIN32) FILE(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/) -SET(GLOB_TEMP_VAR) -IF (GLOB_TEMP_VAR) - SET(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR}) -ENDIF (GLOB_TEMP_VAR) -SET(GLOB_TEMP_VAR) +set(GLOB_TEMP_VAR) +if (GLOB_TEMP_VAR) + set(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR}) +endif (GLOB_TEMP_VAR) +set(GLOB_TEMP_VAR) FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/) -IF (GLOB_TEMP_VAR) - SET(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR}) -ENDIF (GLOB_TEMP_VAR) +if (GLOB_TEMP_VAR) + set(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR}) +endif (GLOB_TEMP_VAR) # check for qmake FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS @@ -145,63 +145,63 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS NO_SYSTEM_PATH ) -IF (NOT QT_QMAKE_EXECUTABLE) +if (not QT_QMAKE_EXECUTABLE) FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake) -ENDIF (NOT QT_QMAKE_EXECUTABLE) +endif (not QT_QMAKE_EXECUTABLE) -IF (QT_QMAKE_EXECUTABLE) +if (QT_QMAKE_EXECUTABLE) EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) - IF(QTVERSION MATCHES "4.*") - SET(QT4_QMAKE_FOUND TRUE) - ENDIF(QTVERSION MATCHES "4.*") -ENDIF (QT_QMAKE_EXECUTABLE) + if(QTVERSION MATCHES "4.*") + set(QT4_QMAKE_FOUND TRUE) + endif(QTVERSION MATCHES "4.*") +endif (QT_QMAKE_EXECUTABLE) -IF(QT4_QMAKE_FOUND) +if(QT4_QMAKE_FOUND) # Set QT_LIBRARY_DIR - IF(NOT QT_LIBRARY_DIR) + if(not QT_LIBRARY_DIR) EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_LIBS" OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP ) - IF(EXISTS "${QT_LIBRARY_DIR_TMP}") - SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir") - ELSE(EXISTS "${QT_LIBRARY_DIR_TMP}") - MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}") - MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does not exist, Qt must not be installed correctly.") - ENDIF(EXISTS "${QT_LIBRARY_DIR_TMP}") - ENDIF(NOT QT_LIBRARY_DIR) - - IF (APPLE) - IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) - SET(QT_USE_FRAMEWORKS ON + if(EXISTS "${QT_LIBRARY_DIR_TMP}") + set(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir") + else(EXISTS "${QT_LIBRARY_DIR_TMP}") + message("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}") + message("Warning: ${QT_LIBRARY_DIR_TMP} does not exist, Qt must not be installed correctly.") + endif(EXISTS "${QT_LIBRARY_DIR_TMP}") + endif(not QT_LIBRARY_DIR) + + if (APPLE) + if (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) + set(QT_USE_FRAMEWORKS ON CACHE BOOL "Set to ON if Qt build uses frameworks.") - ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) - SET(QT_USE_FRAMEWORKS OFF + else (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) + set(QT_USE_FRAMEWORKS OFF CACHE BOOL "Set to ON if Qt build uses frameworks.") - ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) + endif (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) MARK_AS_ADVANCED(QT_USE_FRAMEWORKS) - ENDIF (APPLE) + endif (APPLE) ######################################## # # Setting the INCLUDE-Variables # ######################################## - IF (NOT QT_HEADERS_DIR) + if (not QT_HEADERS_DIR) # Set QT_QTCORE_INCLUDE_DIR by searching for the QtGlobal header - IF(QT_QMAKE_EXECUTABLE) + if(QT_QMAKE_EXECUTABLE) EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE qt_headers ) - SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "") - ENDIF(QT_QMAKE_EXECUTABLE) - ENDIF (NOT QT_HEADERS_DIR) + set(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "") + endif(QT_QMAKE_EXECUTABLE) + endif (not QT_HEADERS_DIR) FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-3*/include/Qt/) - SET(QT_PATH_INCLUDE ${GLOB_TEMP_VAR}) + set(QT_PATH_INCLUDE ${GLOB_TEMP_VAR}) FILE(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/include/Qt/) - SET(QT_PATH_INCLUDE ${GLOB_TEMP_VAR}) + set(QT_PATH_INCLUDE ${GLOB_TEMP_VAR}) FIND_PATH( QT_QTCORE_INCLUDE_DIR QtGlobal "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/include/QtCore" @@ -218,20 +218,20 @@ IF(QT4_QMAKE_FOUND) /usr/include/qt4/QtCore) # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR} - IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR) - IF (QT_USE_FRAMEWORKS) - SET(QT_INCLUDE_DIR ${QT_HEADERS_DIR}) - ELSE (QT_USE_FRAMEWORKS) + if( QT_QTCORE_INCLUDE_DIR AND not QT_INCLUDE_DIR) + if (QT_USE_FRAMEWORKS) + set(QT_INCLUDE_DIR ${QT_HEADERS_DIR}) + else (QT_USE_FRAMEWORKS) STRING( REGEX REPLACE "/QtCore$" "" qt4_include_dir ${QT_QTCORE_INCLUDE_DIR}) - SET( QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "") - ENDIF (QT_USE_FRAMEWORKS) - ENDIF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR) + set( QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "") + endif (QT_USE_FRAMEWORKS) + endif( QT_QTCORE_INCLUDE_DIR AND not QT_INCLUDE_DIR) - IF( NOT QT_INCLUDE_DIR) - IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED) - MESSAGE( FATAL_ERROR "Could not find QtGlobal header") - ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED) - ENDIF( NOT QT_INCLUDE_DIR) + if( not QT_INCLUDE_DIR) + if( not Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED) + message( FATAL_ERROR "Could not find QtGlobal header") + endif( not Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED) + endif( not QT_INCLUDE_DIR) FIND_PATH( QT_DOC_DIR /html/qcoreapplication.html @@ -243,9 +243,9 @@ IF(QT4_QMAKE_FOUND) "C:/Program Files/qt/doc" ) - IF (QT_USE_FRAMEWORKS) - SET(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} ) - ENDIF (QT_USE_FRAMEWORKS) + if (QT_USE_FRAMEWORKS) + set(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} ) + endif (QT_USE_FRAMEWORKS) # Set QT_QT3SUPPORT_INCLUDE_DIR FIND_PATH( QT_QT3SUPPORT_INCLUDE_DIR Qt3Support @@ -327,7 +327,7 @@ IF(QT4_QMAKE_FOUND) MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR ) # Set QT_INCLUDES - SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ) + set( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ) ######################################## @@ -336,49 +336,49 @@ IF(QT4_QMAKE_FOUND) # ######################################## - IF (QT_USE_FRAMEWORKS) + if (QT_USE_FRAMEWORKS) # If FIND_LIBRARY found libraries in Apple frameworks, we would not have # to jump through these hoops. - SET(QT_QTCORE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtCore" + set(QT_QTCORE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtCore" CACHE STRING "The QtCore library.") - SET(QT_QTCORE_LIBRARY_DEBUG "-F${QT_LIBRARY_DIR} -framework QtCore" + set(QT_QTCORE_LIBRARY_DEBUG "-F${QT_LIBRARY_DIR} -framework QtCore" CACHE STRING "The QtCore library.") - SET(QT_QT3SUPPORT_LIBRARY "-framework Qt3Support" + set(QT_QT3SUPPORT_LIBRARY "-framework Qt3Support" CACHE STRING "The Qt3Support library.") - SET(QT_QT3SUPPORT_LIBRARY_DEBUG "-framework Qt3Support" + set(QT_QT3SUPPORT_LIBRARY_DEBUG "-framework Qt3Support" CACHE STRING "The Qt3Support library.") - SET(QT_QTGUI_LIBRARY "-framework QtGui" + set(QT_QTGUI_LIBRARY "-framework QtGui" CACHE STRING "The QtGui library.") - SET(QT_QTGUI_LIBRARY_DEBUG "-framework QtGui" + set(QT_QTGUI_LIBRARY_DEBUG "-framework QtGui" CACHE STRING "The QtGui library.") - SET(QT_QTNETWORK_LIBRARY "-framework QtNetwork" + set(QT_QTNETWORK_LIBRARY "-framework QtNetwork" CACHE STRING "The QtNetwork library.") - SET(QT_QTNETWORK_LIBRARY_DEBUG "-framework QtNetwork" + set(QT_QTNETWORK_LIBRARY_DEBUG "-framework QtNetwork" CACHE STRING "The QtNetwork library.") - SET(QT_QTOPENGL_LIBRARY "-framework QtOpenGL" + set(QT_QTOPENGL_LIBRARY "-framework QtOpenGL" CACHE STRING "The QtOpenGL library.") - SET(QT_QTOPENGL_LIBRARY_DEBUG "-framework QtOpenGL" + set(QT_QTOPENGL_LIBRARY_DEBUG "-framework QtOpenGL" CACHE STRING "The QtOpenGL library.") - SET(QT_QTSQL_LIBRARY "-framework QtSql" + set(QT_QTSQL_LIBRARY "-framework QtSql" CACHE STRING "The QtSql library.") - SET(QT_QTSQL_LIBRARY_DEBUG "-framework QtSql" + set(QT_QTSQL_LIBRARY_DEBUG "-framework QtSql" CACHE STRING "The QtSql library.") - SET(QT_QTXML_LIBRARY "-framework QtXml" + set(QT_QTXML_LIBRARY "-framework QtXml" CACHE STRING "The QtXml library.") - SET(QT_QTXML_LIBRARY_DEBUG "-framework QtXml" + set(QT_QTXML_LIBRARY_DEBUG "-framework QtXml" CACHE STRING "The QtXml library.") - SET(QT_QTSVG_LIBRARY "-framework QtSvg" + set(QT_QTSVG_LIBRARY "-framework QtSvg" CACHE STRING "The QtSvg library.") - SET(QT_QTSVG_LIBRARY_DEBUG "-framework QtSvg" + set(QT_QTSVG_LIBRARY_DEBUG "-framework QtSvg" CACHE STRING "The QtSvg library.") # WTF? why don't we have frameworks? :P - SET(QT_QTTEST_LIBRARY "-L${QT_LIBRARY_DIR} -lQtTest" + set(QT_QTTEST_LIBRARY "-L${QT_LIBRARY_DIR} -lQtTest" CACHE STRING "The QtTest library.") - SET(QT_QTTEST_LIBRARY_DEBUG "-L${QT_LIBRARY_DIR} -lQtTest" + set(QT_QTTEST_LIBRARY_DEBUG "-L${QT_LIBRARY_DIR} -lQtTest" CACHE STRING "The QtTest library.") - ELSE (QT_USE_FRAMEWORKS) + else (QT_USE_FRAMEWORKS) # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore." as part of # the filename @@ -450,7 +450,7 @@ IF(QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTTEST_LIBRARY NAMES QtTest QtTest4 PATHS ${QT_LIBRARY_DIR}) FIND_LIBRARY(QT_QTTEST_LIBRARY_DEBUG NAMES QtTest_debug QtTest_debug4 QtTestd4 PATHS ${QT_LIBRARY_DIR}) - ENDIF (QT_USE_FRAMEWORKS) + endif (QT_USE_FRAMEWORKS) # Set QT_QTASSISTANT_LIBRARY FIND_LIBRARY(QT_QTASSISTANT_LIBRARY NAMES QtAssistantClient QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR}) @@ -467,25 +467,25 @@ IF(QT4_QMAKE_FOUND) ############################################ MACRO(_QT4_ADJUST_LIB_VARS basename) - IF (QT_${basename}_INCLUDE_DIR) + if (QT_${basename}_INCLUDE_DIR) # if only the release version was found, set the debug variable also to the release version - IF (QT_${basename}_LIBRARY AND NOT QT_${basename}_LIBRARY_DEBUG) - SET(QT_${basename}_LIBRARY_DEBUG ${QT_${basename}_LIBRARY}) - ENDIF (QT_${basename}_LIBRARY AND NOT QT_${basename}_LIBRARY_DEBUG) + if (QT_${basename}_LIBRARY AND not QT_${basename}_LIBRARY_DEBUG) + set(QT_${basename}_LIBRARY_DEBUG ${QT_${basename}_LIBRARY}) + endif (QT_${basename}_LIBRARY AND not QT_${basename}_LIBRARY_DEBUG) # if only the debug version was found, set the release variable also to the debug version - IF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY) - SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_DEBUG}) - ENDIF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY) + if (QT_${basename}_LIBRARY_DEBUG AND not QT_${basename}_LIBRARY) + set(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_DEBUG}) + endif (QT_${basename}_LIBRARY_DEBUG AND not QT_${basename}_LIBRARY) - IF (QT_${basename}_LIBRARY) - SET(QT_${basename}_FOUND 1) - ENDIF (QT_${basename}_LIBRARY) + if (QT_${basename}_LIBRARY) + set(QT_${basename}_FOUND 1) + endif (QT_${basename}_LIBRARY) #add the include directory to QT_INCLUDES - SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}") - ENDIF (QT_${basename}_INCLUDE_DIR ) + set(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}") + endif (QT_${basename}_INCLUDE_DIR ) # Make variables changeble to the advanced user MARK_AS_ADVANCED(QT_${basename}_LIBRARY QT_${basename}_LIBRARY_DEBUG QT_${basename}_INCLUDE_DIR) @@ -511,12 +511,12 @@ IF(QT4_QMAKE_FOUND) # ( moc, uic, rcc ) # ####################################### - IF (NOT QT_BINARY_DIR) + if (not QT_BINARY_DIR) EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_BINS" OUTPUT_VARIABLE qt_bins ) - SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "") - ENDIF (NOT QT_BINARY_DIR) + set(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "") + endif (not QT_BINARY_DIR) # at first without the system paths, in order to prefer e.g. ${QTDIR}/bin/qmake over /usr/bin/qmake, # which might be a Qt3 qmake @@ -536,13 +536,13 @@ IF(QT4_QMAKE_FOUND) ) # if qmake wasn't found in the specific dirs, now check the system path - IF (NOT QT_MOC_EXECUTABLE) + if (not QT_MOC_EXECUTABLE) FIND_PROGRAM(QT_MOC_EXECUTABLE NAMES moc ) - ENDIF (NOT QT_MOC_EXECUTABLE) + endif (not QT_MOC_EXECUTABLE) - IF (QT_MOC_EXECUTABLE) - SET ( QT_WRAP_CPP "YES") - ENDIF (QT_MOC_EXECUTABLE) + if (QT_MOC_EXECUTABLE) + set ( QT_WRAP_CPP "YES") + endif (QT_MOC_EXECUTABLE) FIND_PROGRAM(QT_UIC3_EXECUTABLE NAMES uic3 @@ -574,13 +574,13 @@ IF(QT4_QMAKE_FOUND) NO_SYSTEM_PATH ) - IF (NOT QT_UIC_EXECUTABLE) + if (not QT_UIC_EXECUTABLE) FIND_PROGRAM(QT_UIC_EXECUTABLE NAMES uic ) - ENDIF (NOT QT_UIC_EXECUTABLE) + endif (not QT_UIC_EXECUTABLE) - IF (QT_UIC_EXECUTABLE) - SET ( QT_WRAP_UI "YES") - ENDIF (QT_UIC_EXECUTABLE) + if (QT_UIC_EXECUTABLE) + set ( QT_WRAP_UI "YES") + endif (QT_UIC_EXECUTABLE) FIND_PROGRAM(QT_RCC_EXECUTABLE NAMES rcc @@ -609,12 +609,12 @@ IF(QT4_QMAKE_FOUND) ###################################### MACRO(QT4_GET_MOC_INC_DIRS _moc_INC_DIRS) - SET(${_moc_INC_DIRS}) + set(${_moc_INC_DIRS}) GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES) - FOREACH(_current ${_inc_DIRS}) - SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current}) - ENDFOREACH(_current ${_inc_DIRS}) + foreach(_current ${_inc_DIRS}) + set(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current}) + endforeach(_current ${_inc_DIRS}) ENDMACRO(QT4_GET_MOC_INC_DIRS) MACRO(QT4_GENERATE_MOC infile outfile ) @@ -637,17 +637,17 @@ IF(QT4_QMAKE_FOUND) # get include dirs QT4_GET_MOC_INC_DIRS(moc_includes) - FOREACH(it ${ARGN}) + foreach(it ${ARGN}) GET_FILENAME_COMPONENT(it ${it} ABSOLUTE) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) - SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx) + set(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_MOC_EXECUTABLE} ARGS ${moc_includes} -o ${outfile} ${it} MAIN_DEPENDENCY ${it}) - SET(${outfiles} ${${outfiles}} ${outfile}) - ENDFOREACH(it) + set(${outfiles} ${${outfiles}} ${outfile}) + endforeach(it) ENDMACRO(QT4_WRAP_CPP) @@ -656,16 +656,16 @@ IF(QT4_QMAKE_FOUND) MACRO(QT4_WRAP_UI outfiles ) - FOREACH(it ${ARGN}) + foreach(it ${ARGN}) GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) - SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) - SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) + set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) + set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_UIC_EXECUTABLE} ARGS -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile}) - SET(${outfiles} ${${outfiles}} ${outfile}) - ENDFOREACH(it) + set(${outfiles} ${${outfiles}} ${outfile}) + endforeach(it) ENDMACRO(QT4_WRAP_UI) @@ -674,16 +674,16 @@ IF(QT4_QMAKE_FOUND) MACRO(QT4_ADD_RESOURCES outfiles ) - FOREACH(it ${ARGN}) + foreach(it ${ARGN}) GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) - SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) - SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) + set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it}) + set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} COMMAND ${QT_RCC_EXECUTABLE} ARGS -name ${outfilename} -o ${outfile} ${infile} MAIN_DEPENDENCY ${infile} ) - SET(${outfiles} ${${outfiles}} ${outfile}) - ENDFOREACH(it) + set(${outfiles} ${${outfiles}} ${outfile}) + endforeach(it) ENDMACRO(QT4_ADD_RESOURCES) @@ -695,19 +695,19 @@ IF(QT4_QMAKE_FOUND) # ###################################### # if the includes,libraries,moc,uic and rcc are found then we have it - IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE) - SET( QT4_FOUND "YES" ) - IF( NOT Qt4_FIND_QUIETLY) - MESSAGE(STATUS "Found Qt-Version ${QTVERSION}") -# MESSAGE(STATUS "Found Qt-Version ${QT_INST_MAJOR_VERSION}.${QT_INST_MINOR_VERSION}.${QT_INST_PATCH_VERSION}") - ENDIF( NOT Qt4_FIND_QUIETLY) - ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE) - SET( QT4_FOUND "NO") - IF( Qt4_FIND_REQUIRED) - MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!") - ENDIF( Qt4_FIND_REQUIRED) - ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE) - SET(QT_FOUND ${QT4_FOUND}) + if( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE) + set( QT4_FOUND "YES" ) + if( not Qt4_FIND_QUIETLY) + message(STATUS "Found Qt-Version ${QTVERSION}") +# message(STATUS "Found Qt-Version ${QT_INST_MAJOR_VERSION}.${QT_INST_MINOR_VERSION}.${QT_INST_PATCH_VERSION}") + endif( not Qt4_FIND_QUIETLY) + else( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE) + set( QT4_FOUND "NO") + if( Qt4_FIND_REQUIRED) + message( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc not found!") + endif( Qt4_FIND_REQUIRED) + endif( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE) + set(QT_FOUND ${QT4_FOUND}) ####################################### @@ -716,11 +716,11 @@ IF(QT4_QMAKE_FOUND) # ####################################### # for unix add X11 stuff - IF(UNIX) + if(UNIX) FIND_PACKAGE(X11) FIND_PACKAGE(Threads) - SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(UNIX) + set(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) + endif(UNIX) ####################################### @@ -729,17 +729,17 @@ IF(QT4_QMAKE_FOUND) # ####################################### # Backwards compatibility for CMake1.4 and 1.2 - SET (QT_MOC_EXE ${QT_MOC_EXECUTABLE} ) - SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} ) - - SET( QT_QT_LIBRARY "") - SET( QT_QTMAIN_LIBRARY "") -ELSE(QT4_QMAKE_FOUND) - IF(QT_QMAKE_EXECUTABLE) - MESSAGE("QT_QMAKE_EXECUTABLE set to qmake version: QTVERSION = ${QTVERSION}\nQT_QMAKE_EXECUTABLE = ${QT_QMAKE_EXECUTABLE}, please set to path to qmake from qt4.") - ENDIF(QT_QMAKE_EXECUTABLE) - IF( Qt4_FIND_REQUIRED) - MESSAGE( FATAL_ERROR "Qt qmake not found!") - ENDIF( Qt4_FIND_REQUIRED) - -ENDIF(QT4_QMAKE_FOUND) + set (QT_MOC_EXE ${QT_MOC_EXECUTABLE} ) + set (QT_UIC_EXE ${QT_UIC_EXECUTABLE} ) + + set( QT_QT_LIBRARY "") + set( QT_QTMAIN_LIBRARY "") +else(QT4_QMAKE_FOUND) + if(QT_QMAKE_EXECUTABLE) + message("QT_QMAKE_EXECUTABLE set to qmake version: QTVERSION = ${QTVERSION}\nQT_QMAKE_EXECUTABLE = ${QT_QMAKE_EXECUTABLE}, please set to path to qmake from qt4.") + endif(QT_QMAKE_EXECUTABLE) + if( Qt4_FIND_REQUIRED) + message( FATAL_ERROR "Qt qmake not found!") + endif( Qt4_FIND_REQUIRED) + +endif(QT4_QMAKE_FOUND) diff --git a/modules/FindTIFF.cmake b/modules/FindTIFF.cmake index 0c206402..463fcc25 100644 --- a/modules/FindTIFF.cmake +++ b/modules/FindTIFF.cmake @@ -12,16 +12,16 @@ FIND_PATH(TIFF_INCLUDE_DIR tiff.h /usr/include
)
-SET(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
+set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
FIND_LIBRARY(TIFF_LIBRARY
NAMES ${TIFF_NAMES}
PATHS /usr/lib /usr/local/lib
)
-IF(TIFF_INCLUDE_DIR)
- IF(TIFF_LIBRARY)
- SET( TIFF_FOUND "YES" )
- SET( TIFF_LIBRARIES ${TIFF_LIBRARY} )
- ENDIF(TIFF_LIBRARY)
-ENDIF(TIFF_INCLUDE_DIR)
+if(TIFF_INCLUDE_DIR)
+ if(TIFF_LIBRARY)
+ set( TIFF_FOUND "YES" )
+ set( TIFF_LIBRARIES ${TIFF_LIBRARY} )
+ endif(TIFF_LIBRARY)
+endif(TIFF_INCLUDE_DIR)
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 25d6e1e4..f0e61210 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -4,10 +4,10 @@ # X11_INCLUDE_DIR - include directories to use X11 # X11_LIBRARIES - link against these to use X11 -IF (UNIX) - SET(X11_FOUND 0) +if (UNIX) + set(X11_FOUND 0) - SET(X11_INC_SEARCH_PATH + set(X11_INC_SEARCH_PATH /usr/X11R6/include /usr/local/include /usr/include/X11 @@ -17,7 +17,7 @@ IF (UNIX) /usr/include ) - SET(X11_LIB_SEARCH_PATH + set(X11_LIB_SEARCH_PATH /usr/X11R6/lib /usr/local/lib /usr/openwin/lib @@ -30,114 +30,114 @@ IF (UNIX) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) - IF(X11_X11_INCLUDE_PATH) - SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) - ENDIF(X11_X11_INCLUDE_PATH) + if(X11_X11_INCLUDE_PATH) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) + endif(X11_X11_INCLUDE_PATH) - IF(X11_Xlib_INCLUDE_PATH) - SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH}) - ENDIF(X11_Xlib_INCLUDE_PATH) + if(X11_Xlib_INCLUDE_PATH) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH}) + endif(X11_Xlib_INCLUDE_PATH) - IF(X11_Xutil_INCLUDE_PATH) - SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xutil_INCLUDE_PATH}) - ENDIF(X11_Xutil_INCLUDE_PATH) + if(X11_Xutil_INCLUDE_PATH) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xutil_INCLUDE_PATH}) + endif(X11_Xutil_INCLUDE_PATH) - IF(X11_X11_LIB) - SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB}) - ENDIF(X11_X11_LIB) + if(X11_X11_LIB) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB}) + endif(X11_X11_LIB) - IF(X11_Xext_LIB) - SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) - ENDIF(X11_Xext_LIB) + if(X11_Xext_LIB) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) + endif(X11_Xext_LIB) # Deprecated variable for backwards compatibility with CMake 1.4 - IF(X11_X11_INCLUDE_PATH) - IF(X11_LIBRARIES) - SET(X11_FOUND 1) - ENDIF(X11_LIBRARIES) - ENDIF(X11_X11_INCLUDE_PATH) - - SET(X11_LIBRARY_DIR "") - IF(X11_X11_LIB) + if(X11_X11_INCLUDE_PATH) + if(X11_LIBRARIES) + set(X11_FOUND 1) + endif(X11_LIBRARIES) + endif(X11_X11_INCLUDE_PATH) + + set(X11_LIBRARY_DIR "") + if(X11_X11_LIB) GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) - ENDIF(X11_X11_LIB) + endif(X11_X11_LIB) - IF(X11_FOUND) + if(X11_FOUND) INCLUDE(CheckFunctionExists) INCLUDE(CheckLibraryExists) # Translated from an autoconf-generated configure script. # See libs.m4 in autoconf's m4 directory. - IF($ENV{ISC} MATCHES "^yes$") - SET(X11_X_EXTRA_LIBS -lnsl_s -linet) - ELSE($ENV{ISC} MATCHES "^yes$") - SET(X11_X_EXTRA_LIBS "") + if($ENV{ISC} MATCHES "^yes$") + set(X11_X_EXTRA_LIBS -lnsl_s -linet) + else($ENV{ISC} MATCHES "^yes$") + set(X11_X_EXTRA_LIBS "") # See if XOpenDisplay in X11 works by itself. CHECK_LIBRARY_EXISTS("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO) - IF(NOT X11_LIB_X11_SOLO) + if(not X11_LIB_X11_SOLO) # Find library needed for dnet_ntoa. CHECK_LIBRARY_EXISTS("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) - IF (X11_LIB_DNET_HAS_DNET_NTOA) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) - ELSE (X11_LIB_DNET_HAS_DNET_NTOA) + if (X11_LIB_DNET_HAS_DNET_NTOA) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) + else (X11_LIB_DNET_HAS_DNET_NTOA) CHECK_LIBRARY_EXISTS("dnet_stub" "dnet_ntoa" "" X11_LIB_DNET_STUB_HAS_DNET_NTOA) - IF (X11_LIB_DNET_STUB_HAS_DNET_NTOA) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) - ENDIF (X11_LIB_DNET_STUB_HAS_DNET_NTOA) - ENDIF (X11_LIB_DNET_HAS_DNET_NTOA) - ENDIF(NOT X11_LIB_X11_SOLO) + if (X11_LIB_DNET_STUB_HAS_DNET_NTOA) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) + endif (X11_LIB_DNET_STUB_HAS_DNET_NTOA) + endif (X11_LIB_DNET_HAS_DNET_NTOA) + endif(not X11_LIB_X11_SOLO) # Find library needed for gethostbyname. CHECK_FUNCTION_EXISTS("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) - IF(NOT CMAKE_HAVE_GETHOSTBYNAME) + if(not CMAKE_HAVE_GETHOSTBYNAME) CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - IF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) - ELSE (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + if (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) + else (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) CHECK_LIBRARY_EXISTS("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - IF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) - ENDIF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - ENDIF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - ENDIF(NOT CMAKE_HAVE_GETHOSTBYNAME) + if (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) + endif (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + endif (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + endif(not CMAKE_HAVE_GETHOSTBYNAME) # Find library needed for connect. CHECK_FUNCTION_EXISTS("connect" CMAKE_HAVE_CONNECT) - IF(NOT CMAKE_HAVE_CONNECT) + if(not CMAKE_HAVE_CONNECT) CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) - IF (CMAKE_LIB_SOCKET_HAS_CONNECT) - SET (X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) - ENDIF (CMAKE_LIB_SOCKET_HAS_CONNECT) - ENDIF(NOT CMAKE_HAVE_CONNECT) + if (CMAKE_LIB_SOCKET_HAS_CONNECT) + set (X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) + endif (CMAKE_LIB_SOCKET_HAS_CONNECT) + endif(not CMAKE_HAVE_CONNECT) # Find library needed for remove. CHECK_FUNCTION_EXISTS("remove" CMAKE_HAVE_REMOVE) - IF(NOT CMAKE_HAVE_REMOVE) + if(not CMAKE_HAVE_REMOVE) CHECK_LIBRARY_EXISTS("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) - IF (CMAKE_LIB_POSIX_HAS_REMOVE) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) - ENDIF (CMAKE_LIB_POSIX_HAS_REMOVE) - ENDIF(NOT CMAKE_HAVE_REMOVE) + if (CMAKE_LIB_POSIX_HAS_REMOVE) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) + endif (CMAKE_LIB_POSIX_HAS_REMOVE) + endif(not CMAKE_HAVE_REMOVE) # Find library needed for shmat. CHECK_FUNCTION_EXISTS("shmat" CMAKE_HAVE_SHMAT) - IF(NOT CMAKE_HAVE_SHMAT) + if(not CMAKE_HAVE_SHMAT) CHECK_LIBRARY_EXISTS("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) - IF (CMAKE_LIB_IPS_HAS_SHMAT) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lipc) - ENDIF (CMAKE_LIB_IPS_HAS_SHMAT) - ENDIF(NOT CMAKE_HAVE_SHMAT) - ENDIF($ENV{ISC} MATCHES "^yes$") + if (CMAKE_LIB_IPS_HAS_SHMAT) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lipc) + endif (CMAKE_LIB_IPS_HAS_SHMAT) + endif(not CMAKE_HAVE_SHMAT) + endif($ENV{ISC} MATCHES "^yes$") CHECK_LIBRARY_EXISTS("ICE" "IceConnectionNumber" "${X11_LIBRARY_DIR}" CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) - IF(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) - SET (X11_X_PRE_LIBS -lSM -lICE) - ENDIF(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + if(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + set (X11_X_PRE_LIBS -lSM -lICE) + endif(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) # Build the final list of libraries. - SET (X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) - ENDIF(X11_FOUND) + set (X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) + endif(X11_FOUND) MARK_AS_ADVANCED( X11_X11_INCLUDE_PATH @@ -148,4 +148,4 @@ IF (UNIX) X11_LIBRARIES ) -ENDIF (UNIX) +endif (UNIX) diff --git a/modules/KDE3Macros.cmake b/modules/KDE3Macros.cmake index 58f02ce6..7411ed00 100644 --- a/modules/KDE3Macros.cmake +++ b/modules/KDE3Macros.cmake @@ -21,48 +21,48 @@ MACRO(KDE3_ADD_FILE_DEPENDANCY file) GET_SOURCE_FILE_PROPERTY(_deps ${file} OBJECT_DEPENDS) - IF (_deps) - SET(_deps ${_deps} ${ARGN}) - ELSE (_deps) - SET(_deps ${ARGN}) - ENDIF (_deps) + if (_deps) + set(_deps ${_deps} ${ARGN}) + else (_deps) + set(_deps ${ARGN}) + endif (_deps) SET_SOURCE_FILES_PROPERTIES(${file} PROPERTIES OBJECT_DEPENDS "${_deps}") ENDMACRO(KDE3_ADD_FILE_DEPENDANCY) MACRO(KDE3_GET_ABS_PATH _abs_filename _filename) - IF(${_filename} MATCHES "^/.+") - SET(${_abs_filename} ${_filename}) - ELSE(${_filename} MATCHES "^/.+") - SET(${_abs_filename} ${CMAKE_CURRENT_SOURCE_DIR}/${_filename}) - ENDIF(${_filename} MATCHES "^/.+") + if(${_filename} MATCHES "^/.+") + set(${_abs_filename} ${_filename}) + else(${_filename} MATCHES "^/.+") + set(${_abs_filename} ${CMAKE_CURRENT_SOURCE_DIR}/${_filename}) + endif(${_filename} MATCHES "^/.+") ENDMACRO(KDE3_GET_ABS_PATH) #create the kidl and skeletion file for dcop stuff #usage: KDE_ADD_COP_SKELS(foo_SRCS ${dcop_headers}) MACRO(KDE3_ADD_DCOP_SKELS _sources) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) KDE3_GET_ABS_PATH(_tmp_FILE ${_current_FILE}) GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE) - SET(_skel ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_skel.cpp) - SET(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl) + set(_skel ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_skel.cpp) + set(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl) - IF (NOT HAVE_${_basename}_KIDL_RULE) - SET(HAVE_${_basename}_KIDL_RULE ON) + if (not HAVE_${_basename}_KIDL_RULE) + set(HAVE_${_basename}_KIDL_RULE ON) ADD_CUSTOM_COMMAND(OUTPUT ${_kidl} COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} > ${_kidl} DEPENDS ${_tmp_FILE} ) - ENDIF (NOT HAVE_${_basename}_KIDL_RULE) + endif (not HAVE_${_basename}_KIDL_RULE) - IF (NOT HAVE_${_basename}_SKEL_RULE) - SET(HAVE_${_basename}_SKEL_RULE ON) + if (not HAVE_${_basename}_SKEL_RULE) + set(HAVE_${_basename}_SKEL_RULE ON) ADD_CUSTOM_COMMAND(OUTPUT ${_skel} COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} @@ -70,26 +70,26 @@ MACRO(KDE3_ADD_DCOP_SKELS _sources) DEPENDS ${_kidl} ) - ENDIF (NOT HAVE_${_basename}_SKEL_RULE) + endif (not HAVE_${_basename}_SKEL_RULE) - SET(${_sources} ${${_sources}} ${_skel}) + set(${_sources} ${${_sources}} ${_skel}) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE3_ADD_DCOP_SKELS) MACRO(KDE3_ADD_DCOP_STUBS _sources) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) KDE3_GET_ABS_PATH(_tmp_FILE ${_current_FILE}) GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE) - SET(_stub_CPP ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_stub.cpp) - SET(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl) + set(_stub_CPP ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_stub.cpp) + set(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl) - IF (NOT HAVE_${_basename}_KIDL_RULE) - SET(HAVE_${_basename}_KIDL_RULE ON) + if (not HAVE_${_basename}_KIDL_RULE) + set(HAVE_${_basename}_KIDL_RULE ON) ADD_CUSTOM_COMMAND(OUTPUT ${_kidl} @@ -98,11 +98,11 @@ MACRO(KDE3_ADD_DCOP_STUBS _sources) DEPENDS ${tmp_FILE} ) - ENDIF (NOT HAVE_${_basename}_KIDL_RULE) + endif (not HAVE_${_basename}_KIDL_RULE) - IF (NOT HAVE_${_basename}_STUB_RULE) - SET(HAVE_${_basename}_STUB_RULE ON) + if (not HAVE_${_basename}_STUB_RULE) + set(HAVE_${_basename}_STUB_RULE ON) ADD_CUSTOM_COMMAND(OUTPUT ${_stub_CPP} COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} @@ -110,16 +110,16 @@ MACRO(KDE3_ADD_DCOP_STUBS _sources) DEPENDS ${_kidl} ) - ENDIF (NOT HAVE_${_basename}_STUB_RULE) + endif (not HAVE_${_basename}_STUB_RULE) - SET(${_sources} ${${_sources}} ${_stub_CPP}) + set(${_sources} ${${_sources}} ${_stub_CPP}) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE3_ADD_DCOP_STUBS) MACRO(KDE3_ADD_KCFG_FILES _sources) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) KDE3_GET_ABS_PATH(_tmp_FILE ${_current_FILE}) @@ -128,17 +128,17 @@ MACRO(KDE3_ADD_KCFG_FILES _sources) FILE(READ ${_tmp_FILE} _contents) STRING(REGEX REPLACE "^(.*\n)?File=([^\n]+)\n.*$" "\\2" _kcfg_FILE "${_contents}") - SET(_src_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) - SET(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) + set(_src_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) + set(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) ADD_CUSTOM_COMMAND(OUTPUT ${_src_FILE} COMMAND ${KDE3_KCFGC_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg_FILE} ${_tmp_FILE} DEPENDS ${_tmp_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg_FILE} ) - SET(${_sources} ${${_sources}} ${_src_FILE}) + set(${_sources} ${${_sources}} ${_src_FILE}) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE3_ADD_KCFG_FILES) @@ -146,12 +146,12 @@ ENDMACRO(KDE3_ADD_KCFG_FILES) #create the moc files and add them to the list of sources #usage: KDE_ADD_MOC_FILES(foo_SRCS ${moc_headers}) MACRO(KDE3_ADD_MOC_FILES _sources) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) KDE3_GET_ABS_PATH(_tmp_FILE ${_current_FILE}) GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE) - SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp) + set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp) ADD_CUSTOM_COMMAND(OUTPUT ${_moc} COMMAND ${QT_MOC_EXECUTABLE} @@ -159,24 +159,24 @@ MACRO(KDE3_ADD_MOC_FILES _sources) DEPENDS ${_tmp_FILE} ) - SET(${_sources} ${${_sources}} ${_moc}) + set(${_sources} ${${_sources}} ${_moc}) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE3_ADD_MOC_FILES) #create the implementation files from the ui files and add them to the list of sources #usage: KDE_ADD_UI_FILES(foo_SRCS ${ui_files}) MACRO(KDE3_ADD_UI_FILES _sources ) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) KDE3_GET_ABS_PATH(_tmp_FILE ${_current_FILE}) GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE) - SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) - SET(_src ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) - SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp) + set(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) + set(_src ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) + set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp) ADD_CUSTOM_COMMAND(OUTPUT ${_header} COMMAND ${QT_UIC_EXECUTABLE} @@ -206,18 +206,18 @@ MACRO(KDE3_ADD_UI_FILES _sources ) DEPENDS ${_header} ) - SET(${_sources} ${${_sources}} ${_src} ${_moc} ) + set(${_sources} ${${_sources}} ${_src} ${_moc} ) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE3_ADD_UI_FILES) MACRO(KDE3_AUTOMOC) - SET(_matching_FILES ) - FOREACH (_current_FILE ${ARGN}) + set(_matching_FILES ) + foreach (_current_FILE ${ARGN}) KDE3_GET_ABS_PATH(_tmp_FILE ${_current_FILE}) - IF (EXISTS ${_tmp_FILE}) + if (EXISTS ${_tmp_FILE}) FILE(READ ${_tmp_FILE} _contents) @@ -225,14 +225,14 @@ MACRO(KDE3_AUTOMOC) GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH) STRING(REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _match "${_contents}") - IF(_match) - FOREACH (_current_MOC_INC ${_match}) + if(_match) + foreach (_current_MOC_INC ${_match}) STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}") GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE) -# SET(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h) - SET(_header ${_abs_PATH}/${_basename}.h) - SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC}) +# set(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h) + set(_header ${_abs_PATH}/${_basename}.h) + set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC}) ADD_CUSTOM_COMMAND(OUTPUT ${_moc} COMMAND ${QT_MOC_EXECUTABLE} @@ -242,53 +242,53 @@ MACRO(KDE3_AUTOMOC) KDE3_ADD_FILE_DEPENDANCY(${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} ${_moc}) - ENDFOREACH (_current_MOC_INC) - ENDIF(_match) + endforeach (_current_MOC_INC) + endif(_match) - ENDIF (EXISTS ${_tmp_FILE}) - ENDFOREACH (_current_FILE) + endif (EXISTS ${_tmp_FILE}) + endforeach (_current_FILE) ENDMACRO(KDE3_AUTOMOC) MACRO(KDE3_INSTALL_ICONS _theme) ADD_CUSTOM_TARGET(install_icons ) SET_TARGET_PROPERTIES(install_icons PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake ) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "# icon installations rules\n") - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "SET(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n") + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "set(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n") FILE(GLOB _icons *.png) - FOREACH(_current_ICON ${_icons} ) + foreach(_current_ICON ${_icons} ) STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size "${_current_ICON}") STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}") STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name "${_current_ICON}") - SET(_icon_GROUP "actions") + set(_icon_GROUP "actions") - IF(${_group} STREQUAL "mime") - SET(_icon_GROUP "mimetypes") - ENDIF(${_group} STREQUAL "mime") + if(${_group} STREQUAL "mime") + set(_icon_GROUP "mimetypes") + endif(${_group} STREQUAL "mime") - IF(${_group} STREQUAL "filesys") - SET(_icon_GROUP "filesystems") - ENDIF(${_group} STREQUAL "filesys") + if(${_group} STREQUAL "filesys") + set(_icon_GROUP "filesystems") + endif(${_group} STREQUAL "filesys") - IF(${_group} STREQUAL "device") - SET(_icon_GROUP "devices") - ENDIF(${_group} STREQUAL "device") + if(${_group} STREQUAL "device") + set(_icon_GROUP "devices") + endif(${_group} STREQUAL "device") - IF(${_group} STREQUAL "app") - SET(_icon_GROUP "apps") - ENDIF(${_group} STREQUAL "app") + if(${_group} STREQUAL "app") + set(_icon_GROUP "apps") + endif(${_group} STREQUAL "app") - IF(${_group} STREQUAL "action") - SET(_icon_GROUP "actions") - ENDIF(${_group} STREQUAL "action") + if(${_group} STREQUAL "action") + set(_icon_GROUP "actions") + endif(${_group} STREQUAL "action") -# MESSAGE(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" ) - SET(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/share/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name}) - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "MESSAGE(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n") +# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" ) + set(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/share/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name}) + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n") FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n") - ENDFOREACH (_current_ICON) + endforeach (_current_ICON) ENDMACRO(KDE3_INSTALL_ICONS _theme) MACRO(KDE3_CREATE_LIBTOOL_FILE _target) @@ -296,7 +296,7 @@ MACRO(KDE3_CREATE_LIBTOOL_FILE _target) GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE) GET_FILENAME_COMPONENT(_soname ${_target_location} NAME) - SET(_laname ${_laname}.la) + set(_laname ${_laname}.la) FILE(WRITE ${_laname} "# ${_laname} - a libtool library file, generated by cmake \n") FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n") @@ -321,9 +321,9 @@ ENDMACRO(KDE3_CREATE_LIBTOOL_FILE) MACRO(KDE3_CREATE_FINAL_FILE _filename) FILE(WRITE ${_filename} "//autogenerated file\n") - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) FILE(APPEND ${_filename} "#include \"${_current_FILE}\"\n") - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE3_CREATE_FINAL_FILE _filename) @@ -333,22 +333,22 @@ OPTION(KDE3_BUILD_TESTS "Build the tests") MACRO(KDE3_ADD_KPART _target_NAME _with_PREFIX) #is the first argument is "WITH_PREFIX" then keep the standard "lib" prefix, otherwise set the prefix empty - IF (${_with_PREFIX} STREQUAL "WITH_PREFIX") - SET(_first_SRC) - ELSE (${_with_PREFIX} STREQUAL "WITH_PREFIX") - SET(_first_SRC ${_with_PREFIX}) - ENDIF (${_with_PREFIX} STREQUAL "WITH_PREFIX") + if (${_with_PREFIX} STREQUAL "WITH_PREFIX") + set(_first_SRC) + else (${_with_PREFIX} STREQUAL "WITH_PREFIX") + set(_first_SRC ${_with_PREFIX}) + endif (${_with_PREFIX} STREQUAL "WITH_PREFIX") - IF (KDE3_ENABLE_FINAL) + if (KDE3_ENABLE_FINAL) KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN}) ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final.cpp) - ELSE (KDE3_ENABLE_FINAL) + else (KDE3_ENABLE_FINAL) ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN}) - ENDIF (KDE3_ENABLE_FINAL) + endif (KDE3_ENABLE_FINAL) - IF(_first_SRC) + if(_first_SRC) SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "") - ENDIF(_first_SRC) + endif(_first_SRC) KDE3_CREATE_LIBTOOL_FILE(${_target_NAME}) @@ -356,12 +356,12 @@ ENDMACRO(KDE3_ADD_KPART _target_NAME _with_PREFIX) MACRO(KDE3_ADD_KLM _target_NAME ) - IF (KDE3_ENABLE_FINAL) + if (KDE3_ENABLE_FINAL) KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN}) ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp) - ELSE (KDE3_ENABLE_FINAL) + else (KDE3_ENABLE_FINAL) ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} ) - ENDIF (KDE3_ENABLE_FINAL) + endif (KDE3_ENABLE_FINAL) CONFIGURE_FILE(${CMAKE_ROOT}/Modules/kde3init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) @@ -373,12 +373,12 @@ ENDMACRO(KDE3_ADD_KLM _target_NAME) MACRO(KDE3_ADD_EXECUTABLE _target_NAME ) - IF (KDE3_ENABLE_FINAL) + if (KDE3_ENABLE_FINAL) KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN}) ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final.cpp) - ELSE (KDE3_ENABLE_FINAL) + else (KDE3_ENABLE_FINAL) ADD_EXECUTABLE(${_target_NAME} ${ARGN} ) - ENDIF (KDE3_ENABLE_FINAL) + endif (KDE3_ENABLE_FINAL) ENDMACRO(KDE3_ADD_EXECUTABLE _target_NAME) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index ab7de2f4..fbf58ba1 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -18,28 +18,28 @@ #create the kidl and skeletion file for dcop stuff #usage: KDE_ADD_COP_SKELS(foo_SRCS ${dcop_headers}) MACRO(KDE4_ADD_DCOP_SKELS _sources) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE) GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE) - SET(_skel ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_skel.cpp) - SET(_skel_H ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_skel.h) - SET(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl) + set(_skel ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_skel.cpp) + set(_skel_H ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_skel.h) + set(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl) - IF (NOT HAVE_${_basename}_KIDL_RULE) - SET(HAVE_${_basename}_KIDL_RULE ON) + if (not HAVE_${_basename}_KIDL_RULE) + set(HAVE_${_basename}_KIDL_RULE ON) ADD_CUSTOM_COMMAND(OUTPUT ${_kidl} COMMAND ${KDE4_DCOPIDL_EXECUTABLE} ARGS --srcdir ${KDE4_KALYPTUS_DIR} -o ${_kidl} ${_tmp_FILE} DEPENDS ${_tmp_FILE} ) - ENDIF (NOT HAVE_${_basename}_KIDL_RULE) + endif (not HAVE_${_basename}_KIDL_RULE) - IF (NOT HAVE_${_basename}_SKEL_RULE) - SET(HAVE_${_basename}_SKEL_RULE ON) + if (not HAVE_${_basename}_SKEL_RULE) + set(HAVE_${_basename}_SKEL_RULE ON) ADD_CUSTOM_COMMAND(OUTPUT ${_skel} COMMAND ${KDE4_DCOPIDL2CPP_EXECUTABLE} @@ -48,38 +48,38 @@ MACRO(KDE4_ADD_DCOP_SKELS _sources) MACRO_ADDITIONAL_CLEAN_FILES( ${_skel_H}) - ENDIF (NOT HAVE_${_basename}_SKEL_RULE) + endif (not HAVE_${_basename}_SKEL_RULE) - SET(${_sources} ${${_sources}} ${_skel}) + set(${_sources} ${${_sources}} ${_skel}) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE4_ADD_DCOP_SKELS) MACRO(KDE4_ADD_DCOP_STUBS _sources) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE) GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE) - SET(_stub_CPP ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_stub.cpp) - SET(_stub_H ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_stub.h) - SET(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl) + set(_stub_CPP ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_stub.cpp) + set(_stub_H ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_stub.h) + set(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl) - IF (NOT HAVE_${_basename}_KIDL_RULE) - SET(HAVE_${_basename}_KIDL_RULE ON) + if (not HAVE_${_basename}_KIDL_RULE) + set(HAVE_${_basename}_KIDL_RULE ON) ADD_CUSTOM_COMMAND(OUTPUT ${_kidl} COMMAND ${KDE4_DCOPIDL_EXECUTABLE} ARGS --srcdir ${KDE4_KALYPTUS_DIR} -o ${_kidl} ${_tmp_FILE} DEPENDS ${_tmp_FILE} ) - ENDIF (NOT HAVE_${_basename}_KIDL_RULE) + endif (not HAVE_${_basename}_KIDL_RULE) - IF (NOT HAVE_${_basename}_STUB_RULE) - SET(HAVE_${_basename}_STUB_RULE ON) + if (not HAVE_${_basename}_STUB_RULE) + set(HAVE_${_basename}_STUB_RULE ON) ADD_CUSTOM_COMMAND(OUTPUT ${_stub_CPP} COMMAND ${KDE4_DCOPIDL2CPP_EXECUTABLE} @@ -88,17 +88,17 @@ MACRO(KDE4_ADD_DCOP_STUBS _sources) MACRO_ADDITIONAL_CLEAN_FILES( ${_stub_H}) - ENDIF (NOT HAVE_${_basename}_STUB_RULE) + endif (not HAVE_${_basename}_STUB_RULE) - SET(${_sources} ${${_sources}} ${_stub_CPP}) + set(${_sources} ${${_sources}} ${_stub_CPP}) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE4_ADD_DCOP_STUBS) MACRO(KDE4_ADD_KCFG_FILES _sources) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE) @@ -107,9 +107,9 @@ MACRO(KDE4_ADD_KCFG_FILES _sources) FILE(READ ${_tmp_FILE} _contents) STRING(REGEX REPLACE "^(.*\n)?File=([^\n]+)\n.*$" "\\2" _kcfg_FILE "${_contents}") - SET(_src_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) - SET(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) - SET(_moc_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc) + set(_src_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) + set(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) + set(_moc_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc) # the command for creating the source file from the kcfg file ADD_CUSTOM_COMMAND(OUTPUT ${_src_FILE} @@ -127,28 +127,28 @@ MACRO(KDE4_ADD_KCFG_FILES _sources) QT4_GENERATE_MOC(${_header_FILE} ${_moc_FILE} ) MACRO_ADD_FILE_DEPENDENCIES(${_src_FILE} ${_moc_FILE} ) - SET(${_sources} ${${_sources}} ${_src_FILE}) + set(${_sources} ${${_sources}} ${_src_FILE}) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE4_ADD_KCFG_FILES) -IF(EXISTS "${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in") - SET(KDE4_MODULE_DIR "${CMAKE_ROOT}/Modules") -ELSE(EXISTS "${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in") - SET(KDE4_MODULE_DIR "${CMAKE_SOURCE_DIR}/cmake/modules") -ENDIF(EXISTS "${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in") +if(EXISTS "${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in") + set(KDE4_MODULE_DIR "${CMAKE_ROOT}/Modules") +else(EXISTS "${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in") + set(KDE4_MODULE_DIR "${CMAKE_SOURCE_DIR}/cmake/modules") +endif(EXISTS "${CMAKE_ROOT}/Modules/kde4init_dummy.cpp.in") #create the implementation files from the ui files and add them to the list of sources #usage: KDE_ADD_UI_FILES(foo_SRCS ${ui_files}) MACRO(KDE4_ADD_UI_FILES _sources ) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE) GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE) - SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) + set(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) # we need to run uic and replace some things in the generated file # this is done by executing the cmake script kde4uic.cmake @@ -163,7 +163,7 @@ MACRO(KDE4_ADD_UI_FILES _sources ) -P ${KDE4_MODULE_DIR}/kde4uic.cmake DEPENDS ${_tmp_FILE} ) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE4_ADD_UI_FILES) @@ -173,14 +173,14 @@ MACRO(KDE4_ADD_UI3_FILES _sources ) QT4_GET_MOC_INC_DIRS(_moc_INCS) - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE) GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE) - SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) - SET(_src ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) - SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp) + set(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) + set(_src ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) + set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp) ADD_CUSTOM_COMMAND(OUTPUT ${_header} COMMAND ${CMAKE_COMMAND} @@ -215,21 +215,21 @@ MACRO(KDE4_ADD_UI3_FILES _sources ) ARGS ${_moc_INCS} ${_header} -o ${_moc} DEPENDS ${_header} ) - SET(${_sources} ${${_sources}} ${_src} ${_moc} ) + set(${_sources} ${${_sources}} ${_src} ${_moc} ) - ENDFOREACH (_current_FILE) + endforeach (_current_FILE) ENDMACRO(KDE4_ADD_UI3_FILES) MACRO(KDE4_AUTOMOC) QT4_GET_MOC_INC_DIRS(_moc_INCS) - SET(_matching_FILES ) - FOREACH (_current_FILE ${ARGN}) + set(_matching_FILES ) + foreach (_current_FILE ${ARGN}) GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE) - IF (EXISTS ${_tmp_FILE}) + if (EXISTS ${_tmp_FILE}) FILE(READ ${_tmp_FILE} _contents) @@ -237,14 +237,14 @@ MACRO(KDE4_AUTOMOC) GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH) STRING(REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _match "${_contents}") - IF(_match) - FOREACH (_current_MOC_INC ${_match}) + if(_match) + foreach (_current_MOC_INC ${_match}) STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}") GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE) -# SET(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h) - SET(_header ${_abs_PATH}/${_basename}.h) - SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC}) +# set(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h) + set(_header ${_abs_PATH}/${_basename}.h) + set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC}) ADD_CUSTOM_COMMAND(OUTPUT ${_moc} COMMAND ${QT_MOC_EXECUTABLE} ARGS ${_moc_INCS} ${_header} -o ${_moc} @@ -253,86 +253,86 @@ MACRO(KDE4_AUTOMOC) MACRO_ADD_FILE_DEPENDENCIES(${_tmp_FILE} ${_moc}) - ENDFOREACH (_current_MOC_INC) - ENDIF(_match) + endforeach (_current_MOC_INC) + endif(_match) - ENDIF (EXISTS ${_tmp_FILE}) - ENDFOREACH (_current_FILE) + endif (EXISTS ${_tmp_FILE}) + endforeach (_current_FILE) ENDMACRO(KDE4_AUTOMOC) MACRO(KDE4_INSTALL_ICONS _theme _defaultpath ) ADD_CUSTOM_TARGET(install_icons ) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "# icon installations rules\n") - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "SET(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n") + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "set(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n") FILE(GLOB _icons *.png) - FOREACH(_current_ICON ${_icons} ) + foreach(_current_ICON ${_icons} ) STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size "${_current_ICON}") STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}") STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name "${_current_ICON}") # if the string doesn't match the pattern, the result is the full string, so all three have the same content - IF( NOT ${_size} STREQUAL ${_name} ) - SET(_icon_GROUP "actions") + if( not ${_size} STREQUAL ${_name} ) + set(_icon_GROUP "actions") - IF(${_group} STREQUAL "mime") - SET(_icon_GROUP "mimetypes") - ENDIF(${_group} STREQUAL "mime") + if(${_group} STREQUAL "mime") + set(_icon_GROUP "mimetypes") + endif(${_group} STREQUAL "mime") - IF(${_group} STREQUAL "filesys") - SET(_icon_GROUP "filesystems") - ENDIF(${_group} STREQUAL "filesys") + if(${_group} STREQUAL "filesys") + set(_icon_GROUP "filesystems") + endif(${_group} STREQUAL "filesys") - IF(${_group} STREQUAL "device") - SET(_icon_GROUP "devices") - ENDIF(${_group} STREQUAL "device") + if(${_group} STREQUAL "device") + set(_icon_GROUP "devices") + endif(${_group} STREQUAL "device") - IF(${_group} STREQUAL "app") - SET(_icon_GROUP "apps") - ENDIF(${_group} STREQUAL "app") + if(${_group} STREQUAL "app") + set(_icon_GROUP "apps") + endif(${_group} STREQUAL "app") - IF(${_group} STREQUAL "action") - SET(_icon_GROUP "actions") - ENDIF(${_group} STREQUAL "action") + if(${_group} STREQUAL "action") + set(_icon_GROUP "actions") + endif(${_group} STREQUAL "action") -# MESSAGE(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" ) - SET(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/${_defaultpath}/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name}) - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "MESSAGE(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n") +# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" ) + set(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/${_defaultpath}/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name}) + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n") FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n") - ENDIF( NOT ${_size} STREQUAL ${_name} ) - ENDFOREACH (_current_ICON) + endif( not ${_size} STREQUAL ${_name} ) + endforeach (_current_ICON) FILE(GLOB _icons *.svgz) - FOREACH(_current_ICON ${_icons} ) + foreach(_current_ICON ${_icons} ) STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\1" _group "${_current_ICON}") STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\2" _name "${_current_ICON}") - SET(_icon_GROUP "actions") + set(_icon_GROUP "actions") - IF(${_group} STREQUAL "mime") - SET(_icon_GROUP "mimetypes") - ENDIF(${_group} STREQUAL "mime") + if(${_group} STREQUAL "mime") + set(_icon_GROUP "mimetypes") + endif(${_group} STREQUAL "mime") - IF(${_group} STREQUAL "filesys") - SET(_icon_GROUP "filesystems") - ENDIF(${_group} STREQUAL "filesys") + if(${_group} STREQUAL "filesys") + set(_icon_GROUP "filesystems") + endif(${_group} STREQUAL "filesys") - IF(${_group} STREQUAL "device") - SET(_icon_GROUP "devices") - ENDIF(${_group} STREQUAL "device") + if(${_group} STREQUAL "device") + set(_icon_GROUP "devices") + endif(${_group} STREQUAL "device") - IF(${_group} STREQUAL "app") - SET(_icon_GROUP "apps") - ENDIF(${_group} STREQUAL "app") + if(${_group} STREQUAL "app") + set(_icon_GROUP "apps") + endif(${_group} STREQUAL "app") - IF(${_group} STREQUAL "action") - SET(_icon_GROUP "actions") - ENDIF(${_group} STREQUAL "action") + if(${_group} STREQUAL "action") + set(_icon_GROUP "actions") + endif(${_group} STREQUAL "action") - SET(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/${_defaultpath}/icons/${_theme}/scalable/${_icon_GROUP}/${_name}) - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "MESSAGE(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n") + set(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/${_defaultpath}/icons/${_theme}/scalable/${_icon_GROUP}/${_name}) + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n") FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n") - ENDFOREACH (_current_ICON) + endforeach (_current_ICON) INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake ) ENDMACRO(KDE4_INSTALL_ICONS _theme _defaultpath) @@ -353,7 +353,7 @@ MACRO(KDE4_INSTALL_LIBTOOL_FILE _subdir _target) GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE) GET_FILENAME_COMPONENT(_soname ${_target_location} NAME) - SET(_laname ${LIBRARY_OUTPUT_PATH}/${_laname}.la) + set(_laname ${LIBRARY_OUTPUT_PATH}/${_laname}.la) FILE(WRITE ${_laname} "# ${_laname} - a libtool library file, generated by cmake \n") FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n") @@ -380,14 +380,14 @@ ENDMACRO(KDE4_INSTALL_LIBTOOL_FILE) MACRO(KDE4_CREATE_FINAL_FILES _filenameCPP _filenameC ) FILE(WRITE ${_filenameCPP} "//autogenerated file\n") FILE(WRITE ${_filenameC} "/*autogenerated file*/\n") - FOREACH (_current_FILE ${ARGN}) + foreach (_current_FILE ${ARGN}) STRING(REGEX MATCH ".+\\.c$" _isCFile ${_current_FILE}) - IF(_isCFile) + if(_isCFile) FILE(APPEND ${_filenameC} "#include \"${_current_FILE}\"\n") - ELSE(_isCFile) + else(_isCFile) FILE(APPEND ${_filenameCPP} "#include \"${_current_FILE}\"\n") - ENDIF(_isCFile) - ENDFOREACH (_current_FILE) + endif(_isCFile) + endforeach (_current_FILE) ENDMACRO(KDE4_CREATE_FINAL_FILES) @@ -398,27 +398,27 @@ OPTION(KDE4_USE_QT_EMB "link to Qt-embedded, don't use X") MACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) #is the first argument is "WITH_PREFIX" then keep the standard "lib" prefix, otherwise set the prefix empty - IF (${_with_PREFIX} STREQUAL "WITH_PREFIX") - SET(_first_SRC) - ELSE (${_with_PREFIX} STREQUAL "WITH_PREFIX") - SET(_first_SRC ${_with_PREFIX}) - ENDIF (${_with_PREFIX} STREQUAL "WITH_PREFIX") + if (${_with_PREFIX} STREQUAL "WITH_PREFIX") + set(_first_SRC) + else (${_with_PREFIX} STREQUAL "WITH_PREFIX") + set(_first_SRC ${_with_PREFIX}) + endif (${_with_PREFIX} STREQUAL "WITH_PREFIX") - IF (KDE4_ENABLE_FINAL) + if (KDE4_ENABLE_FINAL) KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${_first_SRC} ${ARGN}) ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c) - ELSE (KDE4_ENABLE_FINAL) + else (KDE4_ENABLE_FINAL) ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN}) - ENDIF (KDE4_ENABLE_FINAL) + endif (KDE4_ENABLE_FINAL) - IF(_first_SRC) + if(_first_SRC) SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "") - ENDIF(_first_SRC) + endif(_first_SRC) -# IF (UNIX) +# if (UNIX) # I guess under windows the libtool file are not required #KDE4_INSTALL_LIBTOOL_FILE(${_target_NAME}) -# ENDIF (UNIX) +# endif (UNIX) ENDMACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) @@ -428,35 +428,35 @@ MACRO(KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) CONFIGURE_FILE(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) MACRO_ADDITIONAL_CLEAN_FILES( ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ) -# IF (WIN32) +# if (WIN32) # # under windows, just build a normal executable # KDE4_ADD_EXECUTABLE(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${ARGN} ) -# ELSE (WIN32) +# else (WIN32) # under UNIX, create a shared library and a small executable, which links to this library - IF (KDE4_ENABLE_FINAL) + if (KDE4_ENABLE_FINAL) KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${ARGN}) ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c) - ELSE (KDE4_ENABLE_FINAL) + else (KDE4_ENABLE_FINAL) ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} ) -# MESSAGE(STATUS "klm: kdeinit_${_target_NAME}") - ENDIF (KDE4_ENABLE_FINAL) +# message(STATUS "klm: kdeinit_${_target_NAME}") + endif (KDE4_ENABLE_FINAL) ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ) TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} ) -# ENDIF (WIN32) +# endif (WIN32) ENDMACRO(KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME) MACRO(KDE4_ADD_EXECUTABLE _target_NAME ) - IF (KDE4_ENABLE_FINAL) + if (KDE4_ENABLE_FINAL) KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${ARGN}) ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c) - ELSE (KDE4_ENABLE_FINAL) + else (KDE4_ENABLE_FINAL) ADD_EXECUTABLE(${_target_NAME} ${ARGN} ) - ENDIF (KDE4_ENABLE_FINAL) + endif (KDE4_ENABLE_FINAL) ENDMACRO(KDE4_ADD_EXECUTABLE _target_NAME) @@ -464,35 +464,35 @@ ENDMACRO(KDE4_ADD_EXECUTABLE _target_NAME) MACRO(KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) #is the first argument is "WITH_PREFIX" then keep the standard "lib" prefix, otherwise set the prefix empty - SET(_first_SRC ${_lib_TYPE}) - SET(_add_lib_param) - - IF (${_lib_TYPE} STREQUAL "STATIC") - SET(_first_SRC) - SET(_add_lib_param STATIC) - ENDIF (${_lib_TYPE} STREQUAL "STATIC") - IF (${_lib_TYPE} STREQUAL "SHARED") - SET(_first_SRC) - SET(_add_lib_param SHARED) - ENDIF (${_lib_TYPE} STREQUAL "SHARED") - IF (${_lib_TYPE} STREQUAL "MODULE") - SET(_first_SRC) - SET(_add_lib_param MODULE) - ENDIF (${_lib_TYPE} STREQUAL "MODULE") - - IF (KDE4_ENABLE_FINAL) + set(_first_SRC ${_lib_TYPE}) + set(_add_lib_param) + + if (${_lib_TYPE} STREQUAL "STATIC") + set(_first_SRC) + set(_add_lib_param STATIC) + endif (${_lib_TYPE} STREQUAL "STATIC") + if (${_lib_TYPE} STREQUAL "SHARED") + set(_first_SRC) + set(_add_lib_param SHARED) + endif (${_lib_TYPE} STREQUAL "SHARED") + if (${_lib_TYPE} STREQUAL "MODULE") + set(_first_SRC) + set(_add_lib_param MODULE) + endif (${_lib_TYPE} STREQUAL "MODULE") + + if (KDE4_ENABLE_FINAL) KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${_first_SRC} ${ARGN}) ADD_LIBRARY(${_target_NAME} ${_add_lib_param} ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c) - ELSE (KDE4_ENABLE_FINAL) + else (KDE4_ENABLE_FINAL) ADD_LIBRARY(${_target_NAME} ${_add_lib_param} ${_first_SRC} ${ARGN}) - ENDIF (KDE4_ENABLE_FINAL) + endif (KDE4_ENABLE_FINAL) - IF (WIN32) + if (WIN32) # for shared libraries a -DMAKE_target_LIB is required string(TOUPPER ${_target_NAME} _symbol) set(_symbol "MAKE_${_symbol}_LIB") set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol}) - ENDIF (WIN32) + endif (WIN32) ENDMACRO(KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) diff --git a/modules/MacroAddFileDependencies.cmake b/modules/MacroAddFileDependencies.cmake index e263c6b8..0025a13e 100644 --- a/modules/MacroAddFileDependencies.cmake +++ b/modules/MacroAddFileDependencies.cmake @@ -4,11 +4,11 @@ MACRO(MACRO_ADD_FILE_DEPENDENCIES _file) GET_SOURCE_FILE_PROPERTY(_deps ${_file} OBJECT_DEPENDS) - IF (_deps) - SET(_deps ${_deps} ${ARGN}) - ELSE (_deps) - SET(_deps ${ARGN}) - ENDIF (_deps) + if (_deps) + set(_deps ${_deps} ${ARGN}) + else (_deps) + set(_deps ${ARGN}) + endif (_deps) SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES OBJECT_DEPENDS "${_deps}") diff --git a/modules/MacroAdditionalCleanFiles.cmake b/modules/MacroAdditionalCleanFiles.cmake index a3d930dc..5f1725ea 100644 --- a/modules/MacroAdditionalCleanFiles.cmake +++ b/modules/MacroAdditionalCleanFiles.cmake @@ -4,11 +4,11 @@ MACRO(MACRO_ADDITIONAL_CLEAN_FILES) GET_DIRECTORY_PROPERTY(_tmp_DIR_PROPS ADDITIONAL_MAKE_CLEAN_FILES ) - IF (_tmp_DIR_PROPS) - SET(_tmp_DIR_PROPS ${_tmp_DIR_PROPS} ${ARGN}) - ELSE (_tmp_DIR_PROPS) - SET(_tmp_DIR_PROPS ${ARGN}) - ENDIF (_tmp_DIR_PROPS) + if (_tmp_DIR_PROPS) + set(_tmp_DIR_PROPS ${_tmp_DIR_PROPS} ${ARGN}) + else (_tmp_DIR_PROPS) + set(_tmp_DIR_PROPS ${ARGN}) + endif (_tmp_DIR_PROPS) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${_tmp_DIR_PROPS}") ENDMACRO(MACRO_ADDITIONAL_CLEAN_FILES) diff --git a/modules/MacroGetenvWinPath.cmake b/modules/MacroGetenvWinPath.cmake index 9c8efaf3..6df21e04 100644 --- a/modules/MacroGetenvWinPath.cmake +++ b/modules/MacroGetenvWinPath.cmake @@ -1,5 +1,5 @@ MACRO(MACRO_GETENV_WIN_PATH var name) - SET(${var} $ENV{${name}}) + set(${var} $ENV{${name}}) STRING( REGEX REPLACE "\\\\" "/" ${var} "${${var}}" ) ENDMACRO(MACRO_GETENV_WIN_PATH var name) diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake index 1b0cf1e7..c7a05cf0 100644 --- a/modules/MacroOptionalFindPackage.cmake +++ b/modules/MacroOptionalFindPackage.cmake @@ -9,14 +9,14 @@ MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name ) OPTION(WITH_${_name} "Search for ${_name} package" ON) - IF (WITH_${_name}) + if (WITH_${_name}) FIND_PACKAGE(${_name} ${ARGN}) - ELSE (WITH_${_name}) - SET(${_name}_FOUND) - SET(${_name}_INCLUDE_DIR) - SET(${_name}_INCLUDES) - SET(${_name}_LIBRARY) - SET(${_name}_LIBRARIES) - ENDIF (WITH_${_name}) + else (WITH_${_name}) + set(${_name}_FOUND) + set(${_name}_INCLUDE_DIR) + set(${_name}_INCLUDES) + set(${_name}_LIBRARY) + set(${_name}_LIBRARIES) + endif (WITH_${_name}) ENDMACRO(MACRO_OPTIONAL_FIND_PACKAGE) diff --git a/modules/UsePkgConfig.cmake b/modules/UsePkgConfig.cmake index e810d572..2deba4d7 100644 --- a/modules/UsePkgConfig.cmake +++ b/modules/UsePkgConfig.cmake @@ -10,18 +10,18 @@ FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin ) MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags) # reset the variables at the beginning - SET(${_include_DIR}) - SET(${_link_DIR}) - SET(${_link_FLAGS}) - SET(${_cflags}) + set(${_include_DIR}) + set(${_link_DIR}) + set(${_link_FLAGS}) + set(${_cflags}) # if pkg-config has been found - IF(PKGCONFIG_EXECUTABLE) + if(PKGCONFIG_EXECUTABLE) EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) # and if the package of interest also exists for pkg-config, then get the information - IF(NOT _return_VALUE) + if(not _return_VALUE) EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR} ) @@ -31,9 +31,9 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags) EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags OUTPUT_VARIABLE ${_cflags} ) - ENDIF(NOT _return_VALUE) + endif(not _return_VALUE) - ENDIF(PKGCONFIG_EXECUTABLE) + endif(PKGCONFIG_EXECUTABLE) ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags) diff --git a/modules/kde4uic.cmake b/modules/kde4uic.cmake index 4d33e60d..a39be0a2 100644 --- a/modules/kde4uic.cmake +++ b/modules/kde4uic.cmake @@ -1,6 +1,6 @@ #using a ui3 file with uic3 -IF(KDE3_IMPL) +if(KDE3_IMPL) EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE} -nounload -tr tr2i18n @@ -9,10 +9,10 @@ IF(KDE3_IMPL) OUTPUT_VARIABLE _uic_CONTENTS ERROR_QUIET ) -ENDIF(KDE3_IMPL) +endif(KDE3_IMPL) -IF(KDE3_HEADER) +if(KDE3_HEADER) EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE} -nounload -tr tr2i18n @@ -20,11 +20,11 @@ IF(KDE3_HEADER) OUTPUT_VARIABLE _uic_CONTENTS ERROR_QUIET ) - SET(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE}) -ENDIF(KDE3_HEADER) + set(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE}) +endif(KDE3_HEADER) # the kde4 branch -IF (KDE4_HEADER) +if (KDE4_HEADER) EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE} -tr tr2i18n @@ -33,8 +33,8 @@ IF (KDE4_HEADER) ERROR_QUIET ) - SET(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE}) -ENDIF (KDE4_HEADER) + set(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE}) +endif (KDE4_HEADER) #replace tr218n("") with QString::null to avoid waring from KLocale |