diff options
Diffstat (limited to 'attic')
41 files changed, 187 insertions, 187 deletions
diff --git a/attic/modules-tests/RunAllModuleTests.cmake b/attic/modules-tests/RunAllModuleTests.cmake index d68f61fd..a9b387d7 100644 --- a/attic/modules-tests/RunAllModuleTests.cmake +++ b/attic/modules-tests/RunAllModuleTests.cmake @@ -12,7 +12,7 @@ function(execute_one_test name) set(workingDir "${currentDir}/${name}/build") if(CLEAN_DIRS) file(REMOVE_RECURSE "${workingDir}") - endif(CLEAN_DIRS) + endif() file(MAKE_DIRECTORY "${workingDir}") execute_process(COMMAND ${CMAKE_COMMAND} "${currentDir}/${name}" WORKING_DIRECTORY "${workingDir}") @@ -20,7 +20,7 @@ function(execute_one_test name) set(workingDir "${currentDir}/${name}/build-no-pkgconfig") if(CLEAN_DIRS) file(REMOVE_RECURSE "${workingDir}") - endif(CLEAN_DIRS) + endif() file(MAKE_DIRECTORY "${workingDir}") execute_process(COMMAND ${CMAKE_COMMAND} -DPKG_CONFIG_EXECUTABLE=echo "${currentDir}/${name}" WORKING_DIRECTORY "${workingDir}") @@ -28,7 +28,7 @@ endfunction(execute_one_test) if(DEFINED MODULE) set(modulesToTest ${MODULE}) -else(DEFINED MODULE) +else() set(modulesToTest AGG Blitz BlueZ @@ -51,7 +51,7 @@ else(DEFINED MODULE) USB Xine Xmms) -endif(DEFINED MODULE) +endif() foreach(currentModule ${modulesToTest}) execute_one_test(${currentModule}) diff --git a/attic/modules-tests/TestFindPackage.cmake b/attic/modules-tests/TestFindPackage.cmake index 8de22b06..24e70f5c 100644 --- a/attic/modules-tests/TestFindPackage.cmake +++ b/attic/modules-tests/TestFindPackage.cmake @@ -23,9 +23,9 @@ macro(TEST_FIND_PACKAGE package prefix ) # but never return success. if("${PKG_CONFIG_EXECUTABLE}" STREQUAL "echo") message(STATUS ":: ***** Testing Find${package}.cmake, with pkg-config disabled *****") - else("${PKG_CONFIG_EXECUTABLE}" STREQUAL "echo") + else() message(STATUS ":: ***** Testing Find${package}.cmake *****") - endif("${PKG_CONFIG_EXECUTABLE}" STREQUAL "echo") + endif() find_package(${package}) message(STATUS ":: ***** Results from Find${package}.cmake *****") diff --git a/attic/modules/FindAlsa.cmake b/attic/modules/FindAlsa.cmake index 1bad8126..e0aa4e21 100644 --- a/attic/modules/FindAlsa.cmake +++ b/attic/modules/FindAlsa.cmake @@ -22,14 +22,14 @@ find_library(ASOUND_LIBRARY asound) set(ASOUND_LIBRARY_DIR "") if(ASOUND_LIBRARY) get_filename_component(ASOUND_LIBRARY_DIR ${ASOUND_LIBRARY} PATH) -endif(ASOUND_LIBRARY) +endif() check_library_exists(asound snd_seq_create_simple_port "${ASOUND_LIBRARY_DIR}" HAVE_LIBASOUND2) if(HAVE_LIBASOUND2) message(STATUS "Found ALSA: ${ASOUND_LIBRARY}") -else(HAVE_LIBASOUND2) +else() message(STATUS "ALSA not found") -endif(HAVE_LIBASOUND2) +endif() set(ALSA_FOUND ${HAVE_LIBASOUND2}) find_path(ALSA_INCLUDES alsa/version.h) @@ -39,9 +39,9 @@ macro(ALSA_VERSION_STRING _result) if(ALSA_INCLUDES) file(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT) string(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} "${_ALSA_VERSION_CONTENT}") - else(ALSA_INCLUDES) + else() message(STATUS "ALSA version not known. ALSA output will probably not work correctly.") - endif(ALSA_INCLUDES) + endif() endmacro(ALSA_VERSION_STRING _result) @@ -61,7 +61,7 @@ macro(ALSA_CONFIGURE_FILE _destFile) check_library_exists(asound snd_pcm_resume "${ASOUND_LIBRARY_DIR}" ASOUND_HAS_SND_PCM_RESUME) if(ASOUND_HAS_SND_PCM_RESUME) set(HAVE_SND_PCM_RESUME 1) - endif(ASOUND_HAS_SND_PCM_RESUME) + endif() configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile}) endmacro(ALSA_CONFIGURE_FILE _destFile) diff --git a/attic/modules/FindDBusMenuQt.cmake b/attic/modules/FindDBusMenuQt.cmake index 5af70ef2..10e14dc3 100644 --- a/attic/modules/FindDBusMenuQt.cmake +++ b/attic/modules/FindDBusMenuQt.cmake @@ -64,7 +64,7 @@ if(DBUSMENUQT_INCLUDE_DIR AND NOT DBUSMENUQT_VERSION) string(REGEX MATCH "#define +DBUSMENUQT_VERSION_PATCH +([0-9]+)" _dummy "${DBUSMENUQT_VERSION_CONTENT}") set(DBUSMENUQT_VERSION_PATCH "${CMAKE_MATCH_1}") - else("${DBUSMENUQT_VERSION_CONTENT}" MATCHES "DBUSMENUQT_VERSION_MAJOR") + else() # In versions up to 0.6.4, the code for setting the version number in the header looked like # shopw below. This made version checking quite un-obvious: # #define DBUSMENUQT_VERSION \ @@ -80,11 +80,11 @@ if(DBUSMENUQT_INCLUDE_DIR AND NOT DBUSMENUQT_VERSION) string(REGEX MATCH "\\| *([0-9]+) *\\)" _dummy "${DBUSMENUQT_VERSION_CONTENT}") set(DBUSMENUQT_VERSION_PATCH "${CMAKE_MATCH_1}") - endif("${DBUSMENUQT_VERSION_CONTENT}" MATCHES "DBUSMENUQT_VERSION_MAJOR") - endif(EXISTS ${DBUSMENUQT_INCLUDE_DIR}/dbusmenu_version.h) + endif() + endif() set(DBUSMENUQT_VERSION "${DBUSMENUQT_VERSION_MAJOR}.${DBUSMENUQT_VERSION_MINOR}.${DBUSMENUQT_VERSION_PATCH}" CACHE STRING "Version number of DBusMenuQt" FORCE) -endif(DBUSMENUQT_INCLUDE_DIR AND NOT DBUSMENUQT_VERSION) +endif() find_package_handle_standard_args(DBusMenuQt REQUIRED_VARS DBUSMENUQT_LIBRARIES DBUSMENUQT_INCLUDE_DIR diff --git a/attic/modules/FindEigen2.cmake b/attic/modules/FindEigen2.cmake index 83949e99..721dbce7 100644 --- a/attic/modules/FindEigen2.cmake +++ b/attic/modules/FindEigen2.cmake @@ -20,7 +20,7 @@ if(NOT Eigen2_FIND_VERSION) set(Eigen2_FIND_VERSION_PATCH 0) set(Eigen2_FIND_VERSION "${Eigen2_FIND_VERSION_MAJOR}.${Eigen2_FIND_VERSION_MINOR}.${Eigen2_FIND_VERSION_PATCH}") -endif(NOT Eigen2_FIND_VERSION) +endif() macro(_eigen2_get_version) file(READ "${EIGEN2_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen2_version_header LIMIT 5000 OFFSET 1000) @@ -44,7 +44,7 @@ find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core if(EIGEN2_INCLUDE_DIR) _eigen2_get_version() -endif(EIGEN2_INCLUDE_DIR) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Eigen2 REQUIRED_VARS EIGEN2_INCLUDE_DIR diff --git a/attic/modules/FindExiv2.cmake b/attic/modules/FindExiv2.cmake index f929269d..770b3c65 100644 --- a/attic/modules/FindExiv2.cmake +++ b/attic/modules/FindExiv2.cmake @@ -25,12 +25,12 @@ # Support EXIV2_MIN_VERSION for compatibility: if(NOT Exiv2_FIND_VERSION) set(Exiv2_FIND_VERSION "${EXIV2_MIN_VERSION}") -endif(NOT Exiv2_FIND_VERSION) +endif() # the minimum version of exiv2 we require if(NOT Exiv2_FIND_VERSION) set(Exiv2_FIND_VERSION "0.12") -endif(NOT Exiv2_FIND_VERSION) +endif() if (NOT WIN32) @@ -68,7 +68,7 @@ if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION) set(EXIV2_VERSION_PATCH "${CMAKE_MATCH_1}") set(EXIV2_VERSION "${EXIV2_VERSION_MAJOR}.${EXIV2_VERSION_MINOR}.${EXIV2_VERSION_PATCH}" CACHE STRING "Version number of Exiv2" FORCE) -endif(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION) +endif() set(EXIV2_LIBRARIES "${EXIV2_LIBRARY}") diff --git a/attic/modules/FindGLIB2.cmake b/attic/modules/FindGLIB2.cmake index 09fd98d8..0f557222 100644 --- a/attic/modules/FindGLIB2.cmake +++ b/attic/modules/FindGLIB2.cmake @@ -14,7 +14,7 @@ if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) # Already in cache, be silent set(GLIB2_FIND_QUIETLY TRUE) -endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) +endif() find_package(PkgConfig) pkg_check_modules(PC_LibGLIB2 QUIET glib-2.0) @@ -44,7 +44,7 @@ set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}") # for now it is optional if(GLIB2_INTERNAL_INCLUDE_DIR) set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} "${GLIB2_INTERNAL_INCLUDE_DIR}") -endif(GLIB2_INTERNAL_INCLUDE_DIR) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_MAIN_INCLUDE_DIR) diff --git a/attic/modules/FindGSSAPI.cmake b/attic/modules/FindGSSAPI.cmake index 0951c675..942cf558 100644 --- a/attic/modules/FindGSSAPI.cmake +++ b/attic/modules/FindGSSAPI.cmake @@ -17,7 +17,7 @@ if(GSSAPI_LIBS AND GSSAPI_FLAVOR) # in cache already set(GSSAPI_FOUND TRUE) -else(GSSAPI_LIBS AND GSSAPI_FLAVOR) +else() find_program(KRB5_CONFIG NAMES krb5-config PATHS /opt/local/bin @@ -37,7 +37,7 @@ else(GSSAPI_LIBS AND GSSAPI_FLAVOR) if(_return_VALUE) message(STATUS "GSSAPI configure check failed.") set(HAVE_KRB5_GSSAPI FALSE) - endif(_return_VALUE) + endif() exec_program(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS) string(REGEX REPLACE "(\r?\n)+$" "" GSSAPI_INCS "${GSSAPI_INCS}") @@ -47,19 +47,19 @@ else(GSSAPI_LIBS AND GSSAPI_FLAVOR) set(GSSAPI_FLAVOR_MIT) if(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") set(GSSAPI_FLAVOR "MIT") - else(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") + else() set(GSSAPI_FLAVOR "HEIMDAL") - endif(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") + endif() if(NOT HAVE_KRB5_GSSAPI) if (gssapi_flavor_tmp MATCHES "Sun Microsystems.*") message(STATUS "Solaris Kerberos does not have GSSAPI; this is normal.") set(GSSAPI_LIBS) set(GSSAPI_INCS) - else(gssapi_flavor_tmp MATCHES "Sun Microsystems.*") + else() message(WARNING "${KRB5_CONFIG} failed unexpectedly.") - endif(gssapi_flavor_tmp MATCHES "Sun Microsystems.*") - endif(NOT HAVE_KRB5_GSSAPI) + endif() + endif() if(GSSAPI_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that set(GSSAPI_FOUND TRUE) @@ -71,8 +71,8 @@ else(GSSAPI_LIBS AND GSSAPI_FLAVOR) mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) - endif(GSSAPI_LIBS) + endif() - endif(KRB5_CONFIG) + endif() -endif(GSSAPI_LIBS AND GSSAPI_FLAVOR) +endif() diff --git a/attic/modules/FindGphoto2.cmake b/attic/modules/FindGphoto2.cmake index b1bd6270..71436118 100644 --- a/attic/modules/FindGphoto2.cmake +++ b/attic/modules/FindGphoto2.cmake @@ -47,7 +47,7 @@ if (KDE4_GPHOTO2 ) set(GPHOTO2_INCLUDE_DIRS ${GPHOTO2PORT_INCLUDE_DIR} ${GPHOTO2_INCLUDE_DIR} ) - endif(GHOTO2PORTCONFIG_EXECUTABLE AND GHOTO2CONFIG_EXECUTABLE) + endif() IF (GPHOTO2_LIBRARIES AND GPHOTO2_INCLUDE_DIRS) SET(GPHOTO2_FOUND TRUE) @@ -56,5 +56,5 @@ if (KDE4_GPHOTO2 ) ENDIF (GPHOTO2_LIBRARIES AND GPHOTO2_INCLUDE_DIR) MARK_AS_ADVANCED(GPHOTO2_LIBRARIES GPHOTO2_INCLUDE_DIRS) -endif(KDE4_GPHOTO2) +endif() diff --git a/attic/modules/FindKDEWIN_Packager.cmake b/attic/modules/FindKDEWIN_Packager.cmake index b8f023e5..c587deb8 100644 --- a/attic/modules/FindKDEWIN_Packager.cmake +++ b/attic/modules/FindKDEWIN_Packager.cmake @@ -48,8 +48,8 @@ if (WIN32) "${_progFiles}" ) set(KDEWIN_PACKAGER_DIR ${KDEWIN_PACKAGER_DIR_tmp}) - endif(NOT KDEWIN_PACKAGER_DIR) - endif(NOT KDEWIN_PACKAGER_DIR) + endif() + endif() if (KDEWIN_PACKAGER_DIR) diff --git a/attic/modules/FindKDEWin.cmake b/attic/modules/FindKDEWin.cmake index f9b7bf00..8f690737 100644 --- a/attic/modules/FindKDEWin.cmake +++ b/attic/modules/FindKDEWin.cmake @@ -17,7 +17,7 @@ if (WIN32) if(WINCE) FIND_PACKAGE(WCECOMPAT REQUIRED) - endif(WINCE) + endif() if (NOT KDEWIN_LIBRARY) @@ -34,7 +34,7 @@ if (WIN32) string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_TOLOWER) if (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) set (LIBRARY_NAME kdewind) - else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + else() set (LIBRARY_NAME kdewin) endif (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) @@ -53,9 +53,9 @@ if (WIN32) # add needed system libs if(NOT WINCE) set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} user32 shell32 ws2_32 netapi32 userenv) - else(NOT WINCE) + else() set(KDEWIN_LIBRARIES ${KDEWIN_LIBRARY} ws2 ${WCECOMPAT_LIBRARIES}) - endif(NOT WINCE) + endif() if (MINGW) #mingw compiler @@ -66,9 +66,9 @@ if (WIN32) file(TO_CMAKE_PATH "$ENV{MSSDK}" MSSDK_DIR) if (WINCE) set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${WCECOMPAT_INCLUDE_DIR} ${QT_INCLUDES} ${MSSDK_DIR}) - else(WINCE) + else() set(KDEWIN_INCLUDES ${KDEWIN_INCLUDE_DIR} ${KDEWIN_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${MSSDK_DIR}) - endif(WINCE) + endif() endif (MINGW) endif (KDEWIN_LIBRARY AND KDEWIN_INCLUDE_DIR) diff --git a/attic/modules/FindKNepomuk.cmake b/attic/modules/FindKNepomuk.cmake index 655f6fe8..071a8949 100644 --- a/attic/modules/FindKNepomuk.cmake +++ b/attic/modules/FindKNepomuk.cmake @@ -13,7 +13,7 @@ if(KNEPOMUK_INCLUDES AND KNEPOMUK_LIBRARIES) set(KNepomuk_FIND_QUIETLY TRUE) -endif(KNEPOMUK_INCLUDES AND KNEPOMUK_LIBRARIES) +endif() FIND_PATH(KNEPOMUK_INCLUDES NAMES diff --git a/attic/modules/FindKdcraw.cmake b/attic/modules/FindKdcraw.cmake index 518033d8..c19c70c2 100644 --- a/attic/modules/FindKdcraw.cmake +++ b/attic/modules/FindKdcraw.cmake @@ -57,7 +57,7 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS) set(KDCRAW_FOUND TRUE) mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS) - else(KDCRAW_LOCAL_FOUND) + else() message(STATUS "Check Kdcraw library using pkg-config...") if (NOT WIN32) @@ -119,6 +119,6 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS) mark_as_advanced(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES KDCRAW_DEFINITIONS) - endif(KDCRAW_LOCAL_FOUND) + endif() endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES AND KDCRAW_DEFINITIONS) diff --git a/attic/modules/FindKexiv2.cmake b/attic/modules/FindKexiv2.cmake index 4487537c..3fdc6c15 100644 --- a/attic/modules/FindKexiv2.cmake +++ b/attic/modules/FindKexiv2.cmake @@ -56,7 +56,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES AND KEXIV2_DEFINITIONS) set(KEXIV2_FOUND TRUE) mark_as_advanced(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES KEXIV2_DEFINITIONS) - else(KEXIV2_LOCAL_FOUND) + else() if(NOT WIN32) message(STATUS "Check Kexiv2 library using pkg-config...") @@ -72,18 +72,18 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES AND KEXIV2_DEFINITIONS) if(_return_VALUE STREQUAL "0") message(STATUS "Found libkexiv2 release >= 0.2.0") set(KEXIV2_VERSION_GOOD_FOUND TRUE) - else(_return_VALUE STREQUAL "0") + else() message(STATUS "Found libkexiv2 release < 0.2.0, too old") set(KEXIV2_VERSION_GOOD_FOUND FALSE) set(KEXIV2_FOUND FALSE) - endif(_return_VALUE STREQUAL "0") - else(_KEXIV2LinkFlags) + endif() + else() set(KEXIV2_VERSION_GOOD_FOUND FALSE) set(KEXIV2_FOUND FALSE) - endif(_KEXIV2LinkFlags) - else(NOT WIN32) + endif() + else() set(KEXIV2_VERSION_GOOD_FOUND TRUE) - endif(NOT WIN32) + endif() if(KEXIV2_VERSION_GOOD_FOUND) set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") @@ -100,7 +100,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES AND KEXIV2_DEFINITIONS) if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) set(KEXIV2_FOUND TRUE) endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) - endif(KEXIV2_VERSION_GOOD_FOUND) + endif() if (KEXIV2_FOUND) if (NOT Kexiv2_FIND_QUIETLY) message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") @@ -118,6 +118,6 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES AND KEXIV2_DEFINITIONS) mark_as_advanced(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES KEXIV2_DEFINITIONS) - endif(KEXIV2_LOCAL_FOUND) + endif() endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES AND KEXIV2_DEFINITIONS) diff --git a/attic/modules/FindKopete.cmake b/attic/modules/FindKopete.cmake index cf65b5a1..0bb98ee8 100644 --- a/attic/modules/FindKopete.cmake +++ b/attic/modules/FindKopete.cmake @@ -15,7 +15,7 @@ if(KOPETE_INCLUDE_DIR AND KOPETE_LIBRARIES) # read from cache set(Kopete_FOUND TRUE) -else(KOPETE_INCLUDE_DIR AND KOPETE_LIBRARIES) +else() FIND_PATH(KOPETE_INCLUDE_DIR NAMES @@ -34,7 +34,7 @@ else(KOPETE_INCLUDE_DIR AND KOPETE_LIBRARIES) ) if(KOPETE_INCLUDE_DIR AND KOPETE_LIBRARIES) set(Kopete_FOUND TRUE) - endif(KOPETE_INCLUDE_DIR AND KOPETE_LIBRARIES) + endif() if(MSVC) FIND_LIBRARY(KOPETE_LIBRARIES_DEBUG @@ -46,42 +46,42 @@ else(KOPETE_INCLUDE_DIR AND KOPETE_LIBRARIES) ) if(NOT KOPETE_LIBRARIES_DEBUG) set(Kopete_FOUND FALSE) - endif(NOT KOPETE_LIBRARIES_DEBUG) + endif() if(MSVC_IDE) if( NOT KOPETE_LIBRARIES_DEBUG OR NOT KOPETE_LIBRARIES) message(FATAL_ERROR "\nCould NOT find the debug AND release version of the Kopete library.\nYou need to have both to use MSVC projects.\nPlease build and install both kopete libraries first.\n") - endif( NOT KOPETE_LIBRARIES_DEBUG OR NOT KOPETE_LIBRARIES) - else(MSVC_IDE) + endif() + else() string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) set(KOPETE_LIBRARIES ${KOPETE_LIBRARIES_DEBUG}) - else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + else() set(KOPETE_LIBRARIES ${KOPETE_LIBRARIES}) - endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - endif(MSVC_IDE) - endif(MSVC) + endif() + endif() + endif() if(Kopete_FOUND) if(NOT Kopete_FIND_QUIETLY) message(STATUS "Found Kopete: ${KOPETE_LIBRARIES}") - endif(NOT Kopete_FIND_QUIETLY) - else(Kopete_FOUND) + endif() + else() if(Kopete_FIND_REQUIRED) if(NOT KOPETE_INCLUDE_DIR) message(FATAL_ERROR "Could not find Kopete includes.") - endif(NOT KOPETE_INCLUDE_DIR) + endif() if(NOT KOPETE_LIBRARIES) message(FATAL_ERROR "Could not find Kopete library.") - endif(NOT KOPETE_LIBRARIES) - else(Kopete_FIND_REQUIRED) + endif() + else() if(NOT KOPETE_INCLUDE_DIR) message(STATUS "Could not find Kopete includes.") - endif(NOT KOPETE_INCLUDE_DIR) + endif() if(NOT KOPETE_LIBRARIES) message(STATUS "Could not find Kopete library.") - endif(NOT KOPETE_LIBRARIES) - endif(Kopete_FIND_REQUIRED) - endif(Kopete_FOUND) + endif() + endif() + endif() -endif(KOPETE_INCLUDE_DIR AND KOPETE_LIBRARIES) +endif() diff --git a/attic/modules/FindLCMS.cmake b/attic/modules/FindLCMS.cmake index abc9ece3..ba8890f8 100644 --- a/attic/modules/FindLCMS.cmake +++ b/attic/modules/FindLCMS.cmake @@ -23,7 +23,7 @@ if(NOT WIN32) find_package(PkgConfig) pkg_check_modules(PC_LCMS lcms) set(LCMS_DEFINITIONS ${PC_LCMS_CFLAGS_OTHER}) -endif(NOT WIN32) +endif() find_path(LCMS_INCLUDE_DIR lcms.h HINTS @@ -47,10 +47,10 @@ if(LCMS_INCLUDE_DIR AND NOT LCMS_VERSION) string(REGEX REPLACE "#define LCMS_VERSION[ ]*([0-9]*)\n" "\\1" _LCMS_VERSION ${LCMS_VERSION_MATCH}) string(SUBSTRING ${_LCMS_VERSION} 0 1 LCMS_MAJOR_VERSION) string(SUBSTRING ${_LCMS_VERSION} 1 2 LCMS_MINOR_VERSION) - endif(LCMS_VERSION_MATCH) + endif() set(LCMS_VERSION "${LCMS_MAJOR_VERSION}${LCMS_MINOR_VERSION}" CACHE STRING "Version number of lcms" FORCE) set(LCMS_DOT_VERSION "${LCMS_MAJOR_VERSION}.${LCMS_MINOR_VERSION}" CACHE STRING "Version number of lcms split into components" FORCE) -endif(LCMS_INCLUDE_DIR AND NOT LCMS_VERSION) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LCMS REQUIRED_VARS LCMS_LIBRARIES LCMS_INCLUDE_DIR diff --git a/attic/modules/FindLibintl.cmake b/attic/modules/FindLibintl.cmake index 52ae6479..c7cbc969 100644 --- a/attic/modules/FindLibintl.cmake +++ b/attic/modules/FindLibintl.cmake @@ -18,7 +18,7 @@ if(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND) set(Libintl_FIND_QUIETLY TRUE) -endif(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND) +endif() find_path(LIBINTL_INCLUDE_DIR libintl.h) @@ -35,10 +35,10 @@ if(LIBINTL_INCLUDE_DIR) find_library(LIBINTL_LIBRARIES NAMES intl libintl ) if(LIBINTL_LIBRARIES) set(LIBINTL_LIB_FOUND TRUE) - endif(LIBINTL_LIBRARIES) + endif() endif (LIBINTL_LIBC_HAS_DGETTEXT) -endif(LIBINTL_INCLUDE_DIR) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libintl DEFAULT_MSG LIBINTL_INCLUDE_DIR LIBINTL_LIB_FOUND) diff --git a/attic/modules/FindMusicBrainz.cmake b/attic/modules/FindMusicBrainz.cmake index c93b2dcc..92d14f09 100644 --- a/attic/modules/FindMusicBrainz.cmake +++ b/attic/modules/FindMusicBrainz.cmake @@ -12,7 +12,7 @@ if(MUSICBRAINZ_INCLUDE_DIR AND MUSICBRAINZ_LIBRARIES) set(MUSICBRAINZ_FIND_QUIETLY TRUE) -endif(MUSICBRAINZ_INCLUDE_DIR AND MUSICBRAINZ_LIBRARIES) +endif() FIND_PATH(MUSICBRAINZ_INCLUDE_DIR musicbrainz/musicbrainz.h) @@ -22,7 +22,7 @@ FIND_LIBRARY( MUSICBRAINZ_LIBRARIES NAMES musicbrainz) FIND_PATH(MUSICBRAINZ3_INCLUDE_DIR musicbrainz3/musicbrainz.h) if(MUSICBRAINZ3_INCLUDE_DIR AND NOT MUSICBRAINZ_INCLUDE_DIR) message(STATUS "\nIncompatible version 3.x of the musicbrainz includes detected. Version 2.x is needed.\n") -endif(MUSICBRAINZ3_INCLUDE_DIR AND NOT MUSICBRAINZ_INCLUDE_DIR) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args( MusicBrainz DEFAULT_MSG diff --git a/attic/modules/FindMySQL.cmake b/attic/modules/FindMySQL.cmake index 39128666..c0ef8792 100644 --- a/attic/modules/FindMySQL.cmake +++ b/attic/modules/FindMySQL.cmake @@ -25,7 +25,7 @@ if(WIN32) $ENV{ProgramFiles}/MySQL/*/include $ENV{SystemDrive}/MySQL/*/include ) -else(WIN32) +else() find_path(MYSQL_INCLUDE_DIR mysql.h PATHS $ENV{MYSQL_INCLUDE_DIR} @@ -35,7 +35,7 @@ else(WIN32) PATH_SUFFIXES mysql ) -endif(WIN32) +endif() if(WIN32) string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) @@ -46,11 +46,11 @@ if(WIN32) if(CMAKE_BUILD_TYPE_TOLOWER MATCHES "debug") set(binary_dist debug) set(build_dist Debug) - else(CMAKE_BUILD_TYPE_TOLOWER MATCHES "debug") + else() ADD_DEFINITIONS(-DDBUG_OFF) set(binary_dist opt) set(build_dist Release) - endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES "debug") + endif() # find_library(MYSQL_LIBRARIES NAMES mysqlclient find_library(MYSQL_LIBRARIES NAMES libmysql @@ -61,7 +61,7 @@ if(WIN32) $ENV{ProgramFiles}/MySQL/*/lib/${binary_dist} $ENV{SystemDrive}/MySQL/*/lib/${binary_dist} ) -else(WIN32) +else() # find_library(MYSQL_LIBRARIES NAMES mysqlclient find_library(MYSQL_LIBRARIES NAMES libmysql PATHS @@ -73,7 +73,7 @@ else(WIN32) PATH_SUFFIXES mysql ) -endif(WIN32) +endif() if(WIN32) set(MYSQL_LIB_PATHS @@ -86,7 +86,7 @@ if(WIN32) PATHS ${MYSQL_LIB_PATHS} ) -else(WIN32) +else() set(MYSQL_LIB_PATHS $ENV{MYSQL_DIR}/libmysql_r/.libs $ENV{MYSQL_DIR}/lib @@ -100,7 +100,7 @@ else(WIN32) PATHS ${MYSQL_LIB_PATHS} ) -endif(WIN32) +endif() find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld PATHS @@ -109,11 +109,11 @@ find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld if(MYSQL_LIBRARIES) get_filename_component(MYSQL_LIB_DIR ${MYSQL_LIBRARIES} PATH) -endif(MYSQL_LIBRARIES) +endif() if(MYSQL_EMBEDDED_LIBRARIES) get_filename_component(MYSQL_EMBEDDED_LIB_DIR ${MYSQL_EMBEDDED_LIBRARIES} PATH) -endif(MYSQL_EMBEDDED_LIBRARIES) +endif() macro_push_required_vars() set( CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR} ) @@ -124,17 +124,17 @@ macro_pop_required_vars() if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) set(MYSQL_FOUND TRUE) message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}") -else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) +else() set(MYSQL_FOUND FALSE) message(STATUS "MySQL not found.") -endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) +endif() if(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_EMBEDDED_CONNECTION) set(MYSQL_EMBEDDED_FOUND TRUE) message(STATUS "Found MySQL Embedded: ${MYSQL_INCLUDE_DIR}, ${MYSQL_EMBEDDED_LIBRARIES}") -else(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_EMBEDDED_CONNECTION) +else() set(MYSQL_EMBEDDED_FOUND FALSE) message(STATUS "MySQL Embedded not found.") -endif(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_EMBEDDED_CONNECTION) +endif() mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES MYSQL_EMBEDDED_LIBRARIES) diff --git a/attic/modules/FindNepomuk.cmake b/attic/modules/FindNepomuk.cmake index dccc790c..3b097341 100644 --- a/attic/modules/FindNepomuk.cmake +++ b/attic/modules/FindNepomuk.cmake @@ -81,14 +81,14 @@ find_package_handle_standard_args(Nepomuk DEFAULT_MSG Soprano_FOUND SOPRANO_PLUGIN_RAPTORPARSER_FOUND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND SHAREDDESKTOPONTOLOGIES_FOUND ) -else(NOT WINCE) +else() #FIXME: There are no backends at this time find_package_handle_standard_args(Nepomuk DEFAULT_MSG NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR NEPOMUK_ADDONTOLOGYCLASSES_FILE Soprano_FOUND SHAREDDESKTOPONTOLOGIES_FOUND ) -endif(NOT WINCE) +endif() #to retain backward compatibility set (Nepomuk_FOUND ${NEPOMUK_FOUND}) diff --git a/attic/modules/FindPhonon.cmake b/attic/modules/FindPhonon.cmake index cd9e5cb4..197f47ff 100644 --- a/attic/modules/FindPhonon.cmake +++ b/attic/modules/FindPhonon.cmake @@ -29,7 +29,7 @@ if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY}) set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}) _phonon_find_version() -endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Phonon DEFAULT_MSG PHONON_INCLUDE_DIR PHONON_LIBRARY) diff --git a/attic/modules/FindPolkitQt.cmake b/attic/modules/FindPolkitQt.cmake index 3f9db5a0..21285f79 100644 --- a/attic/modules/FindPolkitQt.cmake +++ b/attic/modules/FindPolkitQt.cmake @@ -25,12 +25,12 @@ # Support POLKITQT_MIN_VERSION for compatibility: if(NOT PolkitQt_FIND_VERSION) set(PolkitQt_FIND_VERSION "${POLKITQT_MIN_VERSION}") -endif(NOT PolkitQt_FIND_VERSION) +endif() # the minimum version of PolkitQt we require if(NOT PolkitQt_FIND_VERSION) set(PolkitQt_FIND_VERSION "0.9.3") -endif(NOT PolkitQt_FIND_VERSION) +endif() if (NOT WIN32) # use pkg-config to get the directories and then use these values @@ -56,9 +56,9 @@ if(POLKITQT_VERSION_FILE AND NOT POLKITQT_VERSION) if(POLKITQT_VERSION_MATCH) string(REGEX REPLACE "POLKITQT_VERSION_STRING \"(.*)\"\n" "\\1" _POLKITQT_VERSION ${POLKITQT_VERSION_MATCH}) - endif(POLKITQT_VERSION_MATCH) + endif() set(POLKITQT_VERSION "${_POLKITQT_VERSION}" CACHE STRING "Version number of PolkitQt" FORCE) -endif(POLKITQT_VERSION_FILE AND NOT POLKITQT_VERSION) +endif() find_library( POLKITQT_CORE_LIBRARY NAMES polkit-qt-core @@ -90,5 +90,5 @@ if(POLKITQT_FOUND) message("WARNING: Installation prefix does not match PolicyKit install prefixes. You probably will need to move files installed " "in ${CMAKE_INSTALL_PREFIX}/${POLKITQT_POLICY_FILES_INSTALL_DIR} and by dbus_add_activation_system_service to the ${_POLKITQT_INSTALL_PREFIX}/${POLKITQT_POLICY_FILES_INSTALL_DIR} prefix") endif (NOT _POLKITQT_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) -endif(POLKITQT_FOUND) +endif() diff --git a/attic/modules/FindPulseAudio.cmake b/attic/modules/FindPulseAudio.cmake index 35bcbc2f..b04d1742 100644 --- a/attic/modules/FindPulseAudio.cmake +++ b/attic/modules/FindPulseAudio.cmake @@ -19,12 +19,12 @@ # Support PULSEAUDIO_MINIMUM_VERSION for compatibility: if(NOT PulseAudio_FIND_VERSION) set(PulseAudio_FIND_VERSION "${PULSEAUDIO_MINIMUM_VERSION}") -endif(NOT PulseAudio_FIND_VERSION) +endif() # the minimum version of PulseAudio we require if(NOT PulseAudio_FIND_VERSION) set(PulseAudio_FIND_VERSION "0.9.9") -endif(NOT PulseAudio_FIND_VERSION) +endif() if (NOT WIN32) include(FindPkgConfig) diff --git a/attic/modules/FindPyKDE4.cmake b/attic/modules/FindPyKDE4.cmake index 3b879636..b062912e 100644 --- a/attic/modules/FindPyKDE4.cmake +++ b/attic/modules/FindPyKDE4.cmake @@ -157,7 +157,7 @@ ENDMACRO(PYKDE4_INSTALL_PYTHON_FILES) MACRO(PYKDE4_ADD_EXECUTABLE _pyname _exename) if(NOT PROJECT_NAME) MESSAGE(STATUS "Project name is necessary to create symlink against python program!!! It will fail.") - endif(NOT PROJECT_NAME) + endif() if(WIN32) # we generate a batch file instead of a symlink. A windows link would only # work if the file extension .py is associated with python - but that is @@ -177,8 +177,8 @@ MACRO(PYKDE4_ADD_EXECUTABLE _pyname _exename) FILE(WRITE ${abs_link_name} "rem this file has been generated by PYKDE4_ADD_EXECUTABLE\n") FILE(APPEND ${abs_link_name} "python ${rel_target}\n") INSTALL(PROGRAMS ${LINK_NAME} DESTINATION $ENV{DESTDIR}/${BIN_INSTALL_DIR}) - else(WIN32) + else() INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${DATA_INSTALL_DIR}/${PROJECT_NAME}/${_pyname} -DLINK_NAME=${BIN_INSTALL_DIR}/${_exename} -P ${current_module_dir}/create_exe_symlink.cmake)" ) - endif(WIN32) + endif() ENDMACRO(PYKDE4_ADD_EXECUTABLE) diff --git a/attic/modules/FindPythonLibrary.cmake b/attic/modules/FindPythonLibrary.cmake index 60567e29..bb02c1bb 100644 --- a/attic/modules/FindPythonLibrary.cmake +++ b/attic/modules/FindPythonLibrary.cmake @@ -34,7 +34,7 @@ include(CMakeFindFrameworks) if(EXISTS PYTHON_LIBRARY) # Already in cache, be silent set(PYTHONLIBRARY_FOUND TRUE) -else(EXISTS PYTHON_LIBRARY) +else() find_package(PythonInterp) @@ -44,7 +44,7 @@ else(EXISTS PYTHON_LIBRARY) get_filename_component( _py_cmake_module_dir ${CMAKE_CURRENT_LIST_FILE} PATH) if(NOT EXISTS "${_py_cmake_module_dir}/FindLibPython.py") message(FATAL_ERROR "The file FindLibPython.py does not exist in ${_py_cmake_module_dir} (the directory where FindPythonLibrary.cmake is located). Check your installation.") - endif(NOT EXISTS "${_py_cmake_module_dir}/FindLibPython.py") + endif() execute_process(COMMAND ${PYTHON_EXECUTABLE} "${_py_cmake_module_dir}/FindLibPython.py" OUTPUT_VARIABLE python_config) if(python_config) @@ -66,10 +66,10 @@ else(EXISTS PYTHON_LIBRARY) set(PYTHON_LIBRARY_NAMES python${PYTHON_SHORT_VERSION} python${PYTHON_SHORT_VERSION_NO_DOT}) if(WIN32) string(REPLACE "\\" "/" PYTHON_SITE_PACKAGES_DIR ${PYTHON_SITE_PACKAGES_DIR}) - endif(WIN32) + endif() find_library(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES} PATHS ${PYTHON_PREFIX}/lib ${PYTHON_PREFIX}/libs NO_DEFAULT_PATH) set(PYTHONLIBRARY_FOUND TRUE) - endif(python_config) + endif() # adapted from cmake's builtin FindPythonLibs if(APPLE) @@ -81,14 +81,14 @@ else(EXISTS PYTHON_LIBRARY) if("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework") set(PYTHON_LIBRARY "") set(PYTHON_DEBUG_LIBRARY "") - endif("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework") + endif() if(NOT PYTHON_LIBRARY) set (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE) - endif(NOT PYTHON_LIBRARY) + endif() set(PYTHONLIBRARY_FOUND TRUE) - endif(Python_FRAMEWORKS) - endif(APPLE) - endif(PYTHONINTERP_FOUND) + endif() + endif() + endif() if(PYTHONLIBRARY_FOUND) set(PYTHON_LIBRARIES ${PYTHON_LIBRARY}) @@ -96,11 +96,11 @@ else(EXISTS PYTHON_LIBRARY) message(STATUS "Found Python executable: ${PYTHON_EXECUTABLE}") message(STATUS "Found Python version: ${PYTHON_LONG_VERSION}") message(STATUS "Found Python library: ${PYTHON_LIBRARY}") - endif(NOT PYTHONLIBRARY_FIND_QUIETLY) - else(PYTHONLIBRARY_FOUND) + endif() + else() if(PYTHONLIBRARY_FIND_REQUIRED) message(FATAL_ERROR "Could not find Python") - endif(PYTHONLIBRARY_FIND_REQUIRED) - endif(PYTHONLIBRARY_FOUND) + endif() + endif() endif (EXISTS PYTHON_LIBRARY) diff --git a/attic/modules/FindQt4.cmake b/attic/modules/FindQt4.cmake index f482d3c7..f501f358 100644 --- a/attic/modules/FindQt4.cmake +++ b/attic/modules/FindQt4.cmake @@ -383,7 +383,7 @@ function(_QT4_QUERY_QMAKE VAR RESULT) if(NOT return_code) file(TO_CMAKE_PATH "${output}" output) set(${RESULT} ${output} PARENT_SCOPE) - endif(NOT return_code) + endif() endfunction(_QT4_QUERY_QMAKE) @@ -638,7 +638,7 @@ IF (QT4_QMAKE_FOUND) NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) mark_as_advanced(QT_IMPORTS_DIR) - endif(qt_imports_dir) + endif() ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) # Make variables changeble to the advanced user @@ -1108,7 +1108,7 @@ if(NOT WINCE) PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH ) -else(NOT WINCE) +else() FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE NAMES qdbuscpp2xml PATHS ${HOST_BINDIR} @@ -1120,7 +1120,7 @@ else(NOT WINCE) PATHS ${HOST_BINDIR} NO_DEFAULT_PATH ) -endif(NOT WINCE) +endif() FIND_PROGRAM(QT_LUPDATE_EXECUTABLE NAMES lupdate-qt4 lupdate diff --git a/attic/modules/FindSamba.cmake b/attic/modules/FindSamba.cmake index 16522c64..92746fd5 100644 --- a/attic/modules/FindSamba.cmake +++ b/attic/modules/FindSamba.cmake @@ -15,7 +15,7 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES) # Already in cache, be silent set(Samba_FIND_QUIETLY TRUE) -endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES) +endif() find_path(SAMBA_INCLUDE_DIR NAMES libsmbclient.h ) @@ -42,21 +42,21 @@ if(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES) set(SAMBA_FOUND FALSE) endif (SAMBA_REQUIRE_SMBC_OPTION_SET AND NOT SAMBA_HAVE_SMBC_OPTION_SET) -else(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES) +else() set(SAMBA_FOUND FALSE) set(SAMBA_HAVE_SMBC_SET_CONTEXT FALSE) -endif(SAMBA_INCLUDE_DIR AND SAMBA_LIBRARIES) +endif() if(SAMBA_FOUND) if(NOT Samba_FIND_QUIETLY) message(STATUS "Found samba: ${SAMBA_LIBRARIES}") - endif(NOT Samba_FIND_QUIETLY) -else(SAMBA_FOUND) + endif() +else() if (Samba_FIND_REQUIRED) message(FATAL_ERROR "Could not find Samba library") endif (Samba_FIND_REQUIRED) -endif(SAMBA_FOUND) +endif() mark_as_advanced(SAMBA_INCLUDE_DIR SAMBA_LIBRARIES) diff --git a/attic/modules/FindSharedDesktopOntologies.cmake b/attic/modules/FindSharedDesktopOntologies.cmake index 99b70362..b60f8e97 100644 --- a/attic/modules/FindSharedDesktopOntologies.cmake +++ b/attic/modules/FindSharedDesktopOntologies.cmake @@ -26,11 +26,11 @@ # the 2.6.3 compatible location only ( share/cmake/SDO/ instead share/SDO/[cmake/] ) if( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.6.3") find_path(_SDO_CONFIG_DIR SharedDesktopOntologiesConfig.cmake PATH_SUFFIXES share/cmake/SharedDesktopOntologies/ ) -endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.6.3") +endif() if(NOT SharedDesktopOntologies_FIND_VERSION) set(SharedDesktopOntologies_FIND_VERSION "${SDO_MIN_VERSION}") -endif(NOT SharedDesktopOntologies_FIND_VERSION) +endif() find_package(SharedDesktopOntologies ${SharedDesktopOntologies_FIND_VERSION} QUIET NO_MODULE HINTS "${_SDO_CONFIG_DIR}" ) diff --git a/attic/modules/FindSqlite.cmake b/attic/modules/FindSqlite.cmake index c4f2e90a..ed8d4ea1 100644 --- a/attic/modules/FindSqlite.cmake +++ b/attic/modules/FindSqlite.cmake @@ -28,7 +28,7 @@ if( NOT WIN32 ) pkg_check_modules(PC_SQLITE QUIET sqlite3) set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER}) -endif( NOT WIN32 ) +endif() find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h PATHS diff --git a/attic/modules/FindStrigi.cmake b/attic/modules/FindStrigi.cmake index 239f9c97..214894c1 100644 --- a/attic/modules/FindStrigi.cmake +++ b/attic/modules/FindStrigi.cmake @@ -16,7 +16,7 @@ if(NOT STRIGI_MIN_VERSION) set(STRIGI_MIN_VERSION "0.5.9") -endif(NOT STRIGI_MIN_VERSION) +endif() file(TO_CMAKE_PATH "$ENV{STRIGI_HOME}" strigi_home) @@ -35,30 +35,30 @@ if (STRIGI_CONFIG_FOUND_AND_HAS_COMPLETE_INFORMATION) if(STRIGI_VERSION VERSION_LESS ${STRIGI_MIN_VERSION}) set(_strigiErrorMessage "Strigi version ${STRIGI_VERSION} found, but at least version ${STRIGI_MIN_VERSION} is required") set(STRIGI_VERSION_OK FALSE) - endif(STRIGI_VERSION VERSION_LESS ${STRIGI_MIN_VERSION}) + endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Strigi "${_strigiErrorMessage}" STRIGI_STREAMS_LIBRARY STRIGI_STREAMANALYZER_LIBRARY STRIGI_INCLUDE_DIR STRIGI_VERSION_OK) -else(STRIGI_CONFIG_FOUND_AND_HAS_COMPLETE_INFORMATION) +else() # this else() branch is for finding strigi versions before November 16th, 2008. Alex include(FindLibraryWithDebug) include(MacroPushRequiredVars) if (WIN32) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR) - endif(WIN32) + endif() if (NOT WIN32) if(NOT strigi_home) find_package(PkgConfig) if(PKG_CONFIG_EXECUTABLE) pkg_check_modules(STRIGI QUIET libstreamanalyzer>=${STRIGI_MIN_VERSION}) - endif(PKG_CONFIG_EXECUTABLE) - endif(NOT strigi_home) - endif(NOT WIN32) + endif() + endif() + endif() if (NOT STRIGI_INCLUDEDIR) find_path(STRIGI_INCLUDE_DIR strigi/streamanalyzer.h @@ -124,11 +124,11 @@ if(WIN32) elseif(MINGW) set(STRIGI_LINE_ANALYZER_PREFIX mingw_strigila_) set(STRIGI_THROUGH_ANALYZER_PREFIX mingw_strigita_) - endif(MSVC) -else(WIN32) + endif() +else() set(STRIGI_LINE_ANALYZER_PREFIX strigila_) set(STRIGI_THROUGH_ANALYZER_PREFIX strigita_) -endif(WIN32) +endif() mark_as_advanced( STRIGI_INCLUDE_DIR diff --git a/attic/modules/FindTaglib.cmake b/attic/modules/FindTaglib.cmake index 5bbb8ee1..4b58bf6c 100644 --- a/attic/modules/FindTaglib.cmake +++ b/attic/modules/FindTaglib.cmake @@ -12,13 +12,13 @@ if(NOT TAGLIB_MIN_VERSION) set(TAGLIB_MIN_VERSION "1.4") -endif(NOT TAGLIB_MIN_VERSION) +endif() if(NOT WIN32) find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS ${BIN_INSTALL_DIR} ) -endif(NOT WIN32) +endif() #reset vars set(TAGLIB_LIBRARIES) @@ -32,7 +32,7 @@ if(TAGLIBCONFIG_EXECUTABLE) if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") set(TAGLIB_FOUND FALSE) - else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + else() exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) @@ -41,12 +41,12 @@ if(TAGLIBCONFIG_EXECUTABLE) if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) set(TAGLIB_FOUND TRUE) message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") - endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + endif() string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") - endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + endif() mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) -else(TAGLIBCONFIG_EXECUTABLE) +else() include(FindLibraryWithDebug) include(FindPackageHandleStandardArgs) @@ -70,16 +70,16 @@ else(TAGLIBCONFIG_EXECUTABLE) find_package_handle_standard_args(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES) -endif(TAGLIBCONFIG_EXECUTABLE) +endif() if(TAGLIB_FOUND) if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") - endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) -else(TAGLIB_FOUND) + endif() +else() if(Taglib_FIND_REQUIRED) message(FATAL_ERROR "Could not find Taglib") - endif(Taglib_FIND_REQUIRED) -endif(TAGLIB_FOUND) + endif() +endif() diff --git a/attic/modules/FindUSB.cmake b/attic/modules/FindUSB.cmake index f0178a3c..73b54a8e 100644 --- a/attic/modules/FindUSB.cmake +++ b/attic/modules/FindUSB.cmake @@ -16,7 +16,7 @@ if (NOT WIN32) # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) pkg_check_modules(PC_LIBUSB QUIET libusb) -endif(NOT WIN32) +endif() find_path(LIBUSB_INCLUDE_DIR usb.h HINTS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) diff --git a/attic/modules/FindWcecompat.cmake b/attic/modules/FindWcecompat.cmake index f3c26c31..acba2dd4 100644 --- a/attic/modules/FindWcecompat.cmake +++ b/attic/modules/FindWcecompat.cmake @@ -18,8 +18,8 @@ if(WCECOMPAT_INCLUDE_DIR) if(WCECOMPAT_LIBRARIES) set(WCECOMPAT_LIB_FOUND TRUE) - endif(WCECOMPAT_LIBRARIES) -endif(WCECOMPAT_INCLUDE_DIR) + endif() +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Wcecompat DEFAULT_MSG WCECOMPAT_LIBRARIES WCECOMPAT_LIB_FOUND) diff --git a/attic/modules/FindXine.cmake b/attic/modules/FindXine.cmake index 4ad0c2a8..de296798 100644 --- a/attic/modules/FindXine.cmake +++ b/attic/modules/FindXine.cmake @@ -46,7 +46,7 @@ if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 set(XINE_VERSION_OK TRUE) string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) - endif("${XINE_VERSION}" VERSION_GREATER "1.1.0") + endif() endif (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) @@ -56,7 +56,7 @@ if( XINE_VERSION_OK) set(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARY}) check_c_source_compiles("#include <xine.h>\nint main()\n{\n xine_open_video_driver(xine_new(), \"auto\", XINE_VISUAL_TYPE_XCB, NULL);\n return 0;\n}\n" XINE_XCB_FOUND) set(XINE_FOUND TRUE) -endif(XINE_VERSION_OK) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Xine "Could NOT find XINE 1.1.1 or greater" XINE_INCLUDE_DIR XINE_LIBRARY XINECONFIG_EXECUTABLE XINE_VERSION_OK) diff --git a/attic/modules/FindXmms.cmake b/attic/modules/FindXmms.cmake index 9f2cdf26..b687d120 100644 --- a/attic/modules/FindXmms.cmake +++ b/attic/modules/FindXmms.cmake @@ -23,7 +23,7 @@ else (XMMS_INCLUDE_DIRS AND XMMS_LIBRARIES) find_package(PkgConfig) pkg_check_modules(PC_XMMS QUIET xmms) - endif(NOT WIN32) + endif() find_path(XMMS_INCLUDE_DIRS xmmsctrl.h PATHS ${PC_XMMS_INCLUDEDIR} ${PC_XMMS_INCLUDE_DIRS} diff --git a/attic/modules/MacroAppendIf.cmake b/attic/modules/MacroAppendIf.cmake index 86fe014a..90f26aff 100644 --- a/attic/modules/MacroAppendIf.cmake +++ b/attic/modules/MacroAppendIf.cmake @@ -18,5 +18,5 @@ macro(macro_append_if _cond _list) if(${_cond}) list(APPEND ${_list} ${ARGN}) - endif(${_cond}) + endif() endmacro(macro_append_if _cond _list) diff --git a/attic/modules/NepomukAddOntologyClasses.cmake b/attic/modules/NepomukAddOntologyClasses.cmake index a2bdd5bb..ad336a24 100644 --- a/attic/modules/NepomukAddOntologyClasses.cmake +++ b/attic/modules/NepomukAddOntologyClasses.cmake @@ -39,30 +39,30 @@ macro(NEPOMUK_ADD_ONTOLOGY_CLASSES _sources) set(_current_arg_type "class") elseif(${_arg} STREQUAL "FAST") set(_fastmode "--fast") - else(${_arg} STREQUAL "ONTOLOGIES") + else() if(${_current_arg_type} STREQUAL "onto") list(APPEND _ontologies ${_arg}) get_filename_component(_filename ${_arg} NAME) list(APPEND _ontofilenames ${_filename}) elseif(${_current_arg_type} STREQUAL "class") list(APPEND _classes "--class" "${_arg}") - else(${_current_arg_type} STREQUAL "onto") + else() set(_visibility "--visibility" "${_arg}") - endif(${_current_arg_type} STREQUAL "onto") - endif(${_arg} STREQUAL "ONTOLOGIES") + endif() + endif() endforeach(_arg) # find our helper program (first in the install dir, then everywhere) if(NOT WINCE) find_program(RCGEN nepomuk-rcgen PATHS ${KDE4_BIN_INSTALL_DIR} ${BIN_INSTALL_DIR} NO_DEFAULT_PATH) find_program(RCGEN nepomuk-rcgen) - else(NOT WINCE) + else() find_program(RCGEN nepomuk-rcgen PATHS ${HOST_BINDIR} NO_DEFAULT_PATH) - endif(NOT WINCE) + endif() if(NOT RCGEN) message(SEND_ERROR "Failed to find the Nepomuk source generator" ) - else(NOT RCGEN) + else() file(TO_NATIVE_PATH ${RCGEN} RCGEN) # we generate the files in the current binary dir @@ -76,7 +76,7 @@ macro(NEPOMUK_ADD_ONTOLOGY_CLASSES _sources) ) if(NOT ${rcgen_result} EQUAL 0) message(SEND_ERROR "Running ${RCGEN} to generate list of headers failed with error code ${rcgen_result}") - endif(NOT ${rcgen_result} EQUAL 0) + endif() execute_process( COMMAND ${RCGEN} ${_fastmode} --listsources --prefix ${_targetdir}/ ${_classes} ${_visibility} ${_ontologies} @@ -85,7 +85,7 @@ macro(NEPOMUK_ADD_ONTOLOGY_CLASSES _sources) ) if(NOT ${rcgen_result} EQUAL 0) message(SEND_ERROR "Running ${RCGEN} to generate list of sources failed with error code ${rcgen_result}") - endif(NOT ${rcgen_result} EQUAL 0) + endif() add_custom_command(OUTPUT ${_out_headers} ${_out_sources} COMMAND ${RCGEN} ${_fastmode} --writeall --target ${_targetdir}/ ${_classes} ${_visibility} ${_ontologies} @@ -98,7 +98,7 @@ macro(NEPOMUK_ADD_ONTOLOGY_CLASSES _sources) # finally append the source files to the source list list(APPEND ${_sources} ${_out_sources}) - endif(NOT RCGEN) + endif() # reset variable names used unset(_current_arg_type) diff --git a/attic/modules/NepomukMacros.cmake b/attic/modules/NepomukMacros.cmake index 14acd2bb..ef68fc59 100644 --- a/attic/modules/NepomukMacros.cmake +++ b/attic/modules/NepomukMacros.cmake @@ -27,7 +27,7 @@ macro(NEPOMUK_GENERATE_FROM_ONTOLOGY ontofile targetdir out_headers out_sources message(STATUS "Failed to find the Nepomuk source generator" ) - else(NOT RCGEN) + else() FILE(TO_NATIVE_PATH ${RCGEN} RCGEN) @@ -56,12 +56,12 @@ macro(NEPOMUK_GENERATE_FROM_ONTOLOGY ontofile targetdir out_headers out_sources set(NEPOMUK_RESOURCES_GENERATED true) - else(${rcgen_result} EQUAL 0) + else() message(STATUS "Failed to generate Nepomuk resource classes.") - endif(${rcgen_result} EQUAL 0) + endif() - endif(NOT RCGEN) + endif() endmacro(NEPOMUK_GENERATE_FROM_ONTOLOGY) diff --git a/attic/modules/PythonMacros.cmake b/attic/modules/PythonMacros.cmake index 4ae5a3c7..0abaccbd 100644 --- a/attic/modules/PythonMacros.cmake +++ b/attic/modules/PythonMacros.cmake @@ -31,7 +31,7 @@ MACRO(PYTHON_INSTALL SOURCE_FILE DESINATION_DIR) if(WIN32) string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}") - endif(WIN32) + endif() SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename}) SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc) diff --git a/attic/modules/SIPMacros.cmake b/attic/modules/SIPMacros.cmake index 28c1cf4c..7c5476ef 100644 --- a/attic/modules/SIPMacros.cmake +++ b/attic/modules/SIPMacros.cmake @@ -53,9 +53,9 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) if(_module_path STREQUAL "") set(CMAKE_CURRENT_SIP_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}") - else(_module_path STREQUAL "") + else() set(CMAKE_CURRENT_SIP_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${_module_path}") - endif(_module_path STREQUAL "") + endif() GET_FILENAME_COMPONENT(_abs_module_sip ${MODULE_SIP} ABSOLUTE) diff --git a/attic/modules/check_installed_exports_file.cmake b/attic/modules/check_installed_exports_file.cmake index d1d0c718..83ed205b 100644 --- a/attic/modules/check_installed_exports_file.cmake +++ b/attic/modules/check_installed_exports_file.cmake @@ -19,9 +19,9 @@ function(CHECK_INSTALLED_EXPORTS_FILE _filename) # get the absolute install directory, consider absolute and relative paths and also DESTDIR if(IS_ABSOLUTE "${EXPORT_INSTALL_DIR}") set(installDir "$ENV{DESTDIR}${EXPORT_INSTALL_DIR}") - else(IS_ABSOLUTE "${EXPORT_INSTALL_DIR}") + else() set(installDir "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${EXPORT_INSTALL_DIR}") - endif(IS_ABSOLUTE "${EXPORT_INSTALL_DIR}") + endif() set(installedExportsFile "${installDir}/${_filename}") @@ -55,14 +55,14 @@ function(CHECK_INSTALLED_EXPORTS_FILE _filename) file(GLOB exportFiles "${installDir}/${CMAKE_MATCH_1}-*.cmake") # message(STATUS "XXX files: ${exportFiles}") file(REMOVE ${exportFiles}) - endif("${_filename}" MATCHES "^(.+)(\\.cmake)$") - else(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") + endif() + else() # message(STATUS "XXX FILES ${_filename} are the same") - endif(NOT "${installedExportsFileContents}" STREQUAL "${binaryDirExportsFileContents}") + endif() - endif(EXISTS "${binaryDirExportsFile}") + endif() - endif(EXISTS "${installedExportsFile}") + endif() endfunction(CHECK_INSTALLED_EXPORTS_FILE) |