diff options
139 files changed, 1889 insertions, 1889 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 14aca368f..959115218 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,248 +9,248 @@ ############################################################################### # Name of the project -PROJECT(kvirc) +project(kvirc) # Set conventional loops -SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) +set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) # Minimum cmake version -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6) +cmake_minimum_required(VERSION 2.8.6) if(POLICY CMP0017) cmake_policy(SET CMP0017 NEW) endif(POLICY CMP0017) # Check modules first in local dir -SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules) +set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules) # Some vars -SET(PACKAGE "kvirc") -SET(NICENAME "KVIrc") -SET(VERSION_MAJOR "4") -SET(VERSION_BRANCH "4.3") -SET(VERSION_RELEASE "4.3.1") -SET(VERSION_CODENAME "Aria") +set(PACKAGE "kvirc") +set(NICENAME "KVIrc") +set(VERSION_MAJOR "4") +set(VERSION_BRANCH "4.3") +set(VERSION_RELEASE "4.3.1") +set(VERSION_CODENAME "Aria") # REMINDER: "Aria" is a candidate, trunk name "Quasar" -STRING(REGEX MATCH "[0-9]+$" VERSION_MINOR ${VERSION_BRANCH}) +string(REGEX MATCH "[0-9]+$" VERSION_MINOR ${VERSION_BRANCH}) -SET(CMAKE_KVIRC_VERSION_MAJOR ${VERSION_MAJOR}) -SET(CMAKE_KVIRC_VERSION_BRANCH ${VERSION_BRANCH}) -SET(CMAKE_KVIRC_VERSION_RELEASE ${VERSION_RELEASE}) -SET(CMAKE_KVIRC_VERSION_CODENAME ${VERSION_CODENAME}) -SET(CMAKE_KVIRC_BUILD_COMMAND ${CMAKE_COMMAND}) -SET(CMAKE_KVIRC_BUILD_FLAGS) -SET(CMAKE_KVIRC_BUILD_SYSTEM ${CMAKE_SYSTEM}) -SET(CMAKE_KVIRC_BUILD_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) -SET(CMAKE_KVIRC_BUILD_SYSTEM_VERSION ${CMAKE_SYSTEM_VERSION}) -SET(CMAKE_KVIRC_BUILD_CPU ${CMAKE_SYSTEM_PROCESSOR}) -SET(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER}) -SET(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS}) +set(CMAKE_KVIRC_VERSION_MAJOR ${VERSION_MAJOR}) +set(CMAKE_KVIRC_VERSION_BRANCH ${VERSION_BRANCH}) +set(CMAKE_KVIRC_VERSION_RELEASE ${VERSION_RELEASE}) +set(CMAKE_KVIRC_VERSION_CODENAME ${VERSION_CODENAME}) +set(CMAKE_KVIRC_BUILD_COMMAND ${CMAKE_COMMAND}) +set(CMAKE_KVIRC_BUILD_FLAGS) +set(CMAKE_KVIRC_BUILD_SYSTEM ${CMAKE_SYSTEM}) +set(CMAKE_KVIRC_BUILD_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) +set(CMAKE_KVIRC_BUILD_SYSTEM_VERSION ${CMAKE_SYSTEM_VERSION}) +set(CMAKE_KVIRC_BUILD_CPU ${CMAKE_SYSTEM_PROCESSOR}) +set(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER}) +set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS}) # Suffix for Linux -SET(LIB_SUFFIX +set(LIB_SUFFIX CACHE STRING "Define suffix of directory name (32/64)" ) # Get revision number from SVN -SET(MANUAL_REVISION +set(MANUAL_REVISION CACHE STRING "Manually set the revision number" ) -STRING(COMPARE EQUAL "${MANUAL_REVISION}" "" MANUAL_REVISION_UNSET) -IF(MANUAL_REVISION_UNSET) +string(COMPARE EQUAL "${MANUAL_REVISION}" "" MANUAL_REVISION_UNSET) +if(MANUAL_REVISION_UNSET) # No manually forced revision number, gotta guess one now - IF(EXISTS "${CMAKE_SOURCE_DIR}/.svnrevision") + if(EXISTS "${CMAKE_SOURCE_DIR}/.svnrevision") # We're in a release package created using makedist.sh, so we should include a .svnrevision file - FILE(READ "${CMAKE_SOURCE_DIR}/.svnrevision" DISTSVNREVISION) - STRING(STRIP "${DISTSVNREVISION}" CMAKE_KVIRC_BUILD_REVISION) - MESSAGE(STATUS "SVN revision is ${CMAKE_KVIRC_BUILD_REVISION}") - ELSE() - FIND_PACKAGE(Subversion) - IF(Subversion_FOUND) - MESSAGE(STATUS "Found Subversion ${Subversion_VERSION_SVN}") + file(READ "${CMAKE_SOURCE_DIR}/.svnrevision" DISTSVNREVISION) + string(STRIP "${DISTSVNREVISION}" CMAKE_KVIRC_BUILD_REVISION) + message(STATUS "SVN revision is ${CMAKE_KVIRC_BUILD_REVISION}") + else() + find_package(Subversion) + if(Subversion_FOUND) + message(STATUS "Found Subversion ${Subversion_VERSION_SVN}") # Subversion_WC_INFO is buggy and will croak if ran on a directory that is not checked out from svn # SVN info does not like .. as paths, so be sure that we use a full path - GET_FILENAME_COMPONENT(ABS_FOLDER ${CMAKE_SOURCE_DIR} ABSOLUTE) - EXECUTE_PROCESS( + get_filename_component(ABS_FOLDER ${CMAKE_SOURCE_DIR} ABSOLUTE) + execute_process( COMMAND ${Subversion_SVN_EXECUTABLE} info ${ABS_FOLDER} RESULT_VARIABLE INFO_RESULT OUTPUT_VARIABLE IGNORED ERROR_VARIABLE IGNORED ) - IF(INFO_RESULT EQUAL 0) + if(INFO_RESULT EQUAL 0) Subversion_WC_INFO(${PROJECT_SOURCE_DIR} KVIrc) - IF(DEFINED KVIrc_WC_REVISION) - SET(CMAKE_KVIRC_BUILD_REVISION ${KVIrc_WC_REVISION}) - MESSAGE(STATUS "Current revision is ${KVIrc_WC_REVISION}") - ELSE() - MESSAGE(STATUS "No revision number found (no clue why though).") - ENDIF() - ELSE() - MESSAGE(STATUS "No revision number found (not a subversion repository).") - ENDIF() - ELSE() - MESSAGE(STATUS "No revision number found (subversion not available).") - ENDIF() - ENDIF() + if(DEFINED KVIrc_WC_REVISION) + set(CMAKE_KVIRC_BUILD_REVISION ${KVIrc_WC_REVISION}) + message(STATUS "Current revision is ${KVIrc_WC_REVISION}") + else() + message(STATUS "No revision number found (no clue why though).") + endif() + else() + message(STATUS "No revision number found (not a subversion repository).") + endif() + else() + message(STATUS "No revision number found (subversion not available).") + endif() + endif() -ELSE() +else() # Manually forced revision number - SET(CMAKE_KVIRC_BUILD_REVISION ${MANUAL_REVISION}) - MESSAGE(STATUS "Current revision has been manually set to ${MANUAL_REVISION}") -ENDIF() + set(CMAKE_KVIRC_BUILD_REVISION ${MANUAL_REVISION}) + message(STATUS "Current revision has been manually set to ${MANUAL_REVISION}") +endif() # Simplify eventual mixed revisions and strange tweaks with letters in it -STRING(REGEX REPLACE ":[0-9a-zA-Z]+" "" CMAKE_KVIRC_BUILD_REVISION "${CMAKE_KVIRC_BUILD_REVISION}") -STRING(REGEX REPLACE "[^0-9]+" "" CMAKE_KVIRC_BUILD_REVISION "${CMAKE_KVIRC_BUILD_REVISION}") +string(REGEX REPLACE ":[0-9a-zA-Z]+" "" CMAKE_KVIRC_BUILD_REVISION "${CMAKE_KVIRC_BUILD_REVISION}") +string(REGEX REPLACE "[^0-9]+" "" CMAKE_KVIRC_BUILD_REVISION "${CMAKE_KVIRC_BUILD_REVISION}") # Set man dir -SET(MANDIR +set(MANDIR CACHE STRING "Define man directory starting from $CMAKE_INSTALL_PREFIX" ) -STRING(COMPARE EQUAL "${MANDIR}" "" MANDIR_UNSET) -IF(MANDIR_UNSET) - SET(MANDIR_PREFIX "share/man") -ELSE() - SET(MANDIR_PREFIX "man") -ENDIF() -LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS MANDIR=${MANDIR_PREFIX}) +string(COMPARE EQUAL "${MANDIR}" "" MANDIR_UNSET) +if(MANDIR_UNSET) + set(MANDIR_PREFIX "share/man") +else() + set(MANDIR_PREFIX "man") +endif() +list(APPEND CMAKE_KVIRC_BUILD_FLAGS MANDIR=${MANDIR_PREFIX}) # Get the build date -TRY_RUN(TEST_DID_RUN TEST_DID_COMPILE "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/datetime.cpp" OUTPUT_VARIABLE TEST_BUILD_DATE) -IF(TEST_DID_COMPILE) - STRING(REGEX MATCH "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [A-Z][A-Z][A-Z]" CMAKE_KVIRC_BUILD_DATE "${TEST_BUILD_DATE}") -ELSE() - MESSAGE(STATUS " Test datetime program failed to compile:") - MESSAGE(STATUS " ----------------------------------------") - MESSAGE(STATUS "${TEST_BUILD_DATE}") - MESSAGE(STATUS " ----------------------------------------") - SET(CMAKE_KVIRC_BUILD_DATE "ERROR ") -ENDIF() +try_run(TEST_DID_RUN TEST_DID_COMPILE "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/datetime.cpp" OUTPUT_VARIABLE TEST_BUILD_DATE) +if(TEST_DID_COMPILE) + string(REGEX MATCH "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [A-Z][A-Z][A-Z]" CMAKE_KVIRC_BUILD_DATE "${TEST_BUILD_DATE}") +else() + message(STATUS " Test datetime program failed to compile:") + message(STATUS " ----------------------------------------") + message(STATUS "${TEST_BUILD_DATE}") + message(STATUS " ----------------------------------------") + set(CMAKE_KVIRC_BUILD_DATE "ERROR ") +endif() # Set var to link with, for later use -SET(LIBS) -SET(ADDITIONAL_LINK_FLAGS) +set(LIBS) +set(ADDITIONAL_LINK_FLAGS) # Install path -IF(UNIX) - IF(APPLE) +if(UNIX) + if(APPLE) # MacOS X # Due to the special bundle structure ignore # the prefix eventually set by the user. - SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/KVIrc.app) - ELSE() + set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/KVIrc.app) + else() # Linux / BSD - IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) #fix package build - IF(PREFIX) - SET(CMAKE_INSTALL_PREFIX ${PREFIX}) - ELSE() - SET(CMAKE_INSTALL_PREFIX /usr/local) - ENDIF() - ENDIF() - ENDIF() -ELSEIF(WIN32) - SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/release) -ENDIF() -LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}) + if(PREFIX) + set(CMAKE_INSTALL_PREFIX ${PREFIX}) + else() + set(CMAKE_INSTALL_PREFIX /usr/local) + endif() + endif() + endif() +elseif(WIN32) + set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/release) +endif() +list(APPEND CMAKE_KVIRC_BUILD_FLAGS CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}) ############################################################################### # # Release type # ############################################################################### -OPTION(WANT_ENV_FLAGS "Don't try to set CMAKE_C(XX)_FLAGS; instead, use the ones from environment variables" OFF) +option(WANT_ENV_FLAGS "Don't try to set CMAKE_C(XX)_FLAGS; instead, use the ones from environment variables" OFF) -OPTION(WANT_DEBUG "Compile debug symbols" OFF) -IF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo OR DEBUG OR WITH_DEBUG) - SET(WANT_DEBUG ON CACHE BOOL "Compile debug symbols" FORCE) - SET(COMPILE_DEBUG_MODE 1) -ENDIF() +option(WANT_DEBUG "Compile debug symbols" OFF) +if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo OR DEBUG OR WITH_DEBUG) + set(WANT_DEBUG ON CACHE BOOL "Compile debug symbols" FORCE) + set(COMPILE_DEBUG_MODE 1) +endif() -OPTION(WANT_STRIP "Strip binaries (discard symbols from object files)" OFF) +option(WANT_STRIP "Strip binaries (discard symbols from object files)" OFF) -IF(WANT_ENV_FLAGS) - SET(CMAKE_BUILD_TYPE Undefined) - SET(CMAKE_STATUS_DEBUG_SUPPORT "Environment-driven") -ELSE() - IF(WANT_DEBUG) - SET(WANT_STRIP OFF CACHE BOOL "Strip binaries (discard symbols from object files)" FORCE) - SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) - SET(CMAKE_STATUS_DEBUG_SUPPORT "Yes") - IF(CMAKE_COMPILER_IS_GNUCXX) +if(WANT_ENV_FLAGS) + set(CMAKE_BUILD_TYPE Undefined) + set(CMAKE_STATUS_DEBUG_SUPPORT "Environment-driven") +else() + if(WANT_DEBUG) + set(WANT_STRIP OFF CACHE BOOL "Strip binaries (discard symbols from object files)" FORCE) + set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) + set(CMAKE_STATUS_DEBUG_SUPPORT "Yes") + if(CMAKE_COMPILER_IS_GNUCXX) # force gdb format of debug symbols - SET(CMAKE_CXX_FLAGS "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") - SET(CMAKE_C_FLAGS "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") - INCLUDE(CheckCXXCompilerFlag) + set(CMAKE_CXX_FLAGS "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") + set(CMAKE_C_FLAGS "-O0 -ggdb -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") + include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" CXX_HAS_VH_FLAG) CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG) #gcc doesn't support visibility on PE/win32 - IF(NOT MINGW) - IF(CXX_HAS_VH_FLAG) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") - SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") - ENDIF() - IF(CXX_HAS_VIH_FLAG) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") - SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") - ENDIF() - ENDIF() - ELSE() - IF(MSVC) + if(NOT MINGW) + if(CXX_HAS_VH_FLAG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") + set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") + endif() + if(CXX_HAS_VIH_FLAG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") + set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") + endif() + endif() + else() + if(MSVC) # this is the equivalent of -O0 -g according to MSDN, /Zc:wchar_t- is default for QT 4.x but not 5; reevaluate then. - SET(CMAKE_CXX_FLAGS "/Od /Zi /Zc:wchar_t-") - SET(CMAKE_C_FLAGS "/Od /Zi /Zc:wchar_t-") - ELSE() - SET(CMAKE_CXX_FLAGS "-O0 -g") - SET(CMAKE_C_FLAGS "-O0 -g") - ENDIF() - ENDIF() - ELSE() - IF(WANT_STRIP) - FIND_PROGRAM(STRIP_EXECUTABLE NAMES strip) - IF(STRIP_EXECUTABLE) - SET(CMAKE_STATUS_DEBUG_SUPPORT "No (Stripped)") - SET(CMAKE_BUILD_TYPE Release-stripped CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) - ELSE() - SET(CMAKE_STATUS_DEBUG_SUPPORT "No (Release)") - SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) - ENDIF() - ELSE() - SET(CMAKE_STATUS_DEBUG_SUPPORT "No (Release)") - SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) - SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") - SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") - INCLUDE(CheckCXXCompilerFlag) + set(CMAKE_CXX_FLAGS "/Od /Zi /Zc:wchar_t-") + set(CMAKE_C_FLAGS "/Od /Zi /Zc:wchar_t-") + else() + set(CMAKE_CXX_FLAGS "-O0 -g") + set(CMAKE_C_FLAGS "-O0 -g") + endif() + endif() + else() + if(WANT_STRIP) + find_program(STRIP_EXECUTABLE NAMES strip) + if(STRIP_EXECUTABLE) + set(CMAKE_STATUS_DEBUG_SUPPORT "No (Stripped)") + set(CMAKE_BUILD_TYPE Release-stripped CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) + else() + set(CMAKE_STATUS_DEBUG_SUPPORT "No (Release)") + set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) + endif() + else() + set(CMAKE_STATUS_DEBUG_SUPPORT "No (Release)") + set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) + endif() + if(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") + set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math") + include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG) #gcc doesn't support visibility on PE/win32 - IF(CXX_HAS_VIH_FLAG AND NOT MINGW) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") - SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") - ENDIF() - ELSE() - IF(MSVC) + if(CXX_HAS_VIH_FLAG AND NOT MINGW) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") + set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") + endif() + else() + if(MSVC) # /Ox is -O3, /Zc:wchar_t- is default for QT 4.x but not 5; reevaluate then. - SET(CMAKE_CXX_FLAGS "/Ox /Zc:wchar_t-") - SET(CMAKE_C_FLAGS "/Ox /Zc:wchar_t-") - ELSE() - SET(CMAKE_CXX_FLAGS "-O3") - SET(CMAKE_C_FLAGS "-O3") - ENDIF() - ENDIF() - ENDIF() -ENDIF() + set(CMAKE_CXX_FLAGS "/Ox /Zc:wchar_t-") + set(CMAKE_C_FLAGS "/Ox /Zc:wchar_t-") + else() + set(CMAKE_CXX_FLAGS "-O3") + set(CMAKE_C_FLAGS "-O3") + endif() + endif() + endif() +endif() ############################################################################ # Check for KDE4 @@ -259,25 +259,25 @@ ENDIF() # modules (eg: FindOpenSSL, see bug #655) ############################################################################ -OPTION(WANT_KDE4 "Whether to use KDE4 support" ON) -IF(WANT_KDE4) - FIND_PACKAGE(KDE4) - IF(KDE4_FOUND) - INCLUDE_DIRECTORIES(${KDE4_INCLUDES}) - ADD_DEFINITIONS(${KDE4_DEFINITIONS}) - SET(COMPILE_KDE_SUPPORT 1) - LIST(APPEND LIBS ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} ${KDE4_KPARTS_LIBRARY} ${KDE4_KFILE_LIBRARY} ${KDE4_KIO_LIBRARY} ${KDE4_SOLID_LIBRARY}) - SET(CMAKE_STATUS_KDE4_SUPPORT "Yes") +option(WANT_KDE4 "Whether to use KDE4 support" ON) +if(WANT_KDE4) + find_package(KDE4) + if(KDE4_FOUND) + include_directories(${KDE4_INCLUDES}) + add_definitions(${KDE4_DEFINITIONS}) + set(COMPILE_KDE_SUPPORT 1) + list(APPEND LIBS ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} ${KDE4_KPARTS_LIBRARY} ${KDE4_KFILE_LIBRARY} ${KDE4_KIO_LIBRARY} ${KDE4_SOLID_LIBRARY}) + set(CMAKE_STATUS_KDE4_SUPPORT "Yes") # The KDE4 cmake module has a VERY WEIRD behaviour: it adds -Wl,--no-undefined # to the CMAKE_MODULE_LINKER_FLAGS .. which is BAD - STRING(REPLACE "-Wl,--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS}) - ELSE() - SET(CMAKE_STATUS_KDE4_SUPPORT "Not available") - ENDIF() -ELSE() - SET(CMAKE_STATUS_KDE4_SUPPORT "No") -ENDIF() + string(REPLACE "-Wl,--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS}) + else() + set(CMAKE_STATUS_KDE4_SUPPORT "Not available") + endif() +else() + set(CMAKE_STATUS_KDE4_SUPPORT "No") +endif() ############################################################################### # @@ -285,14 +285,14 @@ ENDIF() # ############################################################################### -OPTION(WANT_VERBOSE "Generate verbose Makefiles" OFF) -IF(WANT_VERBOSE) - SET(CMAKE_VERBOSE_MAKEFILE ON) - SET(CMAKE_STATUS_VERBOSE_SUPPORT "Yes") - LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS VERBOSE) -ELSE() - SET(CMAKE_STATUS_VERBOSE_SUPPORT "No") -ENDIF() +option(WANT_VERBOSE "Generate verbose Makefiles" OFF) +if(WANT_VERBOSE) + set(CMAKE_VERBOSE_MAKEFILE ON) + set(CMAKE_STATUS_VERBOSE_SUPPORT "Yes") + list(APPEND CMAKE_KVIRC_BUILD_FLAGS VERBOSE) +else() + set(CMAKE_STATUS_VERBOSE_SUPPORT "No") +endif() ############################################################################### @@ -301,16 +301,16 @@ ENDIF() # ############################################################################### -OPTION(WANT_COEXISTENCE "Append version to binaries to maintain compatibility with older versions" OFF) -IF(WANT_COEXISTENCE) - SET(KVIRC_BINARYNAME ${PACKAGE}${VERSION_MAJOR}) - SET(KVILIB_BINARYNAME kvilib${VERSION_MAJOR}) - SET(CMAKE_STATUS_COEXISTENCE_VER "Yes") -ELSE() - SET(KVIRC_BINARYNAME ${PACKAGE}) - SET(KVILIB_BINARYNAME kvilib) - SET(CMAKE_STATUS_COEXISTENCE_VER "No") -ENDIF() +option(WANT_COEXISTENCE "Append version to binaries to maintain compatibility with older versions" OFF) +if(WANT_COEXISTENCE) + set(KVIRC_BINARYNAME ${PACKAGE}${VERSION_MAJOR}) + set(KVILIB_BINARYNAME kvilib${VERSION_MAJOR}) + set(CMAKE_STATUS_COEXISTENCE_VER "Yes") +else() + set(KVIRC_BINARYNAME ${PACKAGE}) + set(KVILIB_BINARYNAME kvilib) + set(CMAKE_STATUS_COEXISTENCE_VER "No") +endif() ############################################################################### # @@ -318,19 +318,19 @@ ENDIF() # ############################################################################### -IF(UNIX) - IF(APPLE) - SET(CMAKE_KVIRC_RESOURCES_DIR "${CMAKE_INSTALL_PREFIX}/Contents/Resources/") - ELSE() +if(UNIX) + if(APPLE) + set(CMAKE_KVIRC_RESOURCES_DIR "${CMAKE_INSTALL_PREFIX}/Contents/Resources/") + else() # Assume linux - SET(CMAKE_KVIRC_RESOURCES_DIR "${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/") - SET(CMAKE_KVIRC_MODULES_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/kvirc/${VERSION_BRANCH}/modules") - LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS LIB_SUFFIX=${LIB_SUFFIX}) - ENDIF() -ELSEIF(WIN32) - SET(CMAKE_KVIRC_RESOURCES_DIR "${CMAKE_INSTALL_PREFIX}/") - SET(CMAKE_KVIRC_MODULES_DIR "${CMAKE_INSTALL_PREFIX}/modules/") -ENDIF() + set(CMAKE_KVIRC_RESOURCES_DIR "${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/") + set(CMAKE_KVIRC_MODULES_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/kvirc/${VERSION_BRANCH}/modules") + list(APPEND CMAKE_KVIRC_BUILD_FLAGS LIB_SUFFIX=${LIB_SUFFIX}) + endif() +elseif(WIN32) + set(CMAKE_KVIRC_RESOURCES_DIR "${CMAKE_INSTALL_PREFIX}/") + set(CMAKE_KVIRC_MODULES_DIR "${CMAKE_INSTALL_PREFIX}/modules/") +endif() ############################################################################### # @@ -338,28 +338,28 @@ ENDIF() # ############################################################################### -INCLUDE(CheckTypeSize) +include(CheckTypeSize) CHECK_TYPE_SIZE("short" CMAKE_SYSTEM_SIZE_OF_SHORT_INT) CHECK_TYPE_SIZE("int" CMAKE_SYSTEM_SIZE_OF_INT) CHECK_TYPE_SIZE("long" CMAKE_SYSTEM_SIZE_OF_LONG_INT) CHECK_TYPE_SIZE("long long" CMAKE_SYSTEM_SIZE_OF_LONG_LONG_INT) -INCLUDE(CheckIncludeFiles) +include(CheckIncludeFiles) CHECK_INCLUDE_FILES(sys/types.h SYSTEM_HAS_SYS_TYPES_H) CHECK_INCLUDE_FILES(strings.h SYSTEM_HAS_STRINGS_H) # "dynamic labels" compiler support -TRY_RUN(TEST_DID_RUN_DYNLABELS TEST_DID_COMPILE_DYNLABELS "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/dynlabels.cpp") -IF(TEST_DID_COMPILE_DYNLABELS) - STRING(COMPARE EQUAL "${TEST_DID_RUN_DYNLABELS}" "0" TEST_DID_RUN_DYNLABELS_SUCCESS) - IF(TEST_DID_RUN_DYNLABELS_SUCCESS) - SET(COMPILE_USE_DYNAMIC_LABELS 1) - ELSE() - SET(COMPILE_USE_DYNAMIC_LABELS 0) - ENDIF() -ELSE() - SET(COMPILE_USE_DYNAMIC_LABELS 0) -ENDIF() +try_run(TEST_DID_RUN_DYNLABELS TEST_DID_COMPILE_DYNLABELS "${CMAKE_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/dynlabels.cpp") +if(TEST_DID_COMPILE_DYNLABELS) + string(COMPARE EQUAL "${TEST_DID_RUN_DYNLABELS}" "0" TEST_DID_RUN_DYNLABELS_SUCCESS) + if(TEST_DID_RUN_DYNLABELS_SUCCESS) + set(COMPILE_USE_DYNAMIC_LABELS 1) + else() + set(COMPILE_USE_DYNAMIC_LABELS 0) + endif() +else() + set(COMPILE_USE_DYNAMIC_LABELS 0) +endif() ############################################################################### # @@ -369,544 +369,544 @@ ENDIF() ############################################################################### # ingore sigalarm (useful with solaris threads) -OPTION(WANT_IGNORE_SIGALARM "Ignore SIGALARM signal" OFF) +option(WANT_IGNORE_SIGALARM "Ignore SIGALARM signal" OFF) # Check for threads -FIND_PACKAGE(Threads REQUIRED) -IF(CMAKE_USE_WIN32_THREADS_INIT OR CMAKE_USE_PTHREADS_INIT) - IF(CMAKE_USE_WIN32_THREADS_INIT) +find_package(Threads REQUIRED) +if(CMAKE_USE_WIN32_THREADS_INIT OR CMAKE_USE_PTHREADS_INIT) + if(CMAKE_USE_WIN32_THREADS_INIT) # No need to link to any specific library - SET(COMPILE_THREADS_USE_WIN32 1) - SET(CMAKE_STATUS_THREADS_SUPPORT "Win32") - LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS Threads=Win32) - ELSE() - IF(CMAKE_HAVE_THREADS_LIBRARY) - LIST(APPEND LIBS ${CMAKE_THREAD_LIBS_INIT}) - ENDIF() - SET(COMPILE_THREADS_USE_POSIX 1) - LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS Threads=POSIX) + set(COMPILE_THREADS_USE_WIN32 1) + set(CMAKE_STATUS_THREADS_SUPPORT "Win32") + list(APPEND CMAKE_KVIRC_BUILD_FLAGS Threads=Win32) + else() + if(CMAKE_HAVE_THREADS_LIBRARY) + list(APPEND LIBS ${CMAKE_THREAD_LIBS_INIT}) + endif() + set(COMPILE_THREADS_USE_POSIX 1) + list(APPEND CMAKE_KVIRC_BUILD_FLAGS Threads=POSIX) # FIXME: Solaris threads ? - #SET(COMPILE_THREADS_USE_SOLARIS_LIBTHREAD 1) - #SET(CMAKE_STATUS_THREADS_SUPPORT "SOLARIS") - #LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS Threads=SOLARIS) - IF(WANT_IGNORE_SIGALARM) - SET(CMAKE_STATUS_THREADS_SUPPORT "POSIX (ignoring SIGALARM)") - SET(COMPILE_IGNORE_SIGALARM 1) - ELSE() - SET(CMAKE_STATUS_THREADS_SUPPORT "POSIX") - ENDIF() - ENDIF() -ELSE() - SET(CMAKE_STATUS_THREADS_SUPPORT "Not used") -ENDIF() + #set(COMPILE_THREADS_USE_SOLARIS_LIBTHREAD 1) + #set(CMAKE_STATUS_THREADS_SUPPORT "SOLARIS") + #list(APPEND CMAKE_KVIRC_BUILD_FLAGS Threads=SOLARIS) + if(WANT_IGNORE_SIGALARM) + set(CMAKE_STATUS_THREADS_SUPPORT "POSIX (ignoring SIGALARM)") + set(COMPILE_IGNORE_SIGALARM 1) + else() + set(CMAKE_STATUS_THREADS_SUPPORT "POSIX") + endif() + endif() +else() + set(CMAKE_STATUS_THREADS_SUPPORT "Not used") +endif() # Check for ZLib -FIND_PACKAGE(ZLIB REQUIRED) -IF(ZLIB_FOUND) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) - LIST(APPEND LIBS ${ZLIB_LIBRARIES}) - SET(COMPILE_ZLIB_SUPPORT 1) -ENDIF() +find_package(ZLIB REQUIRED) +if(ZLIB_FOUND) + include_directories(${ZLIB_INCLUDE_DIR}) + list(APPEND LIBS ${ZLIB_LIBRARIES}) + set(COMPILE_ZLIB_SUPPORT 1) +endif() ############################################################################ # Check for Qt{4,5} ############################################################################ -OPTION(WANT_QT4 "Whether to prefer Qt4 over Qt5" OFF) +option(WANT_QT4 "Whether to prefer Qt4 over Qt5" OFF) -IF(WANT_QT4) - FIND_PACKAGE(Qt4 4.6.0) - IF(NOT QT4_FOUND) - MESSAGE(FATAL_ERROR "The use of Qt4 has been forced, but no Qt4 found on the system (WANT_QT4=ON)") - SET(CMAKE_STATUS_QT_VERSION "None") - ENDIF() -ELSE() - FIND_PACKAGE(Qt5Widgets) - IF(Qt5Widgets_FOUND) - SET(CMAKE_STATUS_QT_VERSION "${Qt5Widgets_VERSION_STRING}") - SET(qt5_kvirc_modules) - ELSE() - FIND_PACKAGE(Qt4 4.6.0) - IF(QT4_FOUND) - SET(CMAKE_STATUS_QT_VERSION "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}") - ELSE() - MESSAGE(FATAL_ERROR "No Qt4 or Qt5 found!") - ENDIF() - ENDIF() -ENDIF() +if(WANT_QT4) + find_package(Qt4 4.6.0) + if(NOT QT4_FOUND) + message(FATAL_ERROR "The use of Qt4 has been forced, but no Qt4 found on the system (WANT_QT4=ON)") + set(CMAKE_STATUS_QT_VERSION "None") + endif() +else() + find_package(Qt5Widgets) + if(Qt5Widgets_FOUND) + set(CMAKE_STATUS_QT_VERSION "${Qt5Widgets_VERSION_STRING}") + set(qt5_kvirc_modules) + else() + find_package(Qt4 4.6.0) + if(QT4_FOUND) + set(CMAKE_STATUS_QT_VERSION "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}") + else() + message(FATAL_ERROR "No Qt4 or Qt5 found!") + endif() + endif() +endif() # automoc is used by both qt4 and qt5 -SET(CMAKE_AUTOMOC TRUE) +set(CMAKE_AUTOMOC TRUE) # Shared options -IF(APPLE OR WIN32) +if(APPLE OR WIN32) # No Qt-DBus on Mac and Windows - OPTION(WANT_QTDBUS "Whether to compile Qt-DBus support" OFF) -ELSE() - OPTION(WANT_QTDBUS "Whether to compile Qt-DBus support" ON) -ENDIF() + option(WANT_QTDBUS "Whether to compile Qt-DBus support" OFF) +else() + option(WANT_QTDBUS "Whether to compile Qt-DBus support" ON) +endif() -OPTION(WANT_QTWEBKIT "Whether to compile Qt-WebKit support" ON) -OPTION(WANT_QTSVG "Whether to compile Qt-Svg support" ON) +option(WANT_QTWEBKIT "Whether to compile Qt-WebKit support" ON) +option(WANT_QTSVG "Whether to compile Qt-Svg support" ON) # Qt4 stuff -IF(QT4_FOUND) - SET(QT_USE_QTSQL true) - SET(QT_USE_QTXML true) - SET(QT_USE_QTNETWORK true) +if(QT4_FOUND) + set(QT_USE_QTSQL true) + set(QT_USE_QTXML true) + set(QT_USE_QTNETWORK true) # qtmain for non-debug MSVC (/subsystem:windows), MinGW can live without it. - IF(MSVC AND NOT WANT_DEBUG) - SET(QT_USE_QTMAIN true) - ENDIF() + if(MSVC AND NOT WANT_DEBUG) + set(QT_USE_QTMAIN true) + endif() # Qt-DBus support - IF(WANT_QTDBUS) - IF(QT_QTDBUS_FOUND) - SET(QT_USE_QTDBUS true) - SET(CMAKE_STATUS_QTDBUS_SUPPORT "Yes") - SET(COMPILE_DBUS_SUPPORT 1) - ELSE() - SET(CMAKE_STATUS_QTDBUS_SUPPORT "Not available") - ENDIF() - ELSE() - SET(CMAKE_STATUS_QTDBUS_SUPPORT "No") - ENDIF() + if(WANT_QTDBUS) + if(QT_QTDBUS_FOUND) + set(QT_USE_QTDBUS true) + set(CMAKE_STATUS_QTDBUS_SUPPORT "Yes") + set(COMPILE_DBUS_SUPPORT 1) + else() + set(CMAKE_STATUS_QTDBUS_SUPPORT "Not available") + endif() + else() + set(CMAKE_STATUS_QTDBUS_SUPPORT "No") + endif() # Qt-WebKit support - IF(WANT_QTWEBKIT) - IF(QT_QTWEBKIT_FOUND) - SET(QT_USE_QTWEBKIT true) - SET(CMAKE_STATUS_QTWEBKIT_SUPPORT "Yes") - SET(COMPILE_WEBKIT_SUPPORT 1) - ELSE() - SET(CMAKE_STATUS_QTWEBKIT_SUPPORT "Not available") - ENDIF() - ELSE() - SET(CMAKE_STATUS_QTWEBKIT_SUPPORT "No") - ENDIF() + if(WANT_QTWEBKIT) + if(QT_QTWEBKIT_FOUND) + set(QT_USE_QTWEBKIT true) + set(CMAKE_STATUS_QTWEBKIT_SUPPORT "Yes") + set(COMPILE_WEBKIT_SUPPORT 1) + else() + set(CMAKE_STATUS_QTWEBKIT_SUPPORT "Not available") + endif() + else() + set(CMAKE_STATUS_QTWEBKIT_SUPPORT "No") + endif() # Qt-Svg support - IF(WANT_QTSVG) - IF(QT_QTSVG_FOUND) - SET(QT_USE_QTSVG true) - SET(CMAKE_STATUS_QTSVG_SUPPORT "Yes") - SET(COMPILE_SVG_SUPPORT 1) - ELSE() - SET(CMAKE_STATUS_QTSVG_SUPPORT "Not available") - ENDIF() - ELSE() - SET(CMAKE_STATUS_QTSVG_SUPPORT "No") - ENDIF() + if(WANT_QTSVG) + if(QT_QTSVG_FOUND) + set(QT_USE_QTSVG true) + set(CMAKE_STATUS_QTSVG_SUPPORT "Yes") + set(COMPILE_SVG_SUPPORT 1) + else() + set(CMAKE_STATUS_QTSVG_SUPPORT "Not available") + endif() + else() + set(CMAKE_STATUS_QTSVG_SUPPORT "No") + endif() - INCLUDE(${QT_USE_FILE}) - INCLUDE_DIRECTORIES(${QT_INCLUDES}) - LIST(APPEND LIBS ${QT_LIBRARIES}) -ENDIF() + include(${QT_USE_FILE}) + include_directories(${QT_INCLUDES}) + list(APPEND LIBS ${QT_LIBRARIES}) +endif() -IF(Qt5Widgets_FOUND) - INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS}) - LIST(APPEND qt5_kvirc_modules Widgets) +if(Qt5Widgets_FOUND) + include_directories(${Qt5Widgets_INCLUDE_DIRS}) + list(APPEND qt5_kvirc_modules Widgets) # qtmain for non-debug MSVC (/subsystem:windows), MinGW can live without it. - IF(MSVC AND NOT WANT_DEBUG) - SET(QT_USE_QTMAIN true) - ENDIF() + if(MSVC AND NOT WANT_DEBUG) + set(QT_USE_QTMAIN true) + endif() # QtSql - FIND_PACKAGE(Qt5Sql) - IF(Qt5Sql_FOUND) - INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS}) - LIST(APPEND qt5_kvirc_modules Sql) - ENDIF() + find_package(Qt5Sql) + if(Qt5Sql_FOUND) + include_directories(${Qt5Sql_INCLUDE_DIRS}) + list(APPEND qt5_kvirc_modules Sql) + endif() # QtXml - FIND_PACKAGE(Qt5Xml) - IF(Qt5Xml_FOUND) - INCLUDE_DIRECTORIES(${Qt5Xml_INCLUDE_DIRS}) - LIST(APPEND qt5_kvirc_modules Xml) - ENDIF() + find_package(Qt5Xml) + if(Qt5Xml_FOUND) + include_directories(${Qt5Xml_INCLUDE_DIRS}) + list(APPEND qt5_kvirc_modules Xml) + endif() # QtNetwork - FIND_PACKAGE(Qt5Network) - IF(Qt5Network_FOUND) - INCLUDE_DIRECTORIES(${Qt5Network_INCLUDE_DIRS}) - LIST(APPEND qt5_kvirc_modules Network) - ENDIF() + find_package(Qt5Network) + if(Qt5Network_FOUND) + include_directories(${Qt5Network_INCLUDE_DIRS}) + list(APPEND qt5_kvirc_modules Network) + endif() # QtPrintSupport - FIND_PACKAGE(Qt5PrintSupport) - IF(Qt5PrintSupport_FOUND) - INCLUDE_DIRECTORIES(${Qt5PrintSupport_INCLUDE_DIRS}) - LIST(APPEND qt5_kvirc_modules PrintSupport) - ENDIF() + find_package(Qt5PrintSupport) + if(Qt5PrintSupport_FOUND) + include_directories(${Qt5PrintSupport_INCLUDE_DIRS}) + list(APPEND qt5_kvirc_modules PrintSupport) + endif() # QtMultimedia - FIND_PACKAGE(Qt5Multimedia) - IF(Qt5Multimedia_FOUND) - INCLUDE_DIRECTORIES(${Qt5Multimedia_INCLUDE_DIRS}) - LIST(APPEND qt5_kvirc_modules Multimedia) - ENDIF() + find_package(Qt5Multimedia) + if(Qt5Multimedia_FOUND) + include_directories(${Qt5Multimedia_INCLUDE_DIRS}) + list(APPEND qt5_kvirc_modules Multimedia) + endif() # Qt-DBus support - IF(WANT_QTDBUS) - FIND_PACKAGE(Qt5DBus) - IF(Qt5DBus_FOUND) - LIST(APPEND qt5_kvirc_modules DBus) - INCLUDE_DIRECTORIES(${Qt5DBus_INCLUDE_DIRS}) - SET(COMPILE_DBUS_SUPPORT 1) - ENDIF() - ENDIF() + if(WANT_QTDBUS) + find_package(Qt5DBus) + if(Qt5DBus_FOUND) + list(APPEND qt5_kvirc_modules DBus) + include_directories(${Qt5DBus_INCLUDE_DIRS}) + set(COMPILE_DBUS_SUPPORT 1) + endif() + endif() # Qt-WebKit support - IF(WANT_QTWEBKIT) - FIND_PACKAGE(Qt5WebKit) - IF(Qt5WebKit_FOUND) - LIST(APPEND qt5_kvirc_modules WebKit) - INCLUDE_DIRECTORIES(${Qt5WebKit_INCLUDE_DIRS}) - SET(COMPILE_WEBKIT_SUPPORT 1) - ENDIF() - ENDIF() + if(WANT_QTWEBKIT) + find_package(Qt5WebKit) + if(Qt5WebKit_FOUND) + list(APPEND qt5_kvirc_modules WebKit) + include_directories(${Qt5WebKit_INCLUDE_DIRS}) + set(COMPILE_WEBKIT_SUPPORT 1) + endif() + endif() # Qt-Svg support - IF(WANT_QTSVG) - FIND_PACKAGE(Qt5Svg) - IF(Qt5Svg_FOUND) - LIST(APPEND qt5_kvirc_modules Svg) - INCLUDE_DIRECTORIES(${Qt5Svg_INCLUDE_DIRS}) - SET(COMPILE_SVG_SUPPORT 1) - ENDIF() - ENDIF() -ENDIF() + if(WANT_QTSVG) + find_package(Qt5Svg) + if(Qt5Svg_FOUND) + list(APPEND qt5_kvirc_modules Svg) + include_directories(${Qt5Svg_INCLUDE_DIRS}) + set(COMPILE_SVG_SUPPORT 1) + endif() + endif() +endif() # Check for X11 -IF(UNIX) - IF(APPLE) - SET(CMAKE_STATUS_X11_SUPPORT "Not used") - ELSE() +if(UNIX) + if(APPLE) + set(CMAKE_STATUS_X11_SUPPORT "Not used") + else() # Assume linux - FIND_PACKAGE(X11) - IF(X11_FOUND) - SET(COMPILE_X11_SUPPORT 1) - IF(X11_Xscreensaver_FOUND) - SET(COMPILE_XSS_SUPPORT 1) - SET(CMAKE_STATUS_X11_SUPPORT "Yes, with scrnsaverproto") - INCLUDE_DIRECTORIES(${X11_Xscreensaver_INCLUDE_PATH}) - LIST(APPEND LIBS ${X11_Xscreensaver_LIB}) - ELSE() - SET(CMAKE_STATUS_X11_SUPPORT "Yes") - ENDIF() + find_package(X11) + if(X11_FOUND) + set(COMPILE_X11_SUPPORT 1) + if(X11_Xscreensaver_FOUND) + set(COMPILE_XSS_SUPPORT 1) + set(CMAKE_STATUS_X11_SUPPORT "Yes, with scrnsaverproto") + include_directories(${X11_Xscreensaver_INCLUDE_PATH}) + list(APPEND LIBS ${X11_Xscreensaver_LIB}) + else() + set(CMAKE_STATUS_X11_SUPPORT "Yes") + endif() - INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR}) - LIST(APPEND LIBS ${X11_LIBRARIES}) + include_directories(${X11_INCLUDE_DIR}) + list(APPEND LIBS ${X11_LIBRARIES}) # Seems like ${X11_LIBRARIES} doesn't add -lXrender, which is needed # for building with --no-add-needed/binutils-gold, see # <http://bugs.debian.org/555068> for details. - IF(X11_Xrender_FOUND) - LIST(APPEND LIBS ${X11_Xrender_LIB}) - ENDIF(X11_Xrender_FOUND) - ELSE() - SET(CMAKE_STATUS_X11_SUPPORT "Not available") - ENDIF() - ENDIF() -ELSE() - SET(CMAKE_STATUS_X11_SUPPORT "Not needed") -ENDIF() + if(X11_Xrender_FOUND) + list(APPEND LIBS ${X11_Xrender_LIB}) + endif(X11_Xrender_FOUND) + else() + set(CMAKE_STATUS_X11_SUPPORT "Not available") + endif() + endif() +else() + set(CMAKE_STATUS_X11_SUPPORT "Not needed") +endif() # Phonon support -OPTION(WANT_PHONON "Whether to compile Phonon support" ON) -IF(WANT_PHONON) - FIND_PACKAGE(Phonon) - IF(PHONON_FOUND) - SET(COMPILE_PHONON_SUPPORT 1) - IF(COMPILE_DEBUG_MODE AND PHONON_DEBUG_LIBRARY) - LIST(APPEND LIBS ${PHONON_DEBUG_LIBRARY}) - ELSE(COMPILE_DEBUG_MODE AND PHONON_DEBUG_LIBRARY) - LIST(APPEND LIBS ${PHONON_LIBRARY}) - ENDIF(COMPILE_DEBUG_MODE AND PHONON_DEBUG_LIBRARY) - LIST(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Phonon") - ENDIF() -ENDIF() +option(WANT_PHONON "Whether to compile Phonon support" ON) +if(WANT_PHONON) + find_package(Phonon) + if(PHONON_FOUND) + set(COMPILE_PHONON_SUPPORT 1) + if(COMPILE_DEBUG_MODE AND PHONON_DEBUG_LIBRARY) + list(APPEND LIBS ${PHONON_DEBUG_LIBRARY}) + else(COMPILE_DEBUG_MODE AND PHONON_DEBUG_LIBRARY) + list(APPEND LIBS ${PHONON_LIBRARY}) + endif(COMPILE_DEBUG_MODE AND PHONON_DEBUG_LIBRARY) + list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Phonon") + endif() +endif() # esd -OPTION(WANT_ESD "Whether to compile ESD support" ON) -IF(WANT_ESD) - FIND_PACKAGE(ESD) - IF(ESD_FOUND) - SET(COMPILE_ESD_SUPPORT 1) - LIST(APPEND LIBS ${ESD_LIBRARY}) - LIST(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Esd") - ENDIF() -ENDIF() +option(WANT_ESD "Whether to compile ESD support" ON) +if(WANT_ESD) + find_package(ESD) + if(ESD_FOUND) + set(COMPILE_ESD_SUPPORT 1) + list(APPEND LIBS ${ESD_LIBRARY}) + list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Esd") + endif() +endif() # oss + audiofile -OPTION(WANT_OSS "Whether to compile OSS support" ON) -OPTION(WANT_AUDIOFILE "Whether to compile Audiofile support" ON) +option(WANT_OSS "Whether to compile OSS support" ON) +option(WANT_AUDIOFILE "Whether to compile Audiofile support" ON) -IF(WANT_OSS) - FIND_PACKAGE(OSS) - IF(OSS_FOUND) - SET(COMPILE_OSS_SUPPORT 1) - ENDIF() +if(WANT_OSS) + find_package(OSS) + if(OSS_FOUND) + set(COMPILE_OSS_SUPPORT 1) + endif() - IF(WANT_AUDIOFILE) - FIND_PACKAGE(Audiofile) - IF(AUDIOFILE_FOUND) - SET(COMPILE_AUDIOFILE_SUPPORT 1) - LIST(APPEND LIBS ${AUDIOFILE_LIBRARY}) - LIST(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Oss+AudioFile") - ENDIF() - ELSE() - LIST(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Oss") - ENDIF() -ENDIF() + if(WANT_AUDIOFILE) + find_package(Audiofile) + if(AUDIOFILE_FOUND) + set(COMPILE_AUDIOFILE_SUPPORT 1) + list(APPEND LIBS ${AUDIOFILE_LIBRARY}) + list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Oss+AudioFile") + endif() + else() + list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "Oss") + endif() +endif() #winmm - win32 -IF(WIN32) - LIST(APPEND CMAKE_STATUS_AUDIO_BACKENDS "WinMM") -ENDIF() +if(WIN32) + list(APPEND CMAKE_STATUS_AUDIO_BACKENDS "WinMM") +endif() ############################################################################ # Check for MacOS X universal binary ############################################################################ -IF(APPLE) - OPTION(WANT_UNIVERSAL_BINARY "Whether to compile an Universal Binary on MacOSX" ON) - IF(WANT_UNIVERSAL_BINARY) - SET(CMAKE_OSX_ARCHITECTURES x86_64) - SET(CMAKE_STATUS_BUILD_UNIVERSAL_BINARY "User enabled") +if(APPLE) + option(WANT_UNIVERSAL_BINARY "Whether to compile an Universal Binary on MacOSX" ON) + if(WANT_UNIVERSAL_BINARY) + set(CMAKE_OSX_ARCHITECTURES x86_64) + set(CMAKE_STATUS_BUILD_UNIVERSAL_BINARY "User enabled") #FIXME: This should be handled with CMAKE_OSX_SYSROOT (TOM) - SET(CMAKE_SHARED_LINKER_FLAGS "-mmacosx-version-min=10.6") - SET(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.6") - ELSE() - SET(CMAKE_STATUS_BUILD_UNIVERSAL_BINARY "No") - ENDIF() -ELSE() - SET(CMAKE_STATUS_BUILD_UNIVERSAL_BINARY "Not available") -ENDIF() + set(CMAKE_SHARED_LINKER_FLAGS "-mmacosx-version-min=10.6") + set(CMAKE_EXE_LINKER_FLAGS "-mmacosx-version-min=10.6") + else() + set(CMAKE_STATUS_BUILD_UNIVERSAL_BINARY "No") + endif() +else() + set(CMAKE_STATUS_BUILD_UNIVERSAL_BINARY "Not available") +endif() ############################################################################ # OpenSSL support (Secure Sockets, Certificates, Digests etc...) ############################################################################ -OPTION(WANT_OPENSSL "Whether to compile OpenSSL support" ON) +option(WANT_OPENSSL "Whether to compile OpenSSL support" ON) -IF(WANT_OPENSSL) - FIND_PACKAGE(OpenSSL) - IF(OPENSSL_FOUND) - IF(WIN32) +if(WANT_OPENSSL) + find_package(OpenSSL) + if(OPENSSL_FOUND) + if(WIN32) # On windows/mingw we need libeay32 too... - FIND_LIBRARY(LIB_EAY NAMES libeay32MD eay libeay libeay32 + find_library(LIB_EAY NAMES libeay32MD eay libeay libeay32 ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib" "lib/MinGW") - IF(LIB_EAY) - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) + if(LIB_EAY) + include_directories(${OPENSSL_INCLUDE_DIR}) # The following are here in order to pick the applink.c file # The documentation says that it should be included in OPENSSL_INCLUDE_DIR/openssl # but in the package I have now it's actually in OPENSSL_INCLUDE_DIR/../ms . - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}/openssl) - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}/../ms) - LIST(APPEND LIBS ${OPENSSL_LIBRARIES} ${LIB_EAY}) - SET(COMPILE_SSL_SUPPORT 1) - SET(CMAKE_STATUS_SSL_SUPPORT "Yes") - ELSE() - SET(CMAKE_STATUS_SSL_SUPPORT "Not available, libeay missing") - ENDIF() - ELSE() - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) - LIST(APPEND LIBS ${OPENSSL_LIBRARIES}) - SET(COMPILE_SSL_SUPPORT 1) - SET(CMAKE_STATUS_SSL_SUPPORT "Yes") + include_directories(${OPENSSL_INCLUDE_DIR}/openssl) + include_directories(${OPENSSL_INCLUDE_DIR}/../ms) + list(APPEND LIBS ${OPENSSL_LIBRARIES} ${LIB_EAY}) + set(COMPILE_SSL_SUPPORT 1) + set(CMAKE_STATUS_SSL_SUPPORT "Yes") + else() + set(CMAKE_STATUS_SSL_SUPPORT "Not available, libeay missing") + endif() + else() + include_directories(${OPENSSL_INCLUDE_DIR}) + list(APPEND LIBS ${OPENSSL_LIBRARIES}) + set(COMPILE_SSL_SUPPORT 1) + set(CMAKE_STATUS_SSL_SUPPORT "Yes") # CMake FindOpenSSL is incomplete and does not add -lcrypto to LIBS... - LIST(APPEND LIBS -lcrypto) - ENDIF() - ELSE() - SET(CMAKE_STATUS_SSL_SUPPORT "Not available") - ENDIF() -ELSE() - SET(CMAKE_STATUS_SSL_SUPPORT "No") -ENDIF() + list(APPEND LIBS -lcrypto) + endif() + else() + set(CMAKE_STATUS_SSL_SUPPORT "Not available") + endif() +else() + set(CMAKE_STATUS_SSL_SUPPORT "No") +endif() ############################################################################ # Crypt engines support ############################################################################ -OPTION(WANT_CRYPT "Compile Cryptographic Support and Engines" ON) -IF(WANT_CRYPT) - SET(COMPILE_CRYPT_SUPPORT 1) - SET(CMAKE_STATUS_CRYPT_SUPPORT "Yes") -ELSE() - SET(CMAKE_STATUS_CRYPT_SUPPORT "No") -ENDIF() +option(WANT_CRYPT "Compile Cryptographic Support and Engines" ON) +if(WANT_CRYPT) + set(COMPILE_CRYPT_SUPPORT 1) + set(CMAKE_STATUS_CRYPT_SUPPORT "Yes") +else() + set(CMAKE_STATUS_CRYPT_SUPPORT "No") +endif() ############################################################################ # IPv6 support ############################################################################ -OPTION(WANT_IPV6 "Compile IPv6 Support" ON) -IF(WANT_IPV6) - SET(COMPILE_IPV6_SUPPORT 1) - SET(CMAKE_STATUS_IPV6_SUPPORT "Yes") -ELSE() - SET(CMAKE_STATUS_IPV6_SUPPORT "No") -ENDIF() +option(WANT_IPV6 "Compile IPv6 Support" ON) +if(WANT_IPV6) + set(COMPILE_IPV6_SUPPORT 1) + set(CMAKE_STATUS_IPV6_SUPPORT "Yes") +else() + set(CMAKE_STATUS_IPV6_SUPPORT "No") +endif() ############################################################################ # Do we want pseudo-transparency ? ############################################################################ -OPTION(WANT_TRANSPARENCY "Compile Transparency Support" ON) -IF(WANT_TRANSPARENCY) - SET(COMPILE_PSEUDO_TRANSPARENCY 1) - SET(CMAKE_STATUS_TRANSPARENCY_SUPPORT "Yes") -ELSE() - SET(CMAKE_STATUS_TRANSPARENCY_SUPPORT "No") -ENDIF() +option(WANT_TRANSPARENCY "Compile Transparency Support" ON) +if(WANT_TRANSPARENCY) + set(COMPILE_PSEUDO_TRANSPARENCY 1) + set(CMAKE_STATUS_TRANSPARENCY_SUPPORT "Yes") +else() + set(CMAKE_STATUS_TRANSPARENCY_SUPPORT "No") +endif() # Check for Perl support # (note: needed for user documentation generation) -OPTION(WANT_PERL "Compile Perl Support" ON) +option(WANT_PERL "Compile Perl Support" ON) #perl is needed for documentation, too -FIND_PACKAGE(Perl) +find_package(Perl) -IF(WANT_PERL) - IF(PERL_FOUND) - SET(COMPILE_PERL_SUPPORT 1) - SET(CMAKE_STATUS_PERL_SUPPORT "Yes, used for scripting+doc") +if(WANT_PERL) + if(PERL_FOUND) + set(COMPILE_PERL_SUPPORT 1) + set(CMAKE_STATUS_PERL_SUPPORT "Yes, used for scripting+doc") # Get the right flags to link with - EXECUTE_PROCESS( + execute_process( COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ldopts OUTPUT_VARIABLE PERL_LINK_FLAGS ) # Remove new line characters - STRING(REGEX REPLACE "(\r?\n)+$" "" PERL_LINK_FLAGS "${PERL_LINK_FLAGS}") - SET(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} ${PERL_LINK_FLAGS}") + string(REGEX REPLACE "(\r?\n)+$" "" PERL_LINK_FLAGS "${PERL_LINK_FLAGS}") + set(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} ${PERL_LINK_FLAGS}") # Remove leading and trailing spaces (string strip) - STRING(REGEX REPLACE "(^( )+|( )+$)" "" ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") + string(REGEX REPLACE "(^( )+|( )+$)" "" ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") # Kill any possible --no-undefined flags - STRING(REPLACE "-Wl,--no-undefined" "" ADDITIONAL_LINK_FLAGS ${ADDITIONAL_LINK_FLAGS}) - ELSE() - SET(CMAKE_STATUS_PERL_SUPPORT "No") - ENDIF() -ELSE() - IF(PERL_FOUND) - SET(CMAKE_STATUS_PERL_SUPPORT "Used for doc, but scripting disabled by user") - ELSE() - SET(CMAKE_STATUS_PERL_SUPPORT "No") - ENDIF() -ENDIF() + string(REPLACE "-Wl,--no-undefined" "" ADDITIONAL_LINK_FLAGS ${ADDITIONAL_LINK_FLAGS}) + else() + set(CMAKE_STATUS_PERL_SUPPORT "No") + endif() +else() + if(PERL_FOUND) + set(CMAKE_STATUS_PERL_SUPPORT "Used for doc, but scripting disabled by user") + else() + set(CMAKE_STATUS_PERL_SUPPORT "No") + endif() +endif() # Check for Python support -OPTION(WANT_PYTHON "Compile Python Support" ON) -IF(WANT_PYTHON) +option(WANT_PYTHON "Compile Python Support" ON) +if(WANT_PYTHON) # this should ensure that cmake prefers python 2.7 over python 3 # it's not neede from cmake 2.8.8 onwards - SET(Python_ADDITIONAL_VERSIONS 2.7) - FIND_PACKAGE(PythonLibs) - IF(PYTHONLIBS_FOUND) - SET(COMPILE_PYTHON_SUPPORT 1) - SET(CMAKE_STATUS_PYTHON_SUPPORT "Yes") + set(Python_ADDITIONAL_VERSIONS 2.7) + find_package(PythonLibs) + if(PYTHONLIBS_FOUND) + set(COMPILE_PYTHON_SUPPORT 1) + set(CMAKE_STATUS_PYTHON_SUPPORT "Yes") #under win32/mingw, if no link flag is needed ${PYTHON_LFLAGS} is set to a braindead "None" -# STRING(REPLACE "None" "" PYTHON_LIBRARIES "${PYTHON_LIBRARIES}") -# SET(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} ${PYTHON_LIBRARIES}") +# string(REPLACE "None" "" PYTHON_LIBRARIES "${PYTHON_LIBRARIES}") +# set(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} ${PYTHON_LIBRARIES}") # Remove leading and trailing spaces (string strip) -# STRING(REGEX REPLACE "(^( )+|( )+$)" "" ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") +# string(REGEX REPLACE "(^( )+|( )+$)" "" ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") # Kill any possible --no-undefined flags -# STRING(REPLACE "-Wl,--no-undefined" "" ADDITIONAL_LINK_FLAGS ${ADDITIONAL_LINK_FLAGS}) +# string(REPLACE "-Wl,--no-undefined" "" ADDITIONAL_LINK_FLAGS ${ADDITIONAL_LINK_FLAGS}) - IF(WANT_DEBUG) - LIST(APPEND LIBS ${PYTHON_DEBUG_LIBRARIES}) - ELSE() - LIST(APPEND LIBS ${PYTHON_LIBRARIES}) - ENDIF() + if(WANT_DEBUG) + list(APPEND LIBS ${PYTHON_DEBUG_LIBRARIES}) + else() + list(APPEND LIBS ${PYTHON_LIBRARIES}) + endif() - IF(DEFINED PYTHON_INCLUDE_DIRS) - INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS}) - ELSE() - INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) - ENDIF() - ELSE() - SET(CMAKE_STATUS_PYTHON_SUPPORT "No, not found.") - ENDIF() -ELSE() - SET(CMAKE_STATUS_PYTHON_SUPPORT "No") -ENDIF() + if(DEFINED PYTHON_INCLUDE_DIRS) + include_directories(${PYTHON_INCLUDE_DIRS}) + else() + include_directories(${PYTHON_INCLUDE_PATH}) + endif() + else() + set(CMAKE_STATUS_PYTHON_SUPPORT "No, not found.") + endif() +else() + set(CMAKE_STATUS_PYTHON_SUPPORT "No") +endif() ############################################################################ # IPC (inter-process communication) support ############################################################################ -OPTION(WANT_IPC "Compile Inter-Process Communication Support" ON) -IF(WANT_IPC) - SET(CMAKE_STATUS_IPC_SUPPORT "Yes") -ELSE() - SET(COMPILE_NO_IPC 1) - SET(CMAKE_STATUS_IPC_SUPPORT "No") -ENDIF() +option(WANT_IPC "Compile Inter-Process Communication Support" ON) +if(WANT_IPC) + set(CMAKE_STATUS_IPC_SUPPORT "Yes") +else() + set(COMPILE_NO_IPC 1) + set(CMAKE_STATUS_IPC_SUPPORT "No") +endif() ############################################################################ # NETWORK FUNCTIONS support ############################################################################ -INCLUDE(CheckFunctionExists) +include(CheckFunctionExists) CHECK_FUNCTION_EXISTS("inet_ntoa" HAVE_INET_NTOA_EXISTS) # what systems lacks this!? -IF(HAVE_INET_NTOA_EXISTS) - SET(HAVE_INET_NTOA 1) -ENDIF() +if(HAVE_INET_NTOA_EXISTS) + set(HAVE_INET_NTOA 1) +endif() CHECK_FUNCTION_EXISTS("inet_aton" HAVE_INET_ATON_EXISTS) # what systems lacks this!? -IF(HAVE_INET_ATON_EXISTS) - SET(HAVE_INET_ATON 1) -ENDIF() +if(HAVE_INET_ATON_EXISTS) + set(HAVE_INET_ATON 1) +endif() # Check GET_INTERFACE_ADDRESS support -FIND_PATH(GET_INTERFACE_ADDRESS_INCLUDE_DIR net/if.h) -IF(GET_INTERFACE_ADDRESS_INCLUDE_DIR) - SET(COMPILE_GET_INTERFACE_ADDRESS 1) -ENDIF() +find_path(GET_INTERFACE_ADDRESS_INCLUDE_DIR net/if.h) +if(GET_INTERFACE_ADDRESS_INCLUDE_DIR) + set(COMPILE_GET_INTERFACE_ADDRESS 1) +endif() ############################################################################ # SetEnv/PutEnv support ############################################################################ CHECK_FUNCTION_EXISTS("setenv" HAVE_SETENV_EXISTS) # what systems lacks this!? -IF(HAVE_SETENV_EXISTS) - SET(HAVE_SETENV 1) -ENDIF() +if(HAVE_SETENV_EXISTS) + set(HAVE_SETENV 1) +endif() CHECK_FUNCTION_EXISTS("putenv" HAVE_PUTENV_EXISTS) # what systems lacks this!? -IF(HAVE_PUTENV_EXISTS) - SET(HAVE_PUTENV 1) -ENDIF() +if(HAVE_PUTENV_EXISTS) + set(HAVE_PUTENV 1) +endif() ############################################################################ # GSM support ############################################################################ -OPTION(WANT_GSM "Compile GSM Support" ON) -IF(WANT_GSM) - SET(COMPILE_USE_GSM 1) - SET(CMAKE_STATUS_GSM_SUPPORT "Yes") -ELSE() - SET(CMAKE_STATUS_GSM_SUPPORT "No") -ENDIF() +option(WANT_GSM "Compile GSM Support" ON) +if(WANT_GSM) + set(COMPILE_USE_GSM 1) + set(CMAKE_STATUS_GSM_SUPPORT "Yes") +else() + set(CMAKE_STATUS_GSM_SUPPORT "No") +endif() ############################################################################ # DCC canvas support ############################################################################ -OPTION(WANT_DCC_CANVAS "Compile DCC Canvas Support" OFF) -IF(WANT_DCC_CANVAS) - SET(CMAKE_STATUS_DCC_CANVAS_SUPPORT "Yes") - SET(COMPILE_DCC_CANVAS 1) -ELSE() - SET(CMAKE_STATUS_DCC_CANVAS_SUPPORT "No") -ENDIF() +option(WANT_DCC_CANVAS "Compile DCC Canvas Support" OFF) +if(WANT_DCC_CANVAS) + set(CMAKE_STATUS_DCC_CANVAS_SUPPORT "Yes") + set(COMPILE_DCC_CANVAS 1) +else() + set(CMAKE_STATUS_DCC_CANVAS_SUPPORT "No") +endif() ############################################################################ # DCC voice support @@ -915,219 +915,219 @@ CHECK_INCLUDE_FILE(linux/soundcard.h CMAKE_HAVE_LINUX_SOUNDCARD_H) CHECK_INCLUDE_FILE(sys/soundcard.h CMAKE_HAVE_SYS_SOUNDCARD_H) CHECK_INCLUDE_FILE(soundcard.h CMAKE_HAVE_SOUNDCARD_H) -OPTION(WANT_DCC_VOICE "Compile DCC Voice Support" ON) -IF(WANT_DCC_VOICE) - IF(CMAKE_HAVE_LINUX_SOUNDCARD_H) - SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "Yes, found linux/soundcard.h") - SET(HAVE_LINUX_SOUNDCARD_H 1) - ELSEIF(CMAKE_HAVE_SYS_SOUNDCARD_H) - SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "Yes, found sys/soundcard.h") - SET(HAVE_SYS_SOUNDCARD_H 1) - ELSEIF(CMAKE_HAVE_SOUNDCARD_H) - SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "Yes, found soundcard.h") - SET(HAVE_SOUNDCARD_H 1) - ELSE() - SET(COMPILE_DISABLE_DCC_VOICE 1) - SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "No, soundcard.h not found") - ENDIF() -ELSE() - SET(COMPILE_DISABLE_DCC_VOICE 1) - SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "No") -ENDIF() +option(WANT_DCC_VOICE "Compile DCC Voice Support" ON) +if(WANT_DCC_VOICE) + if(CMAKE_HAVE_LINUX_SOUNDCARD_H) + set(CMAKE_STATUS_DCC_VOICE_SUPPORT "Yes, found linux/soundcard.h") + set(HAVE_LINUX_SOUNDCARD_H 1) + elseif(CMAKE_HAVE_SYS_SOUNDCARD_H) + set(CMAKE_STATUS_DCC_VOICE_SUPPORT "Yes, found sys/soundcard.h") + set(HAVE_SYS_SOUNDCARD_H 1) + elseif(CMAKE_HAVE_SOUNDCARD_H) + set(CMAKE_STATUS_DCC_VOICE_SUPPORT "Yes, found soundcard.h") + set(HAVE_SOUNDCARD_H 1) + else() + set(COMPILE_DISABLE_DCC_VOICE 1) + set(CMAKE_STATUS_DCC_VOICE_SUPPORT "No, soundcard.h not found") + endif() +else() + set(COMPILE_DISABLE_DCC_VOICE 1) + set(CMAKE_STATUS_DCC_VOICE_SUPPORT "No") +endif() ############################################################################ # Dcc video support + extended webcam support (LibV4L2) ############################################################################ -OPTION(WANT_DCC_VIDEO "Compile DCC Video Support" OFF) +option(WANT_DCC_VIDEO "Compile DCC Video Support" OFF) -IF(WANT_DCC_VIDEO) - FIND_PATH(V4L_DEV1_INCLUDE_DIR NAMES linux/videodev.h) - IF(V4L_DEV1_INCLUDE_DIR) - SET(COMPILE_V4L1_CODE 1) - SET(CMAKE_STATUS_DCC_VIDEO_SUPPORT "Yes") - ELSE() - FIND_PATH(V4L_DEV2_INCLUDE_DIR NAMES linux/videodev2.h) - IF(V4L_DEV2_INCLUDE_DIR) - SET(CMAKE_STATUS_DCC_VIDEO_SUPPORT "Yes") - SET(COMPILE_V4L1_CODE 0) - ELSE() - SET(COMPILE_DISABLE_AVDEVICE 1) - SET(COMPILE_DISABLE_DCC_VIDEO 1) - SET(COMPILE_V4L1_CODE 0) - SET(HAVE_LIBV4L2 0) - SET(CMAKE_STATUS_DCC_VIDEO_SUPPORT "Not available") - ENDIF() - ENDIF() +if(WANT_DCC_VIDEO) + find_path(V4L_DEV1_INCLUDE_DIR NAMES linux/videodev.h) + if(V4L_DEV1_INCLUDE_DIR) + set(COMPILE_V4L1_CODE 1) + set(CMAKE_STATUS_DCC_VIDEO_SUPPORT "Yes") + else() + find_path(V4L_DEV2_INCLUDE_DIR NAMES linux/videodev2.h) + if(V4L_DEV2_INCLUDE_DIR) + set(CMAKE_STATUS_DCC_VIDEO_SUPPORT "Yes") + set(COMPILE_V4L1_CODE 0) + else() + set(COMPILE_DISABLE_AVDEVICE 1) + set(COMPILE_DISABLE_DCC_VIDEO 1) + set(COMPILE_V4L1_CODE 0) + set(HAVE_LIBV4L2 0) + set(CMAKE_STATUS_DCC_VIDEO_SUPPORT "Not available") + endif() + endif() - IF(NOT COMPILE_DISABLE_AVDEVICE) - FIND_PACKAGE(LibV4L2) - IF(LIBV4L2_FOUND) - SET(CMAKE_STATUS_DCC_VIDEO_SUPPORT "Yes, with LibV4L2") - SET(HAVE_LIBV4L2 1) - SET(V4L2_CAP_VIDEO_CAPTURE 1) - LIST(APPEND LIBS ${LIBV4L2_LIBRARY}) - ENDIF() - ENDIF() -ELSE() - SET(COMPILE_DISABLE_AVDEVICE 1) - SET(COMPILE_DISABLE_DCC_VIDEO 1) - SET(COMPILE_V4L1_CODE 0) - SET(HAVE_LIBV4L2 0) - SET(CMAKE_STATUS_DCC_VIDEO_SUPPORT "No") -ENDIF() + if(NOT COMPILE_DISABLE_AVDEVICE) + find_package(LibV4L2) + if(LIBV4L2_FOUND) + set(CMAKE_STATUS_DCC_VIDEO_SUPPORT "Yes, with LibV4L2") + set(HAVE_LIBV4L2 1) + set(V4L2_CAP_VIDEO_CAPTURE 1) + list(APPEND LIBS ${LIBV4L2_LIBRARY}) + endif() + endif() +else() + set(COMPILE_DISABLE_AVDEVICE 1) + set(COMPILE_DISABLE_DCC_VIDEO 1) + set(COMPILE_V4L1_CODE 0) + set(HAVE_LIBV4L2 0) + set(CMAKE_STATUS_DCC_VIDEO_SUPPORT "No") +endif() ############################################################################ # Ogg/Vorbis and Ogg/Theora support ############################################################################ -OPTION(WANT_OGG_THEORA "Compile Ogg/Vorbis+Theora Support" OFF) +option(WANT_OGG_THEORA "Compile Ogg/Vorbis+Theora Support" OFF) -IF(WANT_OGG_THEORA) - FIND_PACKAGE(Theora) - IF(THEORA_FOUND) - SET(CMAKE_STATUS_OGG_THEORA_SUPPORT "Yes") - LIST(APPEND LIBS ${THEORA_LIBRARY}) - INCLUDE_DIRECTORIES(${THEORA_INCLUDE_DIR}) - ELSE() - SET(COMPILE_DISABLE_OGG_THEORA 1) - SET(CMAKE_STATUS_OGG_THEORA_SUPPORT "No") - ENDIF() -ELSE() - SET(COMPILE_DISABLE_OGG_THEORA 1) - SET(CMAKE_STATUS_OGG_THEORA_SUPPORT "No") -ENDIF() +if(WANT_OGG_THEORA) + find_package(Theora) + if(THEORA_FOUND) + set(CMAKE_STATUS_OGG_THEORA_SUPPORT "Yes") + list(APPEND LIBS ${THEORA_LIBRARY}) + include_directories(${THEORA_INCLUDE_DIR}) + else() + set(COMPILE_DISABLE_OGG_THEORA 1) + set(CMAKE_STATUS_OGG_THEORA_SUPPORT "No") + endif() +else() + set(COMPILE_DISABLE_OGG_THEORA 1) + set(CMAKE_STATUS_OGG_THEORA_SUPPORT "No") +endif() ############################################################################ # Memory profiling support ############################################################################ -OPTION(WANT_MEMORY_PROFILE "Compile Memory Profiling Support" OFF) -IF(WANT_MEMORY_PROFILE) - SET(COMPILE_MEMORY_PROFILE 1) - SET(CMAKE_STATUS_MEMORY_PROFILE_SUPPORT "User enabled") -ELSE() - SET(CMAKE_STATUS_MEMORY_PROFILE_SUPPORT "No") -ENDIF() +option(WANT_MEMORY_PROFILE "Compile Memory Profiling Support" OFF) +if(WANT_MEMORY_PROFILE) + set(COMPILE_MEMORY_PROFILE 1) + set(CMAKE_STATUS_MEMORY_PROFILE_SUPPORT "User enabled") +else() + set(CMAKE_STATUS_MEMORY_PROFILE_SUPPORT "No") +endif() ############################################################################ # Memory checks support ############################################################################ -OPTION(WANT_MEMORY_CHECKS "Compile Memory Checking Support" OFF) -IF(WANT_MEMORY_CHECKS) - SET(COMPILE_MEMORY_CHECKS 1) - SET(CMAKE_STATUS_MEMORY_CHECKS_SUPPORT "User enabled") -ELSE() - SET(CMAKE_STATUS_MEMORY_CHECKS_SUPPORT "No") -ENDIF() +option(WANT_MEMORY_CHECKS "Compile Memory Checking Support" OFF) +if(WANT_MEMORY_CHECKS) + set(COMPILE_MEMORY_CHECKS 1) + set(CMAKE_STATUS_MEMORY_CHECKS_SUPPORT "User enabled") +else() + set(CMAKE_STATUS_MEMORY_CHECKS_SUPPORT "No") +endif() ############################################################################ # Win32 mingw/cmake build checks ############################################################################ -IF(WIN32) - ADD_DEFINITIONS(-D_WIN32_WINNT=0x501 -DWINVER=0x501) -ENDIF() +if(WIN32) + add_definitions(-D_WIN32_WINNT=0x501 -DWINVER=0x501) +endif() -IF(MINGW) - LIST(APPEND LIBS -lshlwapi) - ADD_DEFINITIONS(-DMINGW) - SET(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc -fno-exceptions") +if(MINGW) + list(APPEND LIBS -lshlwapi) + add_definitions(-DMINGW) + set(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc -fno-exceptions") #remove leading and trailing spaces (string strip) - STRING(REGEX REPLACE "(^( )+|( )+$)" "" ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") -ENDIF() + string(REGEX REPLACE "(^( )+|( )+$)" "" ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") +endif() -IF(MSVC) - ADD_DEFINITIONS(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) - ADD_DEFINITIONS(-DMSVC) -ENDIF() +if(MSVC) + add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES) + add_definitions(-DMSVC) +endif() ############################################################################ # Very important checks ############################################################################ -OPTION(WANT_PIZZA "Pizza for everyone" OFF) -IF(WANT_PIZZA) - MESSAGE(STATUS "Checking for mozzarella...") - MESSAGE(STATUS "Checking for mozzarella - found") - MESSAGE(STATUS "Checking for tomatoes...") - MESSAGE(STATUS "Checking for tomatoes... - found") - MESSAGE(STATUS "Starting up the oven...") - MESSAGE(STATUS "Starting up the oven... - done") -ENDIF() +option(WANT_PIZZA "Pizza for everyone" OFF) +if(WANT_PIZZA) + message(STATUS "Checking for mozzarella...") + message(STATUS "Checking for mozzarella - found") + message(STATUS "Checking for tomatoes...") + message(STATUS "Checking for tomatoes... - found") + message(STATUS "Starting up the oven...") + message(STATUS "Starting up the oven... - done") +endif() -OPTION(WANT_BEER "Add some PaleALE to the compilation" OFF) -IF(WANT_BEER) - MESSAGE(STATUS "Checking for beer...") - MESSAGE(STATUS "Checking for beer... - found") - MESSAGE(STATUS "Opening the beer...") - MESSAGE(STATUS "Opening the beer... - done") -ENDIF() +option(WANT_BEER "Add some PaleALE to the compilation" OFF) +if(WANT_BEER) + message(STATUS "Checking for beer...") + message(STATUS "Checking for beer... - found") + message(STATUS "Opening the beer...") + message(STATUS "Opening the beer... - done") +endif() ############################################################################ # By default we disable QGtkStyle since it messes up with our theming # Some users wants it anyway, and we sometimes needs to check it ############################################################################ -OPTION(WANT_GTKSTYLE "Enable QGtkStyle" OFF) -IF(WANT_GTKSTYLE) - SET(COMPILE_ENABLE_GTKSTYLE 1) -ENDIF() +option(WANT_GTKSTYLE "Enable QGtkStyle" OFF) +if(WANT_GTKSTYLE) + set(COMPILE_ENABLE_GTKSTYLE 1) +endif() ############################################################################### # # Translation (GetText) checks # ############################################################################### -OPTION(WANT_GETTEXT "Whether to use GetText to generate translations" ON) -IF(WANT_GETTEXT) - FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge) - FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt) - FIND_PROGRAM(GETTEXT_XGETTEXT_EXECUTABLE xgettext) - FIND_PROGRAM(SED_EXECUTABLE sed) +option(WANT_GETTEXT "Whether to use GetText to generate translations" ON) +if(WANT_GETTEXT) + find_program(GETTEXT_MSGMERGE_EXECUTABLE msgmerge) + find_program(GETTEXT_MSGFMT_EXECUTABLE msgfmt) + find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext) + find_program(SED_EXECUTABLE sed) - IF(GETTEXT_MSGFMT_EXECUTABLE) - ADD_CUSTOM_TARGET("kvirc-translations" ALL) - SET(CMAKE_STATUS_GETTEXT_SUPPORT "Yes") - SET(USE_GETTEXT_TRANSLATIONS 1) - ELSE() - SET(CMAKE_STATUS_GETTEXT_SUPPORT "No") - SET(USE_GETTEXT_TRANSLATIONS 0) - ENDIF() - IF(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_XGETTEXT_EXECUTABLE) + if(GETTEXT_MSGFMT_EXECUTABLE) + add_custom_target("kvirc-translations" ALL) + set(CMAKE_STATUS_GETTEXT_SUPPORT "Yes") + set(USE_GETTEXT_TRANSLATIONS 1) + else() + set(CMAKE_STATUS_GETTEXT_SUPPORT "No") + set(USE_GETTEXT_TRANSLATIONS 0) + endif() + if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_XGETTEXT_EXECUTABLE) # messages-update target; - ADD_CUSTOM_TARGET(messages-update) + add_custom_target(messages-update) # messages-extract target; - ADD_CUSTOM_TARGET(messages-extract) - ADD_DEPENDENCIES(messages-update messages-extract) - SET(USE_GETTEXT_EXTRA 1) - SET(GETTEXT_EXTRA_STATUS ", + extra") - ELSE() - SET(USE_GETTEXT_EXTRA 0) - SET(GETTEXT_EXTRA_STATUS) - ENDIF() + add_custom_target(messages-extract) + add_dependencies(messages-update messages-extract) + set(USE_GETTEXT_EXTRA 1) + set(GETTEXT_EXTRA_STATUS ", + extra") + else() + set(USE_GETTEXT_EXTRA 0) + set(GETTEXT_EXTRA_STATUS) + endif() - IF(SED_EXECUTABLE) + if(SED_EXECUTABLE) # wipes absolute paths from .pot? files, by mren - ADD_CUSTOM_TARGET(messages-tidy) - FILE(GLOB_RECURSE FILES_TO_TIDY ${CMAKE_SOURCE_DIR}/po/*.po) - FILE(GLOB_RECURSE POTS_TO_TIDY ${CMAKE_SOURCE_DIR}/po/*.pot) - LIST(APPEND FILES_TO_TIDY ${POTS_TO_TIDY}) - FOREACH(curFile ${FILES_TO_TIDY}) - ADD_CUSTOM_COMMAND(TARGET messages-tidy + add_custom_target(messages-tidy) + file(GLOB_RECURSE FILES_TO_TIDY ${CMAKE_SOURCE_DIR}/po/*.po) + file(GLOB_RECURSE POTS_TO_TIDY ${CMAKE_SOURCE_DIR}/po/*.pot) + list(APPEND FILES_TO_TIDY ${POTS_TO_TIDY}) + foreach(curFile ${FILES_TO_TIDY}) + add_custom_command(TARGET messages-tidy COMMENT "Tidying ${curFile}..." COMMAND ${SED_EXECUTABLE} -i -e "s|^#:.*/\\(src/.*\\)$|#: \\1|g" "${curFile}" VERBATIM DEPENDS ${curFile} ) - ENDFOREACH() - IF(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_XGETTEXT_EXECUTABLE) - ADD_DEPENDENCIES(messages-update messages-tidy) - ENDIF() - SET(CMAKE_STATUS_MESSAGE_TIDY "Yes") - ELSE() - SET(CMAKE_STATUS_MESSAGE_TIDY "Sed not found") - ENDIF() + endforeach() + if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_XGETTEXT_EXECUTABLE) + add_dependencies(messages-update messages-tidy) + endif() + set(CMAKE_STATUS_MESSAGE_TIDY "Yes") + else() + set(CMAKE_STATUS_MESSAGE_TIDY "Sed not found") + endif() -ELSE() - SET(CMAKE_STATUS_GETTEXT_SUPPORT "No") -ENDIF() +else() + set(CMAKE_STATUS_GETTEXT_SUPPORT "No") +endif() #Unused by now @@ -1137,12 +1137,12 @@ ENDIF() #CheckLibraryExists.cmake # Search for subdirectories; under osx, data _MUST_ be before src (to get Info.plist installed before the main executable's fixup_bundle step) -SUBDIRS(data doc po scripts src) +subdirs(data doc po scripts src) #install additional resources for win32 -IF(WIN32) - ADD_SUBDIRECTORY(win32build) -ENDIF() +if(WIN32) + add_subdirectory(win32build) +endif() ############################################################################### # # The API documentation target @@ -1150,28 +1150,28 @@ ENDIF() ############################################################################### -OPTION(WANT_DOXYGEN "Whether to use Doxygen to generate documentation" ON) -IF(WANT_DOXYGEN) - FIND_PACKAGE(Doxygen) - IF(DOXYGEN_FOUND) - SET(CMAKE_STATUS_DOXYGEN_SUPPORT "Yes") - ADD_CUSTOM_TARGET( +option(WANT_DOXYGEN "Whether to use Doxygen to generate documentation" ON) +if(WANT_DOXYGEN) + find_package(Doxygen) + if(DOXYGEN_FOUND) + set(CMAKE_STATUS_DOXYGEN_SUPPORT "Yes") + add_custom_target( devdocs @echo Generating api documentation ) - ADD_CUSTOM_COMMAND( + add_custom_command( COMMENT "generate the api documentation" COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/api COMMAND cd ${CMAKE_BINARY_DIR}/admin && ${DOXYGEN_EXECUTABLE} Doxyfile TARGET devdocs ) - ELSE() - SET(CMAKE_STATUS_DOXYGEN_SUPPORT "No") - ENDIF() -ELSE() - SET(CMAKE_STATUS_DOXYGEN_SUPPORT "No") -ENDIF() + else() + set(CMAKE_STATUS_DOXYGEN_SUPPORT "No") + endif() +else() + set(CMAKE_STATUS_DOXYGEN_SUPPORT "No") +endif() ############################################################################### # @@ -1180,12 +1180,12 @@ ENDIF() ############################################################################### #currently WIP -#OPTION(WANT_USERDOCS "Whether to generate user documentation (aka internal help)" ON) -#IF(WANT_USERDOCS) -# SET(CMAKE_STATUS_GEN_USERDOC "Yes") -#ELSE() -# SET(CMAKE_STATUS_GEN_USERDOC "User disabled") -#ENDIF() +#option(WANT_USERDOCS "Whether to generate user documentation (aka internal help)" ON) +#if(WANT_USERDOCS) +# set(CMAKE_STATUS_GEN_USERDOC "Yes") +#else() +# set(CMAKE_STATUS_GEN_USERDOC "User disabled") +#endif() ############################################################################### # @@ -1193,12 +1193,12 @@ ENDIF() # ############################################################################### -IF(UNIX) - ADD_CUSTOM_TARGET( +if(UNIX) + add_custom_target( distclean @echo Cleaning for source distribution ) - SET( + set( DISTCLEANED cmake.depends cmake.check_depends @@ -1212,14 +1212,14 @@ IF(UNIX) gmon.out *~ ) - ADD_CUSTOM_COMMAND( + add_custom_command( TARGET distclean POST_BUILD DEPENDS clean COMMENT "distribution clean" COMMAND rm ARGS -Rf CMakeTmp CMakeFiles doc/api ${DISTCLEANED} ) -ENDIF() +endif() ############################################################################### @@ -1234,179 +1234,179 @@ ENDIF() # inside the sources to include kvi_sysbuildinfo.h in only ONE file (so only # linking of kvilib is done if only kvi_sysbuildinfo.h changes. -IF(EXISTS ${PROJECT_BINARY_DIR}/kvi_sysconfig.h) +if(EXISTS ${PROJECT_BINARY_DIR}/kvi_sysconfig.h) # an old config exists; let's check if it's actual: - CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/kvi_sysconfig.h.cmake ${PROJECT_BINARY_DIR}/kvi_sysconfig.h.new) - FILE(READ ${PROJECT_BINARY_DIR}/kvi_sysconfig.h OLD_CONFIG_CONTENTS) - FILE(READ ${PROJECT_BINARY_DIR}/kvi_sysconfig.h.new NEW_CONFIG_CONTENTS) - STRING(COMPARE EQUAL "${OLD_CONFIG_CONTENTS}" "${NEW_CONFIG_CONTENTS}" CONFIG_IS_UPTODATE) - IF(${CONFIG_IS_UPTODATE}) + configure_file(${PROJECT_SOURCE_DIR}/cmake/kvi_sysconfig.h.cmake ${PROJECT_BINARY_DIR}/kvi_sysconfig.h.new) + file(READ ${PROJECT_BINARY_DIR}/kvi_sysconfig.h OLD_CONFIG_CONTENTS) + file(READ ${PROJECT_BINARY_DIR}/kvi_sysconfig.h.new NEW_CONFIG_CONTENTS) + string(COMPARE EQUAL "${OLD_CONFIG_CONTENTS}" "${NEW_CONFIG_CONTENTS}" CONFIG_IS_UPTODATE) + if(${CONFIG_IS_UPTODATE}) # we don't overwrite the kvi_sysconfig.h file to gain compilation time - FILE(REMOVE ${PROJECT_BINARY_DIR}/kvi_sysconfig.h.new) - ELSE() + file(REMOVE ${PROJECT_BINARY_DIR}/kvi_sysconfig.h.new) + else() # let's overwrite the kvi_sysconfig.h file (config has changed) # FIXME: this is tricky, better use ${CMAKE_COMMAND} -E - FILE(REMOVE ${PROJECT_BINARY_DIR}/kvi_sysconfig.h.new) - CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/kvi_sysconfig.h.cmake ${PROJECT_BINARY_DIR}/kvi_sysconfig.h) - ENDIF() -ELSE() + file(REMOVE ${PROJECT_BINARY_DIR}/kvi_sysconfig.h.new) + configure_file(${PROJECT_SOURCE_DIR}/cmake/kvi_sysconfig.h.cmake ${PROJECT_BINARY_DIR}/kvi_sysconfig.h) + endif() +else() # no old config - CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/kvi_sysconfig.h.cmake ${PROJECT_BINARY_DIR}/kvi_sysconfig.h) -ENDIF() + configure_file(${PROJECT_SOURCE_DIR}/cmake/kvi_sysconfig.h.cmake ${PROJECT_BINARY_DIR}/kvi_sysconfig.h) +endif() -CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/kvi_sysbuildinfo.h.cmake ${PROJECT_BINARY_DIR}/kvi_sysbuildinfo.h) +configure_file(${PROJECT_SOURCE_DIR}/cmake/kvi_sysbuildinfo.h.cmake ${PROJECT_BINARY_DIR}/kvi_sysbuildinfo.h) -INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) +include_directories(${PROJECT_BINARY_DIR}) -IF(WANT_COEXISTENCE) - CONFIGURE_FILE(${kvirc_SOURCE_DIR}/cmake/kvirc-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/scripts/config/kvirc${VERSION_MAJOR}-config @ONLY) -ELSE() - CONFIGURE_FILE(${kvirc_SOURCE_DIR}/cmake/kvirc-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/scripts/config/kvirc-config @ONLY) -ENDIF() +if(WANT_COEXISTENCE) + configure_file(${kvirc_SOURCE_DIR}/cmake/kvirc-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/scripts/config/kvirc${VERSION_MAJOR}-config @ONLY) +else() + configure_file(${kvirc_SOURCE_DIR}/cmake/kvirc-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/scripts/config/kvirc-config @ONLY) +endif() -#CONFIGURE_FILE(${kvirc_SOURCE_DIR}/cmake/FindKVIrc.cmake.in ${kvirc_BINARY_DIR}/FindKVIrc.cmake @ONLY) +#configure_file(${kvirc_SOURCE_DIR}/cmake/FindKVIrc.cmake.in ${kvirc_BINARY_DIR}/FindKVIrc.cmake @ONLY) -IF(WANT_DOXYGEN) - IF(DOXYGEN_FOUND) - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/Doxyfile.cmake ${CMAKE_BINARY_DIR}/admin/Doxyfile @ONLY) - ENDIF() -ENDIF() +if(WANT_DOXYGEN) + if(DOXYGEN_FOUND) + configure_file(${CMAKE_SOURCE_DIR}/cmake/Doxyfile.cmake ${CMAKE_BINARY_DIR}/admin/Doxyfile @ONLY) + endif() +endif() ############################################################################### # Mark as advanced some variables we really don't want to see in "simple" mode # All of them *should* be auto-detected. ############################################################################### -MARK_AS_ADVANCED(FORCE QT_QMAKE_EXECUTABLE) -MARK_AS_ADVANCED(FORCE GETTEXT_MSGFMT_EXECUTABLE) -MARK_AS_ADVANCED(FORCE GETTEXT_MSGMERGE_EXECUTABLE) -MARK_AS_ADVANCED(FORCE LIBRARY_OUTPUT_PATH) -MARK_AS_ADVANCED(FORCE CMAKE_BACKWARDS_COMPATIBILITY) -MARK_AS_ADVANCED(FORCE EXECUTABLE_OUTPUT_PATH) +mark_as_advanced(FORCE QT_QMAKE_EXECUTABLE) +mark_as_advanced(FORCE GETTEXT_MSGFMT_EXECUTABLE) +mark_as_advanced(FORCE GETTEXT_MSGMERGE_EXECUTABLE) +mark_as_advanced(FORCE LIBRARY_OUTPUT_PATH) +mark_as_advanced(FORCE CMAKE_BACKWARDS_COMPATIBILITY) +mark_as_advanced(FORCE EXECUTABLE_OUTPUT_PATH) ############################################################################### # ADD LINK FLAGS TO LIBS: THIS HAVE TO BE DONE AT LAST ############################################################################### -LIST(APPEND LIBS "${ADDITIONAL_LINK_FLAGS}") +list(APPEND LIBS "${ADDITIONAL_LINK_FLAGS}") ############################################################################### # FINAL OUTPUT ############################################################################### # Binary path -IF(UNIX) - IF(APPLE) - SET(KVIRC_BIN_PATH ${CMAKE_INSTALL_PREFIX}/Contents/MacOS/) - ELSE() +if(UNIX) + if(APPLE) + set(KVIRC_BIN_PATH ${CMAKE_INSTALL_PREFIX}/Contents/MacOS/) + else() # Assume linux - SET(KVIRC_BIN_PATH ${CMAKE_INSTALL_PREFIX}/bin/) - ENDIF() -ELSEIF(WIN32) - SET(KVIRC_BIN_PATH ${CMAKE_INSTALL_PREFIX}/) -ENDIF() + set(KVIRC_BIN_PATH ${CMAKE_INSTALL_PREFIX}/bin/) + endif() +elseif(WIN32) + set(KVIRC_BIN_PATH ${CMAKE_INSTALL_PREFIX}/) +endif() # KviLib path -IF(UNIX) - IF(APPLE) - SET(KVIRC_LIB_PATH ${CMAKE_INSTALL_PREFIX}/Contents/MacOS/) - ELSE() +if(UNIX) + if(APPLE) + set(KVIRC_LIB_PATH ${CMAKE_INSTALL_PREFIX}/Contents/MacOS/) + else() # Assume linux - SET(KVIRC_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/) - ENDIF() -ELSEIF(WIN32) - SET(KVIRC_LIB_PATH ${CMAKE_INSTALL_PREFIX}/) -ENDIF() + set(KVIRC_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/) + endif() +elseif(WIN32) + set(KVIRC_LIB_PATH ${CMAKE_INSTALL_PREFIX}/) +endif() # Modules path -IF(UNIX) - IF(APPLE) - SET(KVIRC_MOD_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/) - ELSE() +if(UNIX) + if(APPLE) + set(KVIRC_MOD_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/) + else() # Assume linux - SET(KVIRC_MOD_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/kvirc/${VERSION_BRANCH}/modules/) - ENDIF() -ELSEIF(WIN32) - SET(KVIRC_MOD_PATH ${CMAKE_INSTALL_PREFIX}/modules/) -ENDIF() + set(KVIRC_MOD_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/kvirc/${VERSION_BRANCH}/modules/) + endif() +elseif(WIN32) + set(KVIRC_MOD_PATH ${CMAKE_INSTALL_PREFIX}/modules/) +endif() # Man path -IF(UNIX) - IF(APPLE) +if(UNIX) + if(APPLE) # does MacOS X use man pages? <= yes! - ELSE() + else() # Assume linux - SET(KVIRC_MAN_PATH ${CMAKE_INSTALL_PREFIX}/${MANDIR_PREFIX}/) - ENDIF() -ELSE() - SET(KVIRC_MAN_PATH "Not available") -ENDIF() + set(KVIRC_MAN_PATH ${CMAKE_INSTALL_PREFIX}/${MANDIR_PREFIX}/) + endif() +else() + set(KVIRC_MAN_PATH "Not available") +endif() -MESSAGE(STATUS " ") -MESSAGE(STATUS "Ok, this is the configuration I've worked out:") -IF(${CONFIG_IS_UPTODATE}) - MESSAGE(STATUS "(I found an old config that was exactly the same and kept it to save compilation time)") -ENDIF() -MESSAGE(STATUS " ") -MESSAGE(STATUS "Paths:") -MESSAGE(STATUS " Binary Path : ${KVIRC_BIN_PATH}") -MESSAGE(STATUS " Library Path : ${KVIRC_LIB_PATH}") -MESSAGE(STATUS " Modules Path : ${KVIRC_MOD_PATH}") -MESSAGE(STATUS " Man Path : ${KVIRC_MAN_PATH}") -MESSAGE(STATUS "Compilation:") -MESSAGE(STATUS " Debug : ${CMAKE_STATUS_DEBUG_SUPPORT}") -MESSAGE(STATUS " Verbose Output : ${CMAKE_STATUS_VERBOSE_SUPPORT}") -MESSAGE(STATUS " Coexistence Support : ${CMAKE_STATUS_COEXISTENCE_VER}") -MESSAGE(STATUS " Threading Support : ${CMAKE_STATUS_THREADS_SUPPORT}") -MESSAGE(STATUS " Apple Universal Binary : ${CMAKE_STATUS_BUILD_UNIVERSAL_BINARY}") -MESSAGE(STATUS " Memory Profile Support : ${CMAKE_STATUS_MEMORY_PROFILE_SUPPORT}") -MESSAGE(STATUS " Memory Checks Support : ${CMAKE_STATUS_MEMORY_CHECKS_SUPPORT}") -MESSAGE(STATUS "Features:") -MESSAGE(STATUS " X11 Support : ${CMAKE_STATUS_X11_SUPPORT}") -MESSAGE(STATUS " Qt Version : ${CMAKE_STATUS_QT_VERSION}") -IF(Qt5Widgets_FOUND) - MESSAGE(STATUS " Qt Modules : ${qt5_kvirc_modules}") -ELSE() - MESSAGE(STATUS " Qt-DBus Support : ${CMAKE_STATUS_QTDBUS_SUPPORT}") - MESSAGE(STATUS " Qt-WebKit Support : ${CMAKE_STATUS_QTWEBKIT_SUPPORT}") - MESSAGE(STATUS " Qt-Svg Support : ${CMAKE_STATUS_QTSVG_SUPPORT}") -ENDIF() -MESSAGE(STATUS " KDE4 Support : ${CMAKE_STATUS_KDE4_SUPPORT}") -MESSAGE(STATUS " IPv6 Support : ${CMAKE_STATUS_IPV6_SUPPORT}") -MESSAGE(STATUS " Pseudo-Transparency Support : ${CMAKE_STATUS_TRANSPARENCY_SUPPORT}") -MESSAGE(STATUS " IPC Support : ${CMAKE_STATUS_IPC_SUPPORT}") -MESSAGE(STATUS " Audio Backends : ${CMAKE_STATUS_AUDIO_BACKENDS}") -MESSAGE(STATUS "Cryptography:") -MESSAGE(STATUS " Crypt Support And Engines : ${CMAKE_STATUS_CRYPT_SUPPORT}") -MESSAGE(STATUS " OpenSSL Support : ${CMAKE_STATUS_SSL_SUPPORT}") -MESSAGE(STATUS "Scripting:") -MESSAGE(STATUS " Perl Support : ${CMAKE_STATUS_PERL_SUPPORT}") -MESSAGE(STATUS " Python Support : ${CMAKE_STATUS_PYTHON_SUPPORT}") -MESSAGE(STATUS "DCC features:") -MESSAGE(STATUS " DCC Canvas Support : ${CMAKE_STATUS_DCC_CANVAS_SUPPORT}") -MESSAGE(STATUS " DCC Voice Support : ${CMAKE_STATUS_DCC_VOICE_SUPPORT}") -MESSAGE(STATUS " GSM Support : ${CMAKE_STATUS_GSM_SUPPORT}") -MESSAGE(STATUS " DCC Video Support : ${CMAKE_STATUS_DCC_VIDEO_SUPPORT}") -MESSAGE(STATUS " Ogg/Theora Support : ${CMAKE_STATUS_OGG_THEORA_SUPPORT}") -MESSAGE(STATUS "Documentation:") -MESSAGE(STATUS " GetText Support : ${CMAKE_STATUS_GETTEXT_SUPPORT}${GETTEXT_EXTRA_STATUS}") -MESSAGE(STATUS " GetText Messages Tidying : ${CMAKE_STATUS_MESSAGE_TIDY}") -#MESSAGE(STATUS " Generate int. help files : ${CMAKE_STATUS_GEN_USERDOC}") -MESSAGE(STATUS " Doxygen Support : ${CMAKE_STATUS_DOXYGEN_SUPPORT}") -MESSAGE(STATUS " ") -MESSAGE(STATUS "Build Date : ${CMAKE_KVIRC_BUILD_DATE}") -MESSAGE(STATUS " ") -IF(MSVC) - MESSAGE(STATUS "I'm ready to build KVIrc for you: please type 'nmake' now...") -ELSEIF(MINGW) - MESSAGE(STATUS "I'm ready to build KVIrc for you: please type 'mingw32-make' now...") -ELSE() - MESSAGE(STATUS "I'm ready to build KVIrc for you: please type 'make' now...") -ENDIF() +message(STATUS " ") +message(STATUS "Ok, this is the configuration I've worked out:") +if(${CONFIG_IS_UPTODATE}) + message(STATUS "(I found an old config that was exactly the same and kept it to save compilation time)") +endif() +message(STATUS " ") +message(STATUS "Paths:") +message(STATUS " Binary Path : ${KVIRC_BIN_PATH}") +message(STATUS " Library Path : ${KVIRC_LIB_PATH}") +message(STATUS " Modules Path : ${KVIRC_MOD_PATH}") +message(STATUS " Man Path : ${KVIRC_MAN_PATH}") +message(STATUS "Compilation:") +message(STATUS " Debug : ${CMAKE_STATUS_DEBUG_SUPPORT}") +message(STATUS " Verbose Output : ${CMAKE_STATUS_VERBOSE_SUPPORT}") +message(STATUS " Coexistence Support : ${CMAKE_STATUS_COEXISTENCE_VER}") +message(STATUS " Threading Support : ${CMAKE_STATUS_THREADS_SUPPORT}") +message(STATUS " Apple Universal Binary : ${CMAKE_STATUS_BUILD_UNIVERSAL_BINARY}") +message(STATUS " Memory Profile Support : ${CMAKE_STATUS_MEMORY_PROFILE_SUPPORT}") +message(STATUS " Memory Checks Support : ${CMAKE_STATUS_MEMORY_CHECKS_SUPPORT}") +message(STATUS "Features:") +message(STATUS " X11 Support : ${CMAKE_STATUS_X11_SUPPORT}") +message(STATUS " Qt Version : ${CMAKE_STATUS_QT_VERSION}") +if(Qt5Widgets_FOUND) + message(STATUS " Qt Modules : ${qt5_kvirc_modules}") +else() + message(STATUS " Qt-DBus Support : ${CMAKE_STATUS_QTDBUS_SUPPORT}") + message(STATUS " Qt-WebKit Support : ${CMAKE_STATUS_QTWEBKIT_SUPPORT}") + message(STATUS " Qt-Svg Support : ${CMAKE_STATUS_QTSVG_SUPPORT}") +endif() +message(STATUS " KDE4 Support : ${CMAKE_STATUS_KDE4_SUPPORT}") +message(STATUS " IPv6 Support : ${CMAKE_STATUS_IPV6_SUPPORT}") +message(STATUS " Pseudo-Transparency Support : ${CMAKE_STATUS_TRANSPARENCY_SUPPORT}") +message(STATUS " IPC Support : ${CMAKE_STATUS_IPC_SUPPORT}") +message(STATUS " Audio Backends : ${CMAKE_STATUS_AUDIO_BACKENDS}") +message(STATUS "Cryptography:") +message(STATUS " Crypt Support And Engines : ${CMAKE_STATUS_CRYPT_SUPPORT}") +message(STATUS " OpenSSL Support : ${CMAKE_STATUS_SSL_SUPPORT}") +message(STATUS "Scripting:") +message(STATUS " Perl Support : ${CMAKE_STATUS_PERL_SUPPORT}") +message(STATUS " Python Support : ${CMAKE_STATUS_PYTHON_SUPPORT}") +message(STATUS "DCC features:") +message(STATUS " DCC Canvas Support : ${CMAKE_STATUS_DCC_CANVAS_SUPPORT}") +message(STATUS " DCC Voice Support : ${CMAKE_STATUS_DCC_VOICE_SUPPORT}") +message(STATUS " GSM Support : ${CMAKE_STATUS_GSM_SUPPORT}") +message(STATUS " DCC Video Support : ${CMAKE_STATUS_DCC_VIDEO_SUPPORT}") +message(STATUS " Ogg/Theora Support : ${CMAKE_STATUS_OGG_THEORA_SUPPORT}") +message(STATUS "Documentation:") +message(STATUS " GetText Support : ${CMAKE_STATUS_GETTEXT_SUPPORT}${GETTEXT_EXTRA_STATUS}") +message(STATUS " GetText Messages Tidying : ${CMAKE_STATUS_MESSAGE_TIDY}") +#message(STATUS " Generate int. help files : ${CMAKE_STATUS_GEN_USERDOC}") +message(STATUS " Doxygen Support : ${CMAKE_STATUS_DOXYGEN_SUPPORT}") +message(STATUS " ") +message(STATUS "Build Date : ${CMAKE_KVIRC_BUILD_DATE}") +message(STATUS " ") +if(MSVC) + message(STATUS "I'm ready to build KVIrc for you: please type 'nmake' now...") +elseif(MINGW) + message(STATUS "I'm ready to build KVIrc for you: please type 'mingw32-make' now...") +else() + message(STATUS "I'm ready to build KVIrc for you: please type 'make' now...") +endif() if(COMPILE_ENABLE_GTKSTYLE) - MESSAGE(STATUS "Warning: you forcibly enabled the GtkStyle engine, which is known to break KVIrc theming.") -ENDIF() -MESSAGE(STATUS " ") + message(STATUS "Warning: you forcibly enabled the GtkStyle engine, which is known to break KVIrc theming.") +endif() +message(STATUS " ") diff --git a/cmake/modules/FindAudiofile.cmake b/cmake/modules/FindAudiofile.cmake index 6377053dc..c9f0b78a1 100644 --- a/cmake/modules/FindAudiofile.cmake +++ b/cmake/modules/FindAudiofile.cmake @@ -6,18 +6,18 @@ # AUDIOFILE_FOUND - True if AUDIOFILE found. # Look for the header file. -FIND_PATH( AUDIOFILE_INCLUDE_DIR NAMES audiofile.h +find_path( AUDIOFILE_INCLUDE_DIR NAMES audiofile.h PATHS /usr/include /usr/local/include) -MARK_AS_ADVANCED(AUDIOFILE_INCLUDE_DIR) +mark_as_advanced(AUDIOFILE_INCLUDE_DIR) # Look for the library. -FIND_LIBRARY( AUDIOFILE_LIBRARY NAMES audiofile +find_library( AUDIOFILE_LIBRARY NAMES audiofile PATHS /usr/lib /usr/lib64 ) -MARK_AS_ADVANCED(AUDIOFILE_LIBRARY) +mark_as_advanced(AUDIOFILE_LIBRARY) # Copy the results to the output variables. -IF(AUDIOFILE_INCLUDE_DIR AND AUDIOFILE_LIBRARY) - SET(AUDIOFILE_FOUND 1) -ELSE() - SET(AUDIOFILE_FOUND 0) -ENDIF()
\ No newline at end of file +if(AUDIOFILE_INCLUDE_DIR AND AUDIOFILE_LIBRARY) + set(AUDIOFILE_FOUND 1) +else() + set(AUDIOFILE_FOUND 0) +endif()
\ No newline at end of file diff --git a/cmake/modules/FindESD.cmake b/cmake/modules/FindESD.cmake index df3b082bc..701b9e05f 100644 --- a/cmake/modules/FindESD.cmake +++ b/cmake/modules/FindESD.cmake @@ -6,18 +6,18 @@ # ESD_FOUND - True if ESD found. # Look for the header file. -FIND_PATH( ESD_INCLUDE_DIR NAMES esd.h +find_path( ESD_INCLUDE_DIR NAMES esd.h PATHS /usr/include /usr/local/include) -MARK_AS_ADVANCED(ESD_INCLUDE_DIR) +mark_as_advanced(ESD_INCLUDE_DIR) # Look for the library. -FIND_LIBRARY( ESD_LIBRARY NAMES esd +find_library( ESD_LIBRARY NAMES esd PATHS /usr/lib /usr/lib64 ) -MARK_AS_ADVANCED(ESD_LIBRARY) +mark_as_advanced(ESD_LIBRARY) # Copy the results to the output variables. -IF(ESD_INCLUDE_DIR AND ESD_LIBRARY) - SET(ESD_FOUND 1) -ELSE(ESD_INCLUDE_DIR AND ESD_LIBRARY) - SET(ESD_FOUND 0) -ENDIF(ESD_INCLUDE_DIR AND ESD_LIBRARY)
\ No newline at end of file +if(ESD_INCLUDE_DIR AND ESD_LIBRARY) + set(ESD_FOUND 1) +else(ESD_INCLUDE_DIR AND ESD_LIBRARY) + set(ESD_FOUND 0) +endif(ESD_INCLUDE_DIR AND ESD_LIBRARY)
\ No newline at end of file diff --git a/cmake/modules/FindLibV4L2.cmake b/cmake/modules/FindLibV4L2.cmake index 3a469fc19..163d1f0c3 100644 --- a/cmake/modules/FindLibV4L2.cmake +++ b/cmake/modules/FindLibV4L2.cmake @@ -11,16 +11,16 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -IF (LIBV4L2_INCLUDE_DIR AND LIBV4L2_LIBRARY) +if (LIBV4L2_INCLUDE_DIR AND LIBV4L2_LIBRARY) # Already in cache, be silent - SET (LIBV4L2_FIND_QUIETLY TRUE) -ENDIF (LIBV4L2_INCLUDE_DIR AND LIBV4L2_LIBRARY) + set (LIBV4L2_FIND_QUIETLY TRUE) +endif (LIBV4L2_INCLUDE_DIR AND LIBV4L2_LIBRARY) -FIND_PATH (LIBV4L2_INCLUDE_DIR libv4l2.h) +find_path (LIBV4L2_INCLUDE_DIR libv4l2.h) -FIND_LIBRARY (LIBV4L2_LIBRARY v4l2) +find_library (LIBV4L2_LIBRARY v4l2) -INCLUDE (FindPackageHandleStandardArgs) +include (FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS (LibV4L2 DEFAULT_MSG LIBV4L2_INCLUDE_DIR LIBV4L2_LIBRARY) -MARK_AS_ADVANCED(LIBV4L2_INCLUDE_DIR LIBV4L2_LIBRARY) +mark_as_advanced(LIBV4L2_INCLUDE_DIR LIBV4L2_LIBRARY) diff --git a/cmake/modules/FindOSS.cmake b/cmake/modules/FindOSS.cmake index 105b3ec9c..278d2aeb6 100644 --- a/cmake/modules/FindOSS.cmake +++ b/cmake/modules/FindOSS.cmake @@ -5,39 +5,39 @@ # OSS_FOUND - True if Oss found. -FIND_PATH(LINUX_OSS_INCLUDE_DIR "linux/soundcard.h" +find_path(LINUX_OSS_INCLUDE_DIR "linux/soundcard.h" "/usr/include" "/usr/local/include" ) -FIND_PATH(SYS_OSS_INCLUDE_DIR "sys/soundcard.h" +find_path(SYS_OSS_INCLUDE_DIR "sys/soundcard.h" "/usr/include" "/usr/local/include" ) -FIND_PATH(MACHINE_OSS_INCLUDE_DIR "machine/soundcard.h" +find_path(MACHINE_OSS_INCLUDE_DIR "machine/soundcard.h" "/usr/include" "/usr/local/include" ) -SET(OSS_FOUND FALSE) +set(OSS_FOUND FALSE) -IF(LINUX_OSS_INCLUDE_DIR) - SET(OSS_FOUND TRUE) - SET(OSS_INCLUDE_DIR ${LINUX_OSS_INCLUDE_DIR}) - SET(HAVE_LINUX_SOUNDCARD_H 1) -ENDIF() +if(LINUX_OSS_INCLUDE_DIR) + set(OSS_FOUND TRUE) + set(OSS_INCLUDE_DIR ${LINUX_OSS_INCLUDE_DIR}) + set(HAVE_LINUX_SOUNDCARD_H 1) +endif() -IF(SYS_OSS_INCLUDE_DIR) - SET(OSS_FOUND TRUE) - SET(OSS_INCLUDE_DIR ${SYS_OSS_INCLUDE_DIR}) - SET(HAVE_SYS_SOUNDCARD_H 1) -ENDIF() +if(SYS_OSS_INCLUDE_DIR) + set(OSS_FOUND TRUE) + set(OSS_INCLUDE_DIR ${SYS_OSS_INCLUDE_DIR}) + set(HAVE_SYS_SOUNDCARD_H 1) +endif() -IF(MACHINE_OSS_INCLUDE_DIR) - SET(OSS_FOUND TRUE) - SET(OSS_INCLUDE_DIR ${MACHINE_OSS_INCLUDE_DIR}) - SET(HAVE_MACHINE_SOUNDCARD_H 1) -ENDIF() +if(MACHINE_OSS_INCLUDE_DIR) + set(OSS_FOUND TRUE) + set(OSS_INCLUDE_DIR ${MACHINE_OSS_INCLUDE_DIR}) + set(HAVE_MACHINE_SOUNDCARD_H 1) +endif() -MARK_AS_ADVANCED ( +mark_as_advanced ( OSS_FOUND OSS_INCLUDE_DIR LINUX_OSS_INCLUDE_DIR diff --git a/cmake/modules/FindTheora.cmake b/cmake/modules/FindTheora.cmake index 90b42bcb8..40f9a205a 100644 --- a/cmake/modules/FindTheora.cmake +++ b/cmake/modules/FindTheora.cmake @@ -12,31 +12,31 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -IF(THEORA_INCLUDE_DIR AND THEORA_LIB_LIBRARIES_ENC AND THEORA_LIB_LIBRARIES_DEC AND THEORA_VORBIS_LIBRARIES AND THEORA_OGG_LIBRARIES) +if(THEORA_INCLUDE_DIR AND THEORA_LIB_LIBRARIES_ENC AND THEORA_LIB_LIBRARIES_DEC AND THEORA_VORBIS_LIBRARIES AND THEORA_OGG_LIBRARIES) # Already in cache, be silent set(Theora_FIND_QUIETLY TRUE) -ENDIF() +endif() -FIND_PATH(THEORA_INCLUDE_DIR theora/theoraenc.h) -FIND_LIBRARY(THEORA_OGG_LIBRARIES NAMES ogg ) -FIND_LIBRARY(THEORA_VORBIS_LIBRARIES NAMES vorbis) -FIND_LIBRARY(THEORA_VORBIS_LIBRARIES_ENC NAMES vorbisenc) -FIND_LIBRARY(THEORA_LIB_LIBRARIES_ENC NAMES theoraenc) -FIND_LIBRARY(THEORA_LIB_LIBRARIES_DEC NAMES theoradec) +find_path(THEORA_INCLUDE_DIR theora/theoraenc.h) +find_library(THEORA_OGG_LIBRARIES NAMES ogg ) +find_library(THEORA_VORBIS_LIBRARIES NAMES vorbis) +find_library(THEORA_VORBIS_LIBRARIES_ENC NAMES vorbisenc) +find_library(THEORA_LIB_LIBRARIES_ENC NAMES theoraenc) +find_library(THEORA_LIB_LIBRARIES_DEC NAMES theoradec) -IF(THEORA_VORBIS_LIBRARIES AND THEORA_VORBIS_LIBRARIES_ENC AND THEORA_LIB_LIBRARIES_ENC AND THEORA_LIB_LIBRARIES_DEC AND THEORA_INCLUDE_DIR) +if(THEORA_VORBIS_LIBRARIES AND THEORA_VORBIS_LIBRARIES_ENC AND THEORA_LIB_LIBRARIES_ENC AND THEORA_LIB_LIBRARIES_DEC AND THEORA_INCLUDE_DIR) set(THEORA_LIBRARY ${THEORA_LIB_LIBRARIES_ENC} ${THEORA_LIB_LIBRARIES_DEC} ${THEORA_OGG_LIBRARIES} ${THEORA_VORBIS_LIBRARIES} ${THEORA_VORBIS_LIBRARIES_ENC}) set(THEORA_FOUND TRUE) -ENDIF() +endif() -IF(THEORA_FOUND) - IF(NOT Theora_FIND_QUIETLY) - MESSAGE(STATUS "Found theora: includes in ${THEORA_INCLUDE_DIR}, library in ${THEORA_LIBRARY}") - ENDIF() -ELSE() - IF(Theora_FIND_REQUIRED) - MESSAGE(STATUS "Theora not found") - ENDIF() -ENDIF() +if(THEORA_FOUND) + if(NOT Theora_FIND_QUIETLY) + message(STATUS "Found theora: includes in ${THEORA_INCLUDE_DIR}, library in ${THEORA_LIBRARY}") + endif() +else() + if(Theora_FIND_REQUIRED) + message(STATUS "Theora not found") + endif() +endif() -MARK_AS_ADVANCED(THEORA_INCLUDE_DIR THEORA_LIBRARY) +mark_as_advanced(THEORA_INCLUDE_DIR THEORA_LIBRARY) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 8b977473f..418165033 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,15 +1,15 @@ # CMakeLists for data/ # Find subdirs -SUBDIRS(applnk audio config defscript deftheme helppics man msgcolors pics) +subdirs(applnk audio config defscript deftheme helppics man msgcolors pics) -IF(APPLE) +if(APPLE) # MacOS X - ADD_SUBDIRECTORY(resources_mac) -ELSEIF(WIN32) - ADD_SUBDIRECTORY(resources_win32) -ELSEIF(UNIX AND NOT APPLE) - ADD_SUBDIRECTORY(icons) - ADD_SUBDIRECTORY(mimetypes) - ADD_SUBDIRECTORY(protocols) -ENDIF() + add_subdirectory(resources_mac) +elseif(WIN32) + add_subdirectory(resources_win32) +elseif(UNIX AND NOT APPLE) + add_subdirectory(icons) + add_subdirectory(mimetypes) + add_subdirectory(protocols) +endif() diff --git a/data/applnk/CMakeLists.txt b/data/applnk/CMakeLists.txt index 0516b6fe5..a736704f2 100644 --- a/data/applnk/CMakeLists.txt +++ b/data/applnk/CMakeLists.txt @@ -1,20 +1,20 @@ # CMakeLists for data/applnk -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/kvirc4.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/${KVIRC_BINARYNAME}.desktop) +configure_file(${CMAKE_SOURCE_DIR}/cmake/kvirc4.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/${KVIRC_BINARYNAME}.desktop) -IF(UNIX) - IF(APPLE) - INSTALL(FILES +if(UNIX) + if(APPLE) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${KVIRC_BINARYNAME}.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/applnk/ ) - ELSE() + else() # Assume linux - INSTALL(FILES + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${KVIRC_BINARYNAME}.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ ) - ENDIF() -ENDIF() + endif() +endif() diff --git a/data/audio/CMakeLists.txt b/data/audio/CMakeLists.txt index c6a18d94a..13b7da22c 100644 --- a/data/audio/CMakeLists.txt +++ b/data/audio/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for data/pics -FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.wav") +file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.wav") -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/audio/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/audio/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/audio/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/audio/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/audio/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/audio/) +endif() diff --git a/data/config/CMakeLists.txt b/data/config/CMakeLists.txt index c84d14182..6381ab63a 100644 --- a/data/config/CMakeLists.txt +++ b/data/config/CMakeLists.txt @@ -1,15 +1,15 @@ # CMakeLists for data/config -FILE(GLOB files "*.kvc") -LIST(APPEND ${files} "style.css") +file(GLOB files "*.kvc") +list(APPEND ${files} "style.css") -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/config/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/config/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/config/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/config/) +endif() diff --git a/data/defscript/CMakeLists.txt b/data/defscript/CMakeLists.txt index 45acc77b7..572e76a09 100644 --- a/data/defscript/CMakeLists.txt +++ b/data/defscript/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for data/defscript -FILE(GLOB files "*.kv?") +file(GLOB files "*.kv?") -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/defscript/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/defscript/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/defscript/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/defscript/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/defscript/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/defscript/) +endif() diff --git a/data/deftheme/Aria-1.0.0/CMakeLists.txt b/data/deftheme/Aria-1.0.0/CMakeLists.txt index 61a9b3f69..51914d9b8 100644 --- a/data/deftheme/Aria-1.0.0/CMakeLists.txt +++ b/data/deftheme/Aria-1.0.0/CMakeLists.txt @@ -1,16 +1,16 @@ # CMakeLists for data/deftheme/Aria-1.0.0 -FILE(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -FILE(GLOB themefiles "${CMAKE_CURRENT_SOURCE_DIR}/*.kvc") -LIST(APPEND files ${images} ${themefiles}) +file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +file(GLOB themefiles "${CMAKE_CURRENT_SOURCE_DIR}/*.kvc") +list(APPEND files ${images} ${themefiles}) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/themes/Aria-1.0.0/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/themes/Aria-1.0.0/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/themes/Aria-1.0.0/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/themes/Aria-1.0.0/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/themes/Aria-1.0.0/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/themes/Aria-1.0.0/) +endif() diff --git a/data/deftheme/CMakeLists.txt b/data/deftheme/CMakeLists.txt index fc0fe9725..4e9525f4b 100644 --- a/data/deftheme/CMakeLists.txt +++ b/data/deftheme/CMakeLists.txt @@ -1,5 +1,5 @@ # CMakeLists for data/deftheme # Find subdirs -SUBDIRS(MinimalDark-1.0.0 Aria-1.0.0) +subdirs(MinimalDark-1.0.0 Aria-1.0.0) diff --git a/data/deftheme/MinimalDark-1.0.0/CMakeLists.txt b/data/deftheme/MinimalDark-1.0.0/CMakeLists.txt index 41c4dc74b..633f6e140 100644 --- a/data/deftheme/MinimalDark-1.0.0/CMakeLists.txt +++ b/data/deftheme/MinimalDark-1.0.0/CMakeLists.txt @@ -1,16 +1,16 @@ # CMakeLists for data/deftheme/MinimalDark-1.0.0 -FILE(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -FILE(GLOB themefiles "${CMAKE_CURRENT_SOURCE_DIR}/*.kvc") -LIST(APPEND files ${images} ${themefiles}) +file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +file(GLOB themefiles "${CMAKE_CURRENT_SOURCE_DIR}/*.kvc") +list(APPEND files ${images} ${themefiles}) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/themes/MinimalDark-1.0.0/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/themes/MinimalDark-1.0.0/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/themes/MinimalDark-1.0.0/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/themes/MinimalDark-1.0.0/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/themes/MinimalDark-1.0.0/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/themes/MinimalDark-1.0.0/) +endif() diff --git a/data/helppics/CMakeLists.txt b/data/helppics/CMakeLists.txt index 7e69baae2..a53346722 100644 --- a/data/helppics/CMakeLists.txt +++ b/data/helppics/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for data/helppics -FILE(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${images} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/help/en/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${images} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/help/en/) + else() # Assume linux - INSTALL(FILES ${images} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/help/en/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${images} DESTINATION ${CMAKE_INSTALL_PREFIX}/help/en/) -ENDIF() + install(FILES ${images} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/help/en/) + endif() +elseif(WIN32) + install(FILES ${images} DESTINATION ${CMAKE_INSTALL_PREFIX}/help/en/) +endif() diff --git a/data/icons/128x128/CMakeLists.txt b/data/icons/128x128/CMakeLists.txt index de2d08c24..08c145351 100644 --- a/data/icons/128x128/CMakeLists.txt +++ b/data/icons/128x128/CMakeLists.txt @@ -1,28 +1,28 @@ # CMakeLists for data/icons/128x128/ -SET(iconapps +set(iconapps kvirc.png ) -SET(iconmime +set(iconmime text-x-kvs.png text-x-kvc.png application-x-kvt.png application-x-kva.png ) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/128x128/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/128x128/mimetypes/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/128x128/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/128x128/mimetypes/) + else() # Assume linux - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/mimetypes/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/128x128/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/128x128/mimetypes/) -ENDIF() + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/mimetypes/) + endif() +elseif(WIN32) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/128x128/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/128x128/mimetypes/) +endif() diff --git a/data/icons/16x16/CMakeLists.txt b/data/icons/16x16/CMakeLists.txt index 972c5aac8..15435f7e5 100644 --- a/data/icons/16x16/CMakeLists.txt +++ b/data/icons/16x16/CMakeLists.txt @@ -1,28 +1,28 @@ # CMakeLists for data/icons/16x16/ -SET(iconapps +set(iconapps kvirc.png ) -SET(iconmime +set(iconmime text-x-kvs.png text-x-kvc.png application-x-kvt.png application-x-kva.png ) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/16x16/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/16x16/mimetypes/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/16x16/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/16x16/mimetypes/) + else() # Assume linux - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/mimetypes/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/16x16/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/16x16/mimetypes/) -ENDIF() + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/mimetypes/) + endif() +elseif(WIN32) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/16x16/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/16x16/mimetypes/) +endif() diff --git a/data/icons/32x32/CMakeLists.txt b/data/icons/32x32/CMakeLists.txt index a754fbbba..9de46bde3 100644 --- a/data/icons/32x32/CMakeLists.txt +++ b/data/icons/32x32/CMakeLists.txt @@ -1,28 +1,28 @@ # CMakeLists for data/icons/32x32/ -SET(iconapps +set(iconapps kvirc.png ) -SET(iconmime +set(iconmime text-x-kvs.png text-x-kvc.png application-x-kvt.png application-x-kva.png ) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/32x32/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/32x32/mimetypes/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/32x32/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/32x32/mimetypes/) + else() # Assume linux - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/mimetypes/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/mimetypes/) -ENDIF() + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/mimetypes/) + endif() +elseif(WIN32) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/mimetypes/) +endif() diff --git a/data/icons/48x48/CMakeLists.txt b/data/icons/48x48/CMakeLists.txt index 2961901f4..bde43f942 100644 --- a/data/icons/48x48/CMakeLists.txt +++ b/data/icons/48x48/CMakeLists.txt @@ -1,30 +1,30 @@ # CMakeLists for data/icons/48x48/ -SET(iconapps +set(iconapps kvirc.png ) -SET(iconmime +set(iconmime text-x-kvs.png text-x-kvc.png application-x-kvt.png application-x-kva.png ) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/48x48/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/48x48/mimetypes/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/48x48/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/48x48/mimetypes/) + else() # Assume linux - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/mimetypes/) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/mimetypes/) #this is needed for .desktop files to find the icon - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/mimetypes/) -ENDIF() + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/) + endif() +elseif(WIN32) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/mimetypes/) +endif() diff --git a/data/icons/64x64/CMakeLists.txt b/data/icons/64x64/CMakeLists.txt index cc31db97d..6feb541ef 100644 --- a/data/icons/64x64/CMakeLists.txt +++ b/data/icons/64x64/CMakeLists.txt @@ -1,28 +1,28 @@ # CMakeLists for data/icons/64x64/ -SET(iconapps +set(iconapps kvirc.png ) -SET(iconmime +set(iconmime text-x-kvs.png text-x-kvc.png application-x-kvt.png application-x-kva.png ) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/64x64/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/64x64/mimetypes/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/64x64/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/64x64/mimetypes/) + else() # Assume linux - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/mimetypes/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/64x64/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/64x64/mimetypes/) -ENDIF() + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/mimetypes/) + endif() +elseif(WIN32) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/64x64/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/64x64/mimetypes/) +endif() diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt index 6309c9a08..70756e427 100644 --- a/data/icons/CMakeLists.txt +++ b/data/icons/CMakeLists.txt @@ -1,3 +1,3 @@ # CMakeLists for data/icons -SUBDIRS(16x16 32x32 48x48 64x64 128x128 scalable)
\ No newline at end of file +subdirs(16x16 32x32 48x48 64x64 128x128 scalable)
\ No newline at end of file diff --git a/data/icons/scalable/CMakeLists.txt b/data/icons/scalable/CMakeLists.txt index 82e56760c..d13674319 100644 --- a/data/icons/scalable/CMakeLists.txt +++ b/data/icons/scalable/CMakeLists.txt @@ -1,28 +1,28 @@ # CMakeLists for data/icons/scalable/ -SET(iconapps +set(iconapps kvirc.svgz ) -SET(iconmime +set(iconmime text-x-kvs.svgz text-x-kvc.svgz application-x-kvt.svgz application-x-kva.svgz ) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/scalable/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/scalable/mimetypes/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/scalable/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/scalable/mimetypes/) + else() # Assume linux - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/scalable/apps/) - INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/scalable/mimetypes/) -ENDIF() + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/) + endif() +elseif(WIN32) + install(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/scalable/apps/) + install(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/scalable/mimetypes/) +endif() diff --git a/data/man/CMakeLists.txt b/data/man/CMakeLists.txt index 89f049165..1580b07be 100644 --- a/data/man/CMakeLists.txt +++ b/data/man/CMakeLists.txt @@ -1,25 +1,25 @@ # CMakeLists for data/man -FILE(GLOB MANS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.1") +file(GLOB MANS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.1") -IF(UNIX) - IF(APPLE) +if(UNIX) + if(APPLE) # does macosx use manpages? - ELSE() + else() # Assume linux - FOREACH(MAN ${MANS}) + foreach(MAN ${MANS}) # Grep the language code - SET(LANGCODE ${MAN}) - STRING(REPLACE "kvirc." "" LANGCODE ${LANGCODE}) - STRING(REPLACE ".1" "" LANGCODE ${LANGCODE}) + set(LANGCODE ${MAN}) + string(REPLACE "kvirc." "" LANGCODE ${LANGCODE}) + string(REPLACE ".1" "" LANGCODE ${LANGCODE}) # If the man is in English, it uses the root directory - STRING(COMPARE EQUAL ${LANGCODE} "en" STREQUAL) - IF(${STREQUAL}) - INSTALL(FILES ${MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/${MANDIR_PREFIX}/man1/ RENAME "kvirc.1") - ELSE() - INSTALL(FILES ${MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/${MANDIR_PREFIX}/${LANGCODE}/man1/ RENAME "kvirc.1") - ENDIF() - ENDFOREACH() - ENDIF() -ENDIF() + string(COMPARE EQUAL ${LANGCODE} "en" STREQUAL) + if(${STREQUAL}) + install(FILES ${MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/${MANDIR_PREFIX}/man1/ RENAME "kvirc.1") + else() + install(FILES ${MAN} DESTINATION ${CMAKE_INSTALL_PREFIX}/${MANDIR_PREFIX}/${LANGCODE}/man1/ RENAME "kvirc.1") + endif() + endforeach() + endif() +endif() diff --git a/data/mimetypes/CMakeLists.txt b/data/mimetypes/CMakeLists.txt index 8a1b8a5c4..0f8bf640f 100644 --- a/data/mimetypes/CMakeLists.txt +++ b/data/mimetypes/CMakeLists.txt @@ -1,20 +1,20 @@ -IF(KDE4_FOUND) - INCLUDE(MacroEnsureVersion) +if(KDE4_FOUND) + include(MacroEnsureVersion) macro_ensure_version("4.2.0" ${KDE_VERSION} KDE_4_2_FOUND) # for KDE 4.2 we require at least version 0.23 - IF(KDE_4_2_FOUND) - SET(SHARED_MIME_INFO_MINIMUM_VERSION "0.23") - ENDIF(KDE_4_2_FOUND) + if(KDE_4_2_FOUND) + set(SHARED_MIME_INFO_MINIMUM_VERSION "0.23") + endif(KDE_4_2_FOUND) # now to shared mime info - FIND_PACKAGE(SharedMimeInfo) + find_package(SharedMimeInfo) - IF(SHARED_MIME_INFO_FOUND AND IS_DIRECTORY ${XDG_MIME_INSTALL_DIR}) - INSTALL(FILES kvirc.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) + if(SHARED_MIME_INFO_FOUND AND IS_DIRECTORY ${XDG_MIME_INSTALL_DIR}) + install(FILES kvirc.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) - ENDIF(SHARED_MIME_INFO_FOUND AND IS_DIRECTORY ${XDG_MIME_INSTALL_DIR}) + endif(SHARED_MIME_INFO_FOUND AND IS_DIRECTORY ${XDG_MIME_INSTALL_DIR}) - INSTALL(FILES kvirc.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kvirc) -ENDIF(KDE4_FOUND) + install(FILES kvirc.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kvirc) +endif(KDE4_FOUND) diff --git a/data/msgcolors/CMakeLists.txt b/data/msgcolors/CMakeLists.txt index 27459e7f8..92812e195 100644 --- a/data/msgcolors/CMakeLists.txt +++ b/data/msgcolors/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for data/msgcolors -FILE(GLOB files "*.msgclr") +file(GLOB files "*.msgclr") -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/msgcolors/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/msgcolors/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/msgcolors/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/msgcolors/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/msgcolors/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/msgcolors/) +endif() diff --git a/data/pics/CMakeLists.txt b/data/pics/CMakeLists.txt index 07ee13893..49ad00867 100644 --- a/data/pics/CMakeLists.txt +++ b/data/pics/CMakeLists.txt @@ -1,16 +1,16 @@ # CMakeLists for data/pics -SUBDIRS(coresmall) +subdirs(coresmall) -FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif() diff --git a/data/pics/coresmall/CMakeLists.txt b/data/pics/coresmall/CMakeLists.txt index 3eefefc02..405cf51ea 100644 --- a/data/pics/coresmall/CMakeLists.txt +++ b/data/pics/coresmall/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for data/pics/coresmall -FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/coresmall) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/coresmall) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/coresmall) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/coresmall) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/coresmall) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/coresmall) +endif() diff --git a/data/protocols/CMakeLists.txt b/data/protocols/CMakeLists.txt index 66fc3896c..70714fb63 100644 --- a/data/protocols/CMakeLists.txt +++ b/data/protocols/CMakeLists.txt @@ -1,4 +1,4 @@ -IF(KDE4_FOUND) - INSTALL(FILES _irc.protocol DESTINATION ${SERVICES_INSTALL_DIR}) - INSTALL(FILES _irc6.protocol DESTINATION ${SERVICES_INSTALL_DIR}) -ENDIF(KDE4_FOUND) +if(KDE4_FOUND) + install(FILES _irc.protocol DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES _irc6.protocol DESTINATION ${SERVICES_INSTALL_DIR}) +endif(KDE4_FOUND) diff --git a/data/resources_mac/CMakeLists.txt b/data/resources_mac/CMakeLists.txt index adcd75ea7..0fe7e0a9d 100644 --- a/data/resources_mac/CMakeLists.txt +++ b/data/resources_mac/CMakeLists.txt @@ -1,13 +1,13 @@ # CMakeLists for data/resources_mac -IF(APPLE) - IF(WANT_COEXISTENCE) - SET(KVIRC_BINARYNAME ${PACKAGE}${VERSION_MAJOR}) - ELSE() - SET(KVIRC_BINARYNAME ${PACKAGE}) - ENDIF() +if(APPLE) + if(WANT_COEXISTENCE) + set(KVIRC_BINARYNAME ${PACKAGE}${VERSION_MAJOR}) + else() + set(KVIRC_BINARYNAME ${PACKAGE}) + endif() - CONFIGURE_FILE(${kvirc_SOURCE_DIR}/cmake/Info.plist.cmake ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY) - INSTALL(FILES kvirc.icns DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Info.plist DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/) -ENDIF() + configure_file(${kvirc_SOURCE_DIR}/cmake/Info.plist.cmake ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY) + install(FILES kvirc.icns DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Info.plist DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/) +endif() diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 24b996d42..8e2acc300 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for doc/ -SET(license +set(license COPYING LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL ) -SET(howto +set(howto README FAQ INSTALL @@ -22,69 +22,69 @@ SET(howto ) # User documentation -IF(PERL_FOUND) +if(PERL_FOUND) # The userdocs target is in the normal build process and rebuilds the documentation # only when the revision number changes. This is useful for svn users and package users. # The docs target is standalone and explicitly builds the documentation (useful for developers) - IF(DEFINED CMAKE_KVIRC_BUILD_REVISION) - SET(USERDOCS_VERSION "${VERSION_RELEASE}.${CMAKE_KVIRC_BUILD_REVISION}") - ELSE() - SET(USERDOCS_VERSION "${VERSION_RELEASE}") - ENDIF() + if(DEFINED CMAKE_KVIRC_BUILD_REVISION) + set(USERDOCS_VERSION "${VERSION_RELEASE}.${CMAKE_KVIRC_BUILD_REVISION}") + else() + set(USERDOCS_VERSION "${VERSION_RELEASE}") + endif() - SET(USERDOCS_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/help/en/documentation.${USERDOCS_VERSION}.tag") + set(USERDOCS_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/help/en/documentation.${USERDOCS_VERSION}.tag") - ADD_CUSTOM_TARGET(userdocs ALL) - ADD_CUSTOM_TARGET(userdocs-en DEPENDS ${USERDOCS_OUTPUT_FILE}) - ADD_DEPENDENCIES(userdocs userdocs-en) + add_custom_target(userdocs ALL) + add_custom_target(userdocs-en DEPENDS ${USERDOCS_OUTPUT_FILE}) + add_dependencies(userdocs userdocs-en) - IF(UNIX) - ADD_CUSTOM_COMMAND( + if(UNIX) + add_custom_command( OUTPUT ${USERDOCS_OUTPUT_FILE} COMMENT "Generating user documentation..." COMMAND ${PERL_EXECUTABLE} ${PROJECT_SOURCE_DIR}/admin/gendoc.pl -v ${USERDOCS_VERSION} '${CMAKE_CURRENT_BINARY_DIR}/help/en/' ${PROJECT_SOURCE_DIR}/data/doctemplates/ ${PROJECT_SOURCE_DIR}/src/ ) - IF(APPLE) - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/help/ DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/help) - ELSE() + if(APPLE) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/help/ DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/help) + else() # Assume linux - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/help/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/help) - ENDIF() - ADD_CUSTOM_TARGET( + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/help/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/help) + endif() + add_custom_target( docs COMMENT "Generating user documentation..." COMMAND ${PERL_EXECUTABLE} ${PROJECT_SOURCE_DIR}/admin/gendoc.pl -v ${USERDOCS_VERSION} '${CMAKE_CURRENT_BINARY_DIR}/help/en/' ${PROJECT_SOURCE_DIR}/data/doctemplates/ ${PROJECT_SOURCE_DIR}/src/ ) - ELSEIF(WIN32) - ADD_CUSTOM_COMMAND( + elseif(WIN32) + add_custom_command( OUTPUT ${USERDOCS_OUTPUT_FILE} COMMENT "Generating user documentation..." COMMAND ${PERL_EXECUTABLE} ${PROJECT_SOURCE_DIR}/admin/gendoc.pl -v ${USERDOCS_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/help/en/ ${PROJECT_SOURCE_DIR}/data/doctemplates/ ${PROJECT_SOURCE_DIR}/src/ ) - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/help/ DESTINATION ${CMAKE_INSTALL_PREFIX}/help) - ADD_CUSTOM_TARGET( + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/help/ DESTINATION ${CMAKE_INSTALL_PREFIX}/help) + add_custom_target( docs COMMENT "Generating user documentation..." COMMAND ${PERL_EXECUTABLE} ${PROJECT_SOURCE_DIR}/admin/gendoc.pl -v ${USERDOCS_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/help/en/ ${PROJECT_SOURCE_DIR}/data/doctemplates/ ${PROJECT_SOURCE_DIR}/src/ ) - ENDIF() + endif() -ENDIF() +endif() # Install target -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${license} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/license) - INSTALL(FILES ${howto} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/doc) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${license} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/license) + install(FILES ${howto} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/doc) + else() # Assume linux - INSTALL(FILES ${license} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/license/) - INSTALL(FILES ${howto} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/doc/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${license} DESTINATION ${CMAKE_INSTALL_PREFIX}/license/) - INSTALL(FILES ${howto} DESTINATION ${CMAKE_INSTALL_PREFIX}/doc/) -ENDIF() + install(FILES ${license} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/license/) + install(FILES ${howto} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/doc/) + endif() +elseif(WIN32) + install(FILES ${license} DESTINATION ${CMAKE_INSTALL_PREFIX}/license/) + install(FILES ${howto} DESTINATION ${CMAKE_INSTALL_PREFIX}/doc/) +endif() diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 18dffe42f..cbdd4b950 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -1,4 +1,4 @@ # CMakeLists for po/ # Find subdirs -SUBDIRS(core modules) +subdirs(core modules) diff --git a/po/core/CMakeLists.txt b/po/core/CMakeLists.txt index 88e11e78e..ab4a639f5 100644 --- a/po/core/CMakeLists.txt +++ b/po/core/CMakeLists.txt @@ -1,7 +1,7 @@ # CMakeLists for po/core/ # Find subdirs -SUBDIRS( +subdirs( kvirc kvs defscript diff --git a/po/core/defscript/CMakeLists.txt b/po/core/defscript/CMakeLists.txt index 5dcf67289..ba826282c 100644 --- a/po/core/defscript/CMakeLists.txt +++ b/po/core/defscript/CMakeLists.txt @@ -1,17 +1,17 @@ # CMakeLists for po/core/defscript/ # sed will cut paths at this directory -SET(TRANSLATION_BASEDIR "data") +set(TRANSLATION_BASEDIR "data") -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE defscript.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/data/defscript) +set(POTFILE defscript.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/data/defscript) # this enables specific xgettext parameters for parsing .kvs scripts -SET(TRANSLATION_DEFSCRIPT 1) +set(TRANSLATION_DEFSCRIPT 1) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/core/kvirc/CMakeLists.txt b/po/core/kvirc/CMakeLists.txt index 7c2b6edd2..3a369cc33 100644 --- a/po/core/kvirc/CMakeLists.txt +++ b/po/core/kvirc/CMakeLists.txt @@ -1,16 +1,16 @@ # CMakeLists for po/core/kvirc/ # sed will cut paths at this directory -SET(TRANSLATION_BASEDIR "src") +set(TRANSLATION_BASEDIR "src") -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE kvirc.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src) +set(POTFILE kvirc.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src) #THIS IS SPARTA! -SET(TRANSLATION_KVIRC_CORE 1) +set(TRANSLATION_KVIRC_CORE 1) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/core/kvs/CMakeLists.txt b/po/core/kvs/CMakeLists.txt index b721539ec..cc23083e8 100644 --- a/po/core/kvs/CMakeLists.txt +++ b/po/core/kvs/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for po/core/kvs/ # sed will cut paths at this directory -SET(TRANSLATION_BASEDIR "src") +set(TRANSLATION_BASEDIR "src") -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE kvs.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/kvirc/kvs) +set(POTFILE kvs.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/kvirc/kvs) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/CMakeLists.txt b/po/modules/CMakeLists.txt index 02ebc0ff2..05b9f2d69 100644 --- a/po/modules/CMakeLists.txt +++ b/po/modules/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/ # sed will cut paths at this directory -SET(TRANSLATION_BASEDIR "src") +set(TRANSLATION_BASEDIR "src") # Find subdirs -SUBDIRS( +subdirs( about addon dcc diff --git a/po/modules/about/CMakeLists.txt b/po/modules/about/CMakeLists.txt index 327480f9e..51843df3c 100644 --- a/po/modules/about/CMakeLists.txt +++ b/po/modules/about/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/about -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE about.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/about) +set(POTFILE about.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/about) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/addon/CMakeLists.txt b/po/modules/addon/CMakeLists.txt index a1c994fce..9ade1eef6 100644 --- a/po/modules/addon/CMakeLists.txt +++ b/po/modules/addon/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/addon -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE addon.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/addon) +set(POTFILE addon.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/addon) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt)
\ No newline at end of file +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt)
\ No newline at end of file diff --git a/po/modules/dcc/CMakeLists.txt b/po/modules/dcc/CMakeLists.txt index e5ff9b18a..838622fa2 100644 --- a/po/modules/dcc/CMakeLists.txt +++ b/po/modules/dcc/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/dcc -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE dcc.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/dcc) +set(POTFILE dcc.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/dcc) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/editor/CMakeLists.txt b/po/modules/editor/CMakeLists.txt index 089bc35ed..e332195f5 100644 --- a/po/modules/editor/CMakeLists.txt +++ b/po/modules/editor/CMakeLists.txt @@ -10,20 +10,20 @@ # src/modules/raweditor # src/modules/toolbareditor -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE editor.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/actioneditor) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/aliaseditor) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/classeditor) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/codetester) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/editor) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/eventeditor) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/popupeditor) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/raweditor) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/toolbareditor) +set(POTFILE editor.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/actioneditor) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/aliaseditor) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/classeditor) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/codetester) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/editor) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/eventeditor) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/popupeditor) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/raweditor) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/toolbareditor) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/filetransferwindow/CMakeLists.txt b/po/modules/filetransferwindow/CMakeLists.txt index 042248683..04e61c46b 100644 --- a/po/modules/filetransferwindow/CMakeLists.txt +++ b/po/modules/filetransferwindow/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/filetransferwindow -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE filetransferwindow.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/filetransferwindow) +set(POTFILE filetransferwindow.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/filetransferwindow) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/log/CMakeLists.txt b/po/modules/log/CMakeLists.txt index b65546ed0..ae0fe9733 100644 --- a/po/modules/log/CMakeLists.txt +++ b/po/modules/log/CMakeLists.txt @@ -4,13 +4,13 @@ # src/modules/log # src/modules/logview -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE log.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/log) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/logview) +set(POTFILE log.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/log) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/logview) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/mediaplayer/CMakeLists.txt b/po/modules/mediaplayer/CMakeLists.txt index 32c2bb993..f7c3bc620 100644 --- a/po/modules/mediaplayer/CMakeLists.txt +++ b/po/modules/mediaplayer/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/mediaplayer -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE mediaplayer.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/mediaplayer) +set(POTFILE mediaplayer.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/mediaplayer) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/notifier/CMakeLists.txt b/po/modules/notifier/CMakeLists.txt index ea6439bec..65ee74e15 100644 --- a/po/modules/notifier/CMakeLists.txt +++ b/po/modules/notifier/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/notifier -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE notifier.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/notifier) +set(POTFILE notifier.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/notifier) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/objects/CMakeLists.txt b/po/modules/objects/CMakeLists.txt index 5ea38d069..9293be2c6 100644 --- a/po/modules/objects/CMakeLists.txt +++ b/po/modules/objects/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/objects -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE objects.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/objects) +set(POTFILE objects.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/objects) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/options/CMakeLists.txt b/po/modules/options/CMakeLists.txt index ff044840b..172ba7c72 100644 --- a/po/modules/options/CMakeLists.txt +++ b/po/modules/options/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/options -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE options.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/options) +set(POTFILE options.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/options) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/perl/CMakeLists.txt b/po/modules/perl/CMakeLists.txt index f6bdee389..9daf9e6e5 100644 --- a/po/modules/perl/CMakeLists.txt +++ b/po/modules/perl/CMakeLists.txt @@ -4,13 +4,13 @@ # src/modules/perl # src/modules/perlcore -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE perl.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/perl) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/perlcore) +set(POTFILE perl.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/perl) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/perlcore) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/python/CMakeLists.txt b/po/modules/python/CMakeLists.txt index 846ddbda4..f595f9c93 100644 --- a/po/modules/python/CMakeLists.txt +++ b/po/modules/python/CMakeLists.txt @@ -4,13 +4,13 @@ # src/modules/python # src/modules/pythoncore -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE python.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/python) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/pythoncore) +set(POTFILE python.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/python) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/pythoncore) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/register/CMakeLists.txt b/po/modules/register/CMakeLists.txt index 5452bbc14..a253f5aaa 100644 --- a/po/modules/register/CMakeLists.txt +++ b/po/modules/register/CMakeLists.txt @@ -4,13 +4,13 @@ # src/modules/regchan # src/modules/reguser -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE register.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/regchan) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/reguser) +set(POTFILE register.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/regchan) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/reguser) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/serverdb/CMakeLists.txt b/po/modules/serverdb/CMakeLists.txt index 7c8f880a6..8f3608fda 100644 --- a/po/modules/serverdb/CMakeLists.txt +++ b/po/modules/serverdb/CMakeLists.txt @@ -4,13 +4,13 @@ # src/modules/proxydb # src/modules/serverdb -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE serverdb.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/proxydb) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/serverdb) +set(POTFILE serverdb.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/proxydb) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/serverdb) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/sharedfileswindow/CMakeLists.txt b/po/modules/sharedfileswindow/CMakeLists.txt index 8762e6ff1..311bfa7c8 100644 --- a/po/modules/sharedfileswindow/CMakeLists.txt +++ b/po/modules/sharedfileswindow/CMakeLists.txt @@ -5,13 +5,13 @@ # src/modules/sharedfileswindow -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE sharedfileswindow.pot) -SET(XGETTEXT_SOURCESDIR) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/sharedfile) -LIST(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/sharedfileswindow) +set(POTFILE sharedfileswindow.pot) +set(XGETTEXT_SOURCESDIR) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/sharedfile) +list(APPEND XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/sharedfileswindow) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/theme/CMakeLists.txt b/po/modules/theme/CMakeLists.txt index ea810744d..06e830f9d 100644 --- a/po/modules/theme/CMakeLists.txt +++ b/po/modules/theme/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/theme -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE theme.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/theme) +set(POTFILE theme.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/theme) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/po/modules/torrent/CMakeLists.txt b/po/modules/torrent/CMakeLists.txt index 38b719495..01e66af80 100644 --- a/po/modules/torrent/CMakeLists.txt +++ b/po/modules/torrent/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for po/modules/torrent -FILE(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") -FILE(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") +file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.po") +file(GLOB mofiles "${CMAKE_CURRENT_SOURCE_DIR}/*.mo") -SET(POTFILE torrent.pot) -SET(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/torrent) +set(POTFILE torrent.pot) +set(XGETTEXT_SOURCESDIR ${CMAKE_SOURCE_DIR}/src/modules/torrent) # Install target -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/translation.rules.txt) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 709f33806..8271c13e2 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -1,4 +1,4 @@ # CMakeLists for scripts/ # Find subdirs -SUBDIRS(config)
\ No newline at end of file +subdirs(config)
\ No newline at end of file diff --git a/scripts/config/CMakeLists.txt b/scripts/config/CMakeLists.txt index 076d61e28..c0c909294 100644 --- a/scripts/config/CMakeLists.txt +++ b/scripts/config/CMakeLists.txt @@ -1,17 +1,17 @@ # CMakeLists for scripts/config # Create bin -IF(WANT_COEXISTENCE) - SET(KVIRC_CONFIG ${PACKAGE}${VERSION_MAJOR}-config) -ELSE() - SET(KVIRC_CONFIG ${PACKAGE}-config) -ENDIF() +if(WANT_COEXISTENCE) + set(KVIRC_CONFIG ${PACKAGE}${VERSION_MAJOR}-config) +else() + set(KVIRC_CONFIG ${PACKAGE}-config) +endif() # Install target -IF(UNIX) - IF(NOT APPLE) +if(UNIX) + if(NOT APPLE) # This files are useless because apple bundles are movable # Assume linux - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${KVIRC_CONFIG} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - ENDIF() -ENDIF() + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${KVIRC_CONFIG} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) + endif() +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ce699a364..9e4cbe8c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ # CMakeLists for src/ # Find subdirs -SUBDIRS(kvilib kvirc modules) +subdirs(kvilib kvirc modules) diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 22c2cb6b3..f7e2882bb 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists.txt for src/kvilib/ -INCLUDE_DIRECTORIES( +include_directories( config core ext @@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES( # Please note that the sources have alphabetic order here -SET(kvilib_SRCS +set(kvilib_SRCS config/KviBuildInfo.cpp core/KviError.cpp core/KviHeapObject.cpp @@ -100,59 +100,59 @@ SET(kvilib_SRCS tal/KviTalWizard.cpp ) -IF(NOT DEFINED COMPILE_DISABLE_AVDEVICE) - LIST(APPEND kvilib_SRCS +if(NOT DEFINED COMPILE_DISABLE_AVDEVICE) + list(APPEND kvilib_SRCS ext/avdevice/videodevice.cpp ext/avdevice/videoinput.cpp ext/avdevice/videodevicepool.cpp ext/avdevice/bayer.cpp ext/avdevice/sonix_compress.cpp ) -ENDIF() +endif() -IF(NOT DEFINED COMPILE_DISABLE_OGG_THEORA) - LIST(APPEND kvilib_SRCS +if(NOT DEFINED COMPILE_DISABLE_OGG_THEORA) + list(APPEND kvilib_SRCS ext/KviOggTheoraDecoder.cpp ext/KviOggTheoraEncoder.cpp ) -ENDIF() +endif() # Create library -IF(WANT_COEXISTENCE) - SET(KVILIB_BINARYNAME kvilib${VERSION_MAJOR}) -ELSE() - SET(KVILIB_BINARYNAME kvilib) -ENDIF() +if(WANT_COEXISTENCE) + set(KVILIB_BINARYNAME kvilib${VERSION_MAJOR}) +else() + set(KVILIB_BINARYNAME kvilib) +endif() #we need this defined when mingw will compile moc files -IF(WIN32) - ADD_DEFINITIONS(-D__KVILIB__) -ENDIF() +if(WIN32) + add_definitions(-D__KVILIB__) +endif() -IF(MSVC) +if(MSVC) # THIS IS A DIRTY HACK: add winmm.lib for kvisnd. (maybe also needed for mingw?) perl does add a bunch of crap unconditionally, including winmm # TODO: fix it properly at some point: APPEND LIBS does not seem to work at all for modules(?) - LIST(APPEND LIBS wsock32.lib ws2_32.lib winmm.lib) -ENDIF() + list(APPEND LIBS wsock32.lib ws2_32.lib winmm.lib) +endif() -ADD_LIBRARY(${KVILIB_BINARYNAME} SHARED ${kvilib_SRCS} ${kvilib_MOC_SRCS}) -TARGET_LINK_LIBRARIES(${KVILIB_BINARYNAME} ${LIBS}) +add_library(${KVILIB_BINARYNAME} SHARED ${kvilib_SRCS} ${kvilib_MOC_SRCS}) +target_link_libraries(${KVILIB_BINARYNAME} ${LIBS}) -IF(Qt5Widgets_FOUND) +if(Qt5Widgets_FOUND) qt5_use_modules(${KVILIB_BINARYNAME} ${qt5_kvirc_modules}) -ENDIF() +endif() -SET_TARGET_PROPERTIES(${KVILIB_BINARYNAME} PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") +set_target_properties(${KVILIB_BINARYNAME} PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") -IF(WANT_STRIP) - GET_TARGET_PROPERTY(KVILIB_LOCATION ${KVILIB_BINARYNAME} LOCATION) - INSTALL(CODE "EXEC_PROGRAM(${STRIP_EXECUTABLE} ARGS -s \"${KVILIB_LOCATION}\")") -ENDIF() +if(WANT_STRIP) + get_target_property(KVILIB_LOCATION ${KVILIB_BINARYNAME} LOCATION) + install(CODE "exec_program(${STRIP_EXECUTABLE} ARGS -s \"${KVILIB_LOCATION}\")") +endif() # Installation directives -IF(UNIX) - INSTALL(TARGETS ${KVILIB_BINARYNAME} LIBRARY DESTINATION "${KVIRC_LIB_PATH}") -ELSEIF(WIN32) +if(UNIX) + install(TARGETS ${KVILIB_BINARYNAME} LIBRARY DESTINATION "${KVIRC_LIB_PATH}") +elseif(WIN32) # For DLL platforms the DLL part of a shared library is treated as a RUNTIME target and the corresponding import library is treated as an ARCHIVE target - INSTALL(TARGETS ${KVILIB_BINARYNAME} RUNTIME DESTINATION "${KVIRC_LIB_PATH}") -ENDIF() + install(TARGETS ${KVILIB_BINARYNAME} RUNTIME DESTINATION "${KVIRC_LIB_PATH}") +endif() diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index ef0d8e4d2..88727ac14 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists.txt for src/kvirc/ -INCLUDE_DIRECTORIES( +include_directories( kernel kvs kvs/event @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ../kvilib/system ) -SET(kvirc_SRCS +set(kvirc_SRCS ui/KviActionDrawer.cpp ui/KviChannelWindow.cpp ui/KviColorSelectionWindow.cpp @@ -245,84 +245,84 @@ SET(kvirc_SRCS kernel/KviUserInput.cpp ) -IF(MINGW) +if(MINGW) # resource compilation for mingw set(CMAKE_RC_COMPILER_INIT windres) - ENABLE_LANGUAGE(RC) - SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") + enable_language(RC) + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>") - LIST(APPEND kvirc_SRCS ${CMAKE_SOURCE_DIR}/data/resources_win32/kvirc.rc) -ENDIF() + list(APPEND kvirc_SRCS ${CMAKE_SOURCE_DIR}/data/resources_win32/kvirc.rc) +endif() -IF(MSVC) - LIST(APPEND LIBS shlwapi.lib) - LIST(APPEND kvirc_SRCS ${CMAKE_SOURCE_DIR}/data/resources_win32/kvirc.rc) -ENDIF() +if(MSVC) + list(APPEND LIBS shlwapi.lib) + list(APPEND kvirc_SRCS ${CMAKE_SOURCE_DIR}/data/resources_win32/kvirc.rc) +endif() # Link libraries # don't mind the WIN32 flag, its needed to not show a console on non-debug windows builds and is ignored anywhere else. -IF(NOT WANT_DEBUG) - ADD_EXECUTABLE(${KVIRC_BINARYNAME} WIN32 ${kvirc_SRCS} ${kvirc_MOC_SRCS}) -ELSE() - ADD_EXECUTABLE(${KVIRC_BINARYNAME} ${kvirc_SRCS} ${kvirc_MOC_SRCS}) -ENDIF() -TARGET_LINK_LIBRARIES(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS}) +if(NOT WANT_DEBUG) + add_executable(${KVIRC_BINARYNAME} WIN32 ${kvirc_SRCS} ${kvirc_MOC_SRCS}) +else() + add_executable(${KVIRC_BINARYNAME} ${kvirc_SRCS} ${kvirc_MOC_SRCS}) +endif() +target_link_libraries(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS}) -IF(Qt5Widgets_FOUND) +if(Qt5Widgets_FOUND) qt5_use_modules(${KVIRC_BINARYNAME} ${qt5_kvirc_modules}) -ENDIF() +endif() -SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") +set_target_properties(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") -IF(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") - SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS -export-dynamic) - MESSAGE(STATUS "Patching for FreeBSD...") -ENDIF() +if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") + set_target_properties(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS -export-dynamic) + message(STATUS "Patching for FreeBSD...") +endif() -IF(WIN32) +if(WIN32) # Needed for linking - SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES ENABLE_EXPORTS ON) + set_target_properties(${KVIRC_BINARYNAME} PROPERTIES ENABLE_EXPORTS ON) # We need this defined when mingw will compile moc files - ADD_DEFINITIONS(-D__KVIRC__) -ENDIF() + add_definitions(-D__KVIRC__) +endif() -IF(WANT_STRIP) - GET_TARGET_PROPERTY(KVIRC_LOCATION ${KVIRC_BINARYNAME} LOCATION) - INSTALL(CODE "EXEC_PROGRAM(${STRIP_EXECUTABLE} ARGS -s \"${KVIRC_LOCATION}\")") -ENDIF() +if(WANT_STRIP) + get_target_property(KVIRC_LOCATION ${KVIRC_BINARYNAME} LOCATION) + install(CODE "exec_program(${STRIP_EXECUTABLE} ARGS -s \"${KVIRC_LOCATION}\")") +endif() # Installation directives -INSTALL(TARGETS ${KVIRC_BINARYNAME} RUNTIME DESTINATION "${KVIRC_BIN_PATH}") +install(TARGETS ${KVIRC_BINARYNAME} RUNTIME DESTINATION "${KVIRC_BIN_PATH}") -IF(APPLE) - SET(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/Contents/Plugins) - SET(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/Contents/Resources) +if(APPLE) + set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/Contents/Plugins) + set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/Contents/Resources) #fixme dirty hack - SET(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins") + set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins") # note: no codecs in qt5 # note: phonon_backend => mediaservice # note: needs platform on osx # note: check if printsupport is needed, too - IF(WANT_DEBUG) - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime + if(WANT_DEBUG) + install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms|sqldrivers)/.*_debug\\.dylib") - ELSE() - INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime + else() + install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms|sqldrivers)/[^_]*\\.dylib") - ENDIF() + endif() - INSTALL(CODE " + install(CODE " file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths] Plugins = Plugins\") " COMPONENT Runtime) - INSTALL(CODE " + install(CODE " file(GLOB_RECURSE QTPLUGINS \"${plugin_dest_dir}/*.dylib\") include(BundleUtilities) fixup_bundle(\"${CMAKE_INSTALL_PREFIX}\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") " COMPONENT Runtime) -ENDIF() +endif() diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index edd464261..57468051d 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists.txt for src/modules/ -IF(APPLE) - SET(CMAKE_MODULE_LINKER_FLAGS "-undefined dynamic_lookup") -ENDIF() +if(APPLE) + set(CMAKE_MODULE_LINKER_FLAGS "-undefined dynamic_lookup") +endif() -INCLUDE_DIRECTORIES( +include_directories( ../kvilib/tal/ ../kvilib/config/ ../kvilib/core/ @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES( ../kvirc/ui/ ) -SUBDIRS( +subdirs( about action actioneditor addon aliaseditor avatar chan channelsjoin classeditor codetester config context dcc dialog @@ -44,15 +44,15 @@ SUBDIRS( window ) -IF(COMPILE_PERL_SUPPORT) - SUBDIRS(perl) -ENDIF() +if(COMPILE_PERL_SUPPORT) + subdirs(perl) +endif() -IF(COMPILE_PYTHON_SUPPORT) - SUBDIRS(python) -ENDIF() +if(COMPILE_PYTHON_SUPPORT) + subdirs(python) +endif() -IF(APPLE) +if(APPLE) # This is a dirty trick ensure we get some code executed after the last module gets installed - SUBDIRS(zzz_afterlastmodule) -ENDIF() + subdirs(zzz_afterlastmodule) +endif() diff --git a/src/modules/about/CMakeLists.txt b/src/modules/about/CMakeLists.txt index f13e3c4a2..415e4ac2c 100644 --- a/src/modules/about/CMakeLists.txt +++ b/src/modules/about/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/about -SET(kviabout_SRCS +set(kviabout_SRCS AboutDialog.cpp libkviabout.cpp ) -SET(kvi_module_name kviabout) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviabout) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/action/CMakeLists.txt b/src/modules/action/CMakeLists.txt index cdade3beb..a41ca7d52 100644 --- a/src/modules/action/CMakeLists.txt +++ b/src/modules/action/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/action -SET(kviaction_SRCS +set(kviaction_SRCS libkviaction.cpp ) -SET(kvi_module_name kviaction) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviaction) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/actioneditor/CMakeLists.txt b/src/modules/actioneditor/CMakeLists.txt index 01219de21..a0b930750 100644 --- a/src/modules/actioneditor/CMakeLists.txt +++ b/src/modules/actioneditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/actioneditor -SET(kviactioneditor_SRCS +set(kviactioneditor_SRCS ActionEditor.cpp libkviactioneditor.cpp ) -SET(kvi_module_name kviactioneditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviactioneditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/addon/CMakeLists.txt b/src/modules/addon/CMakeLists.txt index b260a6cbf..cc2588915 100644 --- a/src/modules/addon/CMakeLists.txt +++ b/src/modules/addon/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/addon -SET( +set( kviaddon_SRCS libkviaddon.cpp AddonManagementDialog.cpp @@ -9,5 +9,5 @@ SET( WebAddonInterfaceDialog.cpp ) -SET(kvi_module_name kviaddon) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviaddon) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/aliaseditor/CMakeLists.txt b/src/modules/aliaseditor/CMakeLists.txt index 25c3831e6..5583ccef5 100644 --- a/src/modules/aliaseditor/CMakeLists.txt +++ b/src/modules/aliaseditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/aliaseditor -SET(kvialiaseditor_SRCS +set(kvialiaseditor_SRCS libkvialiaseditor.cpp AliasEditorWindow.cpp ) -SET(kvi_module_name kvialiaseditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvialiaseditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/avatar/CMakeLists.txt b/src/modules/avatar/CMakeLists.txt index 28f0435ab..ce8f7b3c1 100644 --- a/src/modules/avatar/CMakeLists.txt +++ b/src/modules/avatar/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/avatar -SET(kviavatar_SRCS +set(kviavatar_SRCS libkviavatar.cpp ) -SET(kvi_module_name kviavatar) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviavatar) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/chan/CMakeLists.txt b/src/modules/chan/CMakeLists.txt index 3160ded82..9919bbd56 100644 --- a/src/modules/chan/CMakeLists.txt +++ b/src/modules/chan/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/chan -SET(kvichan_SRCS +set(kvichan_SRCS libkvichan.cpp ) -SET(kvi_module_name kvichan) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvichan) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/channelsjoin/CMakeLists.txt b/src/modules/channelsjoin/CMakeLists.txt index 6b3db6f09..b04a4131a 100644 --- a/src/modules/channelsjoin/CMakeLists.txt +++ b/src/modules/channelsjoin/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/channelsjoin -SET(kvichannelsjoin_SRCS +set(kvichannelsjoin_SRCS libkvichannelsjoin.cpp ChannelsJoinDialog.cpp ) -SET(kvi_module_name kvichannelsjoin) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvichannelsjoin) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/classeditor/CMakeLists.txt b/src/modules/classeditor/CMakeLists.txt index 7c4fa0874..b7d408c5d 100644 --- a/src/modules/classeditor/CMakeLists.txt +++ b/src/modules/classeditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/classeditor -SET(kviclasseditor_SRCS +set(kviclasseditor_SRCS libkviclasseditor.cpp ClassEditorWindow.cpp ) -SET(kvi_module_name kviclasseditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviclasseditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/codetester/CMakeLists.txt b/src/modules/codetester/CMakeLists.txt index 084aeaff0..390e4e1c9 100644 --- a/src/modules/codetester/CMakeLists.txt +++ b/src/modules/codetester/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/codetester -SET(kvicodetester_SRCS +set(kvicodetester_SRCS libkvicodetester.cpp CodeTesterWindow.cpp ) -SET(kvi_module_name kvicodetester) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvicodetester) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/config/CMakeLists.txt b/src/modules/config/CMakeLists.txt index 71a9dc81f..0d233bcbf 100644 --- a/src/modules/config/CMakeLists.txt +++ b/src/modules/config/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/config -SET(kviconfig_SRCS +set(kviconfig_SRCS libkviconfig.cpp ) -SET(kvi_module_name kviconfig) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviconfig) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/context/CMakeLists.txt b/src/modules/context/CMakeLists.txt index cb06787e5..666bf9484 100644 --- a/src/modules/context/CMakeLists.txt +++ b/src/modules/context/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/context -SET(kvicontext_SRCS +set(kvicontext_SRCS libkvicontext.cpp ) -SET(kvi_module_name kvicontext) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvicontext) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt index af776967f..84abb0ccd 100644 --- a/src/modules/dcc/CMakeLists.txt +++ b/src/modules/dcc/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/dcc -SET(kvidcc_SRCS +set(kvidcc_SRCS DccVoiceAdpcmCodec.cpp DccBroker.cpp DccCanvasWindow.cpp @@ -20,31 +20,31 @@ SET(kvidcc_SRCS DccWindow.cpp ) -IF(NOT DEFINED COMPILE_DISABLE_DCC_VIDEO) - LIST(APPEND kvidcc_SRCS +if(NOT DEFINED COMPILE_DISABLE_DCC_VIDEO) + list(APPEND kvidcc_SRCS DccVideoWindow.cpp ) -ENDIF() +endif() -SET(files +set(files kvi_dccfiletransfericons.png ) -IF(WIN32) - LIST(APPEND LIBS -lws2_32) -ENDIF() +if(WIN32) + list(APPEND LIBS -lws2_32) +endif() -SET(kvi_module_name kvidcc) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvidcc) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif() diff --git a/src/modules/dialog/CMakeLists.txt b/src/modules/dialog/CMakeLists.txt index c898505af..b61dbd3b4 100644 --- a/src/modules/dialog/CMakeLists.txt +++ b/src/modules/dialog/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/dialog -SET(kvidialog_SRCS +set(kvidialog_SRCS libkvidialog.cpp ) -SET(kvi_module_name kvidialog) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvidialog) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/editor/CMakeLists.txt b/src/modules/editor/CMakeLists.txt index f73b96971..d98cb2012 100644 --- a/src/modules/editor/CMakeLists.txt +++ b/src/modules/editor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/editor -SET(kvieditor_SRCS +set(kvieditor_SRCS libkvieditor.cpp ScriptEditorImplementation.cpp ) -SET(kvi_module_name kvieditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvieditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/eventeditor/CMakeLists.txt b/src/modules/eventeditor/CMakeLists.txt index 5269ac1ea..c3e6c9769 100644 --- a/src/modules/eventeditor/CMakeLists.txt +++ b/src/modules/eventeditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/eventeditor -SET(kvieventeditor_SRCS +set(kvieventeditor_SRCS EventEditorWindow.cpp libkvieventeditor.cpp ) -SET(kvi_module_name kvieventeditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvieventeditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/file/CMakeLists.txt b/src/modules/file/CMakeLists.txt index a22a40d94..04312044a 100644 --- a/src/modules/file/CMakeLists.txt +++ b/src/modules/file/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/file -SET(kvifile_SRCS +set(kvifile_SRCS libkvifile.cpp ) -SET(kvi_module_name kvifile) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvifile) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/filetransferwindow/CMakeLists.txt b/src/modules/filetransferwindow/CMakeLists.txt index 05aeced60..f0c6cb291 100644 --- a/src/modules/filetransferwindow/CMakeLists.txt +++ b/src/modules/filetransferwindow/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/filetransferwindow -SET(kvifiletransferwindow_SRCS +set(kvifiletransferwindow_SRCS libkvifiletransferwindow.cpp FileTransferWindow.cpp ) -SET(kvi_module_name kvifiletransferwindow) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvifiletransferwindow) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/fish/CMakeLists.txt b/src/modules/fish/CMakeLists.txt index 427c689ef..de2b1706f 100644 --- a/src/modules/fish/CMakeLists.txt +++ b/src/modules/fish/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/fish -SET(kvifish_SRCS +set(kvifish_SRCS libkvifish.cpp ) -SET(kvi_module_name kvifish) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvifish) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/help/CMakeLists.txt b/src/modules/help/CMakeLists.txt index 30f1202b8..7dda3610d 100644 --- a/src/modules/help/CMakeLists.txt +++ b/src/modules/help/CMakeLists.txt @@ -1,11 +1,11 @@ # CMakeLists for src/modules/help -SET(kvihelp_SRCS +set(kvihelp_SRCS libkvihelp.cpp HelpWidget.cpp HelpWindow.cpp HelpIndex.cpp ) -SET(kvi_module_name kvihelp) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvihelp) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt index f421cbfee..4b82b0895 100644 --- a/src/modules/http/CMakeLists.txt +++ b/src/modules/http/CMakeLists.txt @@ -1,24 +1,24 @@ # CMakeLists for src/modules/http -SET(kvihttp_SRCS +set(kvihttp_SRCS libkvihttp.cpp HttpFileTransfer.cpp ) -SET(files +set(files kvi_httpicons.png ) -SET(kvi_module_name kvihttp) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvihttp) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF()
\ No newline at end of file + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif()
\ No newline at end of file diff --git a/src/modules/ident/CMakeLists.txt b/src/modules/ident/CMakeLists.txt index fad51aa2a..228d9a842 100644 --- a/src/modules/ident/CMakeLists.txt +++ b/src/modules/ident/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/ident -SET(kviident_SRCS +set(kviident_SRCS libkviident.cpp ) -IF(WIN32) - SET(LIBS ${LIBS} -lws2_32) -ENDIF(WIN32) +if(WIN32) + set(LIBS ${LIBS} -lws2_32) +endif(WIN32) -SET(kvi_module_name kviident) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviident) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/iograph/CMakeLists.txt b/src/modules/iograph/CMakeLists.txt index 29b1ab051..cfee75ddb 100644 --- a/src/modules/iograph/CMakeLists.txt +++ b/src/modules/iograph/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/iograph -SET(kviiograph_SRCS +set(kviiograph_SRCS libkviiograph.cpp ) -SET(kvi_module_name kviiograph) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviiograph) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/lamerizer/CMakeLists.txt b/src/modules/lamerizer/CMakeLists.txt index d5a840002..8ecac997d 100644 --- a/src/modules/lamerizer/CMakeLists.txt +++ b/src/modules/lamerizer/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/lamerizer -SUBDIRS(caps) +subdirs(caps) -SET(kvilamerizer_SRCS +set(kvilamerizer_SRCS libkvilamerizer.cpp ) -SET(kvi_module_name kvilamerizer) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilamerizer) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/lamerizer/caps/CMakeLists.txt b/src/modules/lamerizer/caps/CMakeLists.txt index e526ccf9d..0d6b2ef69 100644 --- a/src/modules/lamerizer/caps/CMakeLists.txt +++ b/src/modules/lamerizer/caps/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./caps -SET(CAPSFILE lamerizer) +set(CAPSFILE lamerizer) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) + else() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) -ENDIF() + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) +endif() diff --git a/src/modules/language/CMakeLists.txt b/src/modules/language/CMakeLists.txt index d8f3848bf..8ebee5d2e 100644 --- a/src/modules/language/CMakeLists.txt +++ b/src/modules/language/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/language -SET(kvilanguage_SRCS +set(kvilanguage_SRCS libkvilanguage.cpp detector.cpp ) -SET(kvi_module_name kvilanguage) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilanguage) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/links/CMakeLists.txt b/src/modules/links/CMakeLists.txt index 23ec60243..667ef3753 100644 --- a/src/modules/links/CMakeLists.txt +++ b/src/modules/links/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/links -SET(kvilinks_SRCS +set(kvilinks_SRCS libkvilinks.cpp LinksWindow.cpp ) -SET(kvi_module_name kvilinks) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilinks) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/list/CMakeLists.txt b/src/modules/list/CMakeLists.txt index 71d9eb8cf..fd594e47c 100644 --- a/src/modules/list/CMakeLists.txt +++ b/src/modules/list/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/list -SET(kvilist_SRCS +set(kvilist_SRCS libkvilist.cpp ListWindow.cpp ) -SET(kvi_module_name kvilist) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilist) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/log/CMakeLists.txt b/src/modules/log/CMakeLists.txt index caa508dbf..d67fb202f 100644 --- a/src/modules/log/CMakeLists.txt +++ b/src/modules/log/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/log -SET(kvilog_SRCS +set(kvilog_SRCS libkvilog.cpp ) -SET(kvi_module_name kvilog) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilog) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/logview/CMakeLists.txt b/src/modules/logview/CMakeLists.txt index d47227b32..4d838cd67 100644 --- a/src/modules/logview/CMakeLists.txt +++ b/src/modules/logview/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/logview -SET(kvilogview_SRCS +set(kvilogview_SRCS libkvilogview.cpp LogFile.cpp LogViewWidget.cpp LogViewWindow.cpp ) -SET(kvi_module_name kvilogview) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvilogview) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/mask/CMakeLists.txt b/src/modules/mask/CMakeLists.txt index 7c8fbd327..8e43673d8 100644 --- a/src/modules/mask/CMakeLists.txt +++ b/src/modules/mask/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/mask -SET(kvimask_SRCS +set(kvimask_SRCS libkvimask.cpp ) -SET(kvi_module_name kvimask) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimask) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/math/CMakeLists.txt b/src/modules/math/CMakeLists.txt index 8adb2b610..a0bc08e55 100644 --- a/src/modules/math/CMakeLists.txt +++ b/src/modules/math/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/math -SET(kvimath_SRCS +set(kvimath_SRCS libkvimath.cpp ) -SET(kvi_module_name kvimath) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimath) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt index c497c0679..3c5c15854 100644 --- a/src/modules/mediaplayer/CMakeLists.txt +++ b/src/modules/mediaplayer/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/mediaplayer -SET(kvimediaplayer_SRCS +set(kvimediaplayer_SRCS libkvimediaplayer.cpp MpInterface.cpp MpMp3.cpp @@ -11,13 +11,13 @@ SET(kvimediaplayer_SRCS MpSpotifyInterface.cpp ) -SET(kvi_module_name kvimediaplayer) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimediaplayer) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(WIN32) - ADD_LIBRARY(gen_kvirc MODULE winamp.cpp) - IF(MINGW) - SET_TARGET_PROPERTIES(gen_kvirc PROPERTIES PREFIX "" LINK_FLAGS -static-libgcc COMPILE_FLAGS -static-libgcc) - ENDIF() - INSTALL(TARGETS gen_kvirc LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/modules) -ENDIF() +if(WIN32) + add_library(gen_kvirc MODULE winamp.cpp) + if(MINGW) + set_target_properties(gen_kvirc PROPERTIES PREFIX "" LINK_FLAGS -static-libgcc COMPILE_FLAGS -static-libgcc) + endif() + install(TARGETS gen_kvirc LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/modules) +endif() diff --git a/src/modules/mircimport/CMakeLists.txt b/src/modules/mircimport/CMakeLists.txt index 9a34e3839..2da6051a6 100644 --- a/src/modules/mircimport/CMakeLists.txt +++ b/src/modules/mircimport/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/mircimport -SUBDIRS(caps pics) +subdirs(caps pics) -SET(kvimircimport_SRCS +set(kvimircimport_SRCS libkvimircimport.cpp ) -SET(kvi_module_name kvimircimport) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimircimport) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/mircimport/caps/CMakeLists.txt b/src/modules/mircimport/caps/CMakeLists.txt index fc6aa669d..7db7cc5ac 100644 --- a/src/modules/mircimport/caps/CMakeLists.txt +++ b/src/modules/mircimport/caps/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./caps -SET(CAPSFILE mircimport) +set(CAPSFILE mircimport) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/serverimport/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/serverimport/) + else() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/serverimport/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/serverimport/) -ENDIF() + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/serverimport/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/serverimport/) +endif() diff --git a/src/modules/mircimport/pics/CMakeLists.txt b/src/modules/mircimport/pics/CMakeLists.txt index ba59cbdf4..96ba74f54 100644 --- a/src/modules/mircimport/pics/CMakeLists.txt +++ b/src/modules/mircimport/pics/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./pics -SET(PICSFILE kvi_mircimport.png) +set(PICSFILE kvi_mircimport.png) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF() + install(FILES ${PICSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif() diff --git a/src/modules/my/CMakeLists.txt b/src/modules/my/CMakeLists.txt index 912ec7e5a..e33ad1be0 100644 --- a/src/modules/my/CMakeLists.txt +++ b/src/modules/my/CMakeLists.txt @@ -1,11 +1,11 @@ # CMakeLists for src/modules/my -SET(kvimy_SRCS +set(kvimy_SRCS libkvimy.cpp Idle_x11.cpp Idle_mac.cpp Idle.cpp ) -SET(kvi_module_name kvimy) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvimy) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/notifier/CMakeLists.txt b/src/modules/notifier/CMakeLists.txt index bd4047ee5..e688ca8d7 100644 --- a/src/modules/notifier/CMakeLists.txt +++ b/src/modules/notifier/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/notifier -SET(kvinotifier_SRCS +set(kvinotifier_SRCS libkvinotifier.cpp NotifierWindow.cpp NotifierMessage.cpp @@ -8,7 +8,7 @@ SET(kvinotifier_SRCS NotifierWindowBorder.cpp ) -SET(kvi_module_name kvinotifier) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvinotifier) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -ADD_SUBDIRECTORY(pics) +add_subdirectory(pics) diff --git a/src/modules/notifier/pics/CMakeLists.txt b/src/modules/notifier/pics/CMakeLists.txt index 67a0f1bef..e72585c0f 100644 --- a/src/modules/notifier/pics/CMakeLists.txt +++ b/src/modules/notifier/pics/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for src/modules/notifier/pics -FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF() + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif() diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt index d2342fa96..0f324e93b 100644 --- a/src/modules/objects/CMakeLists.txt +++ b/src/modules/objects/CMakeLists.txt @@ -3,13 +3,13 @@ # From qmake #QT += xml -IF(WIN32) - LIST(APPEND LIBS -lws2_32) -ENDIF() +if(WIN32) + list(APPEND LIBS -lws2_32) +endif() -SET(kviobjects_SRCS +set(kviobjects_SRCS libkviobjects.cpp KvsObject_button.cpp KvsObject_buttonGroup.cpp @@ -62,5 +62,5 @@ SET(kviobjects_SRCS KvsObject_xmlreader.cpp ) -SET(kvi_module_name kviobjects) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviobjects) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt index b355ed6a0..2326afbc1 100644 --- a/src/modules/options/CMakeLists.txt +++ b/src/modules/options/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/options -SET(kvioptions_SRCS +set(kvioptions_SRCS libkvioptions.cpp OptionsWidgetContainer.cpp OptionsDialog.cpp @@ -46,5 +46,5 @@ SET(kvioptions_SRCS OptionsWidget_tray.cpp ) -SET(kvi_module_name kvioptions) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvioptions) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/perl/CMakeLists.txt b/src/modules/perl/CMakeLists.txt index f4fe7762e..b41c4a9bc 100644 --- a/src/modules/perl/CMakeLists.txt +++ b/src/modules/perl/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/perl -SET(kviperl_SRCS +set(kviperl_SRCS libkviperl.cpp ) -SET(kvi_module_name kviperl) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviperl) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/perlcore/CMakeLists.txt b/src/modules/perlcore/CMakeLists.txt index ca99a3257..593edac8a 100644 --- a/src/modules/perlcore/CMakeLists.txt +++ b/src/modules/perlcore/CMakeLists.txt @@ -1,31 +1,31 @@ # CMakeLists for src/modules/perlcore -SET(kviperlcore_SRCS +set(kviperlcore_SRCS libkviperlcore.cpp ) -SET(kvi_module_name kviperlcore) +set(kvi_module_name kviperlcore) -IF(COMPILE_PERL_SUPPORT) - EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts +if(COMPILE_PERL_SUPPORT) + execute_process(COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts OUTPUT_VARIABLE PERL_COMPILE_FLAGS ) #remove new line characters - STRING(REGEX REPLACE "(\r?\n)+$" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) + string(REGEX REPLACE "(\r?\n)+$" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) #remove leading and trailing spaces (string strip) - STRING(REGEX REPLACE "(^( )+|( )+$)" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) -ENDIF() + string(REGEX REPLACE "(^( )+|( )+$)" "" PERL_COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) +endif() -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(COMPILE_PERL_SUPPORT) - IF(WANT_DEBUG AND MSVC) +if(COMPILE_PERL_SUPPORT) + if(WANT_DEBUG AND MSVC) # Activestates Perl does not support Run-Time Error checks - STRING(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT}) - STRING(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG_INIT ${CMAKE_C_FLAGS_DEBUG_INIT}) - STRING(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - STRING(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - ENDIF() - SET_TARGET_PROPERTIES(${kvi_module_name} PROPERTIES COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) -ENDIF()
\ No newline at end of file + string(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT}) + string(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG_INIT ${CMAKE_C_FLAGS_DEBUG_INIT}) + string(REPLACE "/RTC1" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "/RTC1" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + endif() + set_target_properties(${kvi_module_name} PROPERTIES COMPILE_FLAGS ${PERL_COMPILE_FLAGS}) +endif()
\ No newline at end of file diff --git a/src/modules/popup/CMakeLists.txt b/src/modules/popup/CMakeLists.txt index a334bbbae..f92f16b66 100644 --- a/src/modules/popup/CMakeLists.txt +++ b/src/modules/popup/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/popup -SET(kvipopup_SRCS +set(kvipopup_SRCS libkvipopup.cpp ) -SET(kvi_module_name kvipopup) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvipopup) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/popupeditor/CMakeLists.txt b/src/modules/popupeditor/CMakeLists.txt index 9fdea80f5..5a447f1e5 100644 --- a/src/modules/popupeditor/CMakeLists.txt +++ b/src/modules/popupeditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/popupeditor -SET(kvipopupeditor_SRCS +set(kvipopupeditor_SRCS libkvipopupeditor.cpp PopupEditorWindow.cpp ) -SET(kvi_module_name kvipopupeditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvipopupeditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/proxydb/CMakeLists.txt b/src/modules/proxydb/CMakeLists.txt index 64b04e5b4..5a596eea6 100644 --- a/src/modules/proxydb/CMakeLists.txt +++ b/src/modules/proxydb/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/proxydb -SET(kviproxydb_SRCS +set(kviproxydb_SRCS libkviproxydb.cpp ) -SET(kvi_module_name kviproxydb) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviproxydb) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/python/CMakeLists.txt b/src/modules/python/CMakeLists.txt index 1c70434f9..468b2ff8b 100644 --- a/src/modules/python/CMakeLists.txt +++ b/src/modules/python/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/python -SET(kvipython_SRCS +set(kvipython_SRCS libkvipython.cpp ) -SET(kvi_module_name kvipython) +set(kvi_module_name kvipython) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/pythoncore/CMakeLists.txt b/src/modules/pythoncore/CMakeLists.txt index 4e74007cb..ba49fd109 100644 --- a/src/modules/pythoncore/CMakeLists.txt +++ b/src/modules/pythoncore/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/pythoncore -SET(kvipythoncore_SRCS +set(kvipythoncore_SRCS libkvipythoncore.cpp kvircmodule.cpp ) -SET(KVI_DEFAULT_FRAME_CAPTION "") +set(KVI_DEFAULT_FRAME_CAPTION "") -SET(kvi_module_name kvipythoncore) +set(kvi_module_name kvipythoncore) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/raweditor/CMakeLists.txt b/src/modules/raweditor/CMakeLists.txt index d366480fc..a1ea88d1b 100644 --- a/src/modules/raweditor/CMakeLists.txt +++ b/src/modules/raweditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/raweditor -SET(kviraweditor_SRCS +set(kviraweditor_SRCS libkviraweditor.cpp RawEditorWindow.cpp ) -SET(kvi_module_name kviraweditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviraweditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/regchan/CMakeLists.txt b/src/modules/regchan/CMakeLists.txt index 08ddd53ba..193921d32 100644 --- a/src/modules/regchan/CMakeLists.txt +++ b/src/modules/regchan/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/regchan -SET(kviregchan_SRCS +set(kviregchan_SRCS libkviregchan.cpp ) -SET(kvi_module_name kviregchan) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviregchan) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/reguser/CMakeLists.txt b/src/modules/reguser/CMakeLists.txt index 3573300c8..9197ed2eb 100644 --- a/src/modules/reguser/CMakeLists.txt +++ b/src/modules/reguser/CMakeLists.txt @@ -1,11 +1,11 @@ # CMakeLists for src/modules/reguser -SET(kvireguser_SRCS +set(kvireguser_SRCS libkvireguser.cpp RegisteredUserEntryDialog.cpp RegistrationWizard.cpp RegisteredUsersDialog.cpp ) -SET(kvi_module_name kvireguser) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvireguser) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt index e2e17bd81..92b3fe56b 100644 --- a/src/modules/rijndael/CMakeLists.txt +++ b/src/modules/rijndael/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/rijndael -IF(WANT_OPENSSL) - SUBDIRS(caps) +if(WANT_OPENSSL) + subdirs(caps) - SET(kvirijndael_SRCS + set(kvirijndael_SRCS libkvirijndael.cpp Rijndael.cpp BlowFish.cpp @@ -13,8 +13,8 @@ IF(WANT_OPENSSL) - # SET(ADDITIONAL_COMPILE_FLAGS "${ADDITIONAL_COMPILE_FLAGS} -fno-strict-aliasing") + # set(ADDITIONAL_COMPILE_FLAGS "${ADDITIONAL_COMPILE_FLAGS} -fno-strict-aliasing") - SET(kvi_module_name kvirijndael) - INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -ENDIF() + set(kvi_module_name kvirijndael) + include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +endif() diff --git a/src/modules/rijndael/caps/CMakeLists.txt b/src/modules/rijndael/caps/CMakeLists.txt index fe40c9e87..e56915489 100644 --- a/src/modules/rijndael/caps/CMakeLists.txt +++ b/src/modules/rijndael/caps/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./caps -SET(CAPSFILE rijndael) +set(CAPSFILE rijndael) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) + else() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) -ENDIF() + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) +endif() diff --git a/src/modules/rot13/CMakeLists.txt b/src/modules/rot13/CMakeLists.txt index cb80a5f50..730a89da9 100644 --- a/src/modules/rot13/CMakeLists.txt +++ b/src/modules/rot13/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/rot13 -SUBDIRS(caps) +subdirs(caps) -SET(kvirot13_SRCS +set(kvirot13_SRCS libkvirot13.cpp ) -SET(kvi_module_name kvirot13) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvirot13) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/rot13/caps/CMakeLists.txt b/src/modules/rot13/caps/CMakeLists.txt index 8c1efa8be..4c02ac1ca 100644 --- a/src/modules/rot13/caps/CMakeLists.txt +++ b/src/modules/rot13/caps/CMakeLists.txt @@ -1,14 +1,14 @@ # CMakeLists for ./caps -SET(CAPSFILE rot13) +set(CAPSFILE rot13) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/crypt/) + else() # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) -ENDIF() + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/crypt/) + endif() +elseif(WIN32) + install(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/crypt/) +endif() diff --git a/src/modules/serverdb/CMakeLists.txt b/src/modules/serverdb/CMakeLists.txt index de563343a..be1f1829f 100644 --- a/src/modules/serverdb/CMakeLists.txt +++ b/src/modules/serverdb/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/serverdb -SET(kviserverdb_SRCS +set(kviserverdb_SRCS libkviserverdb.cpp ) -SET(kvi_module_name kviserverdb) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviserverdb) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt index 7f2634662..41729eb33 100644 --- a/src/modules/setup/CMakeLists.txt +++ b/src/modules/setup/CMakeLists.txt @@ -1,15 +1,15 @@ # CMakeLists for src/modules/setup -IF(WIN32) - LIST(APPEND LIBS -lole32 -luuid) -ENDIF() +if(WIN32) + list(APPEND LIBS -lole32 -luuid) +endif() -SET(kvisetup_SRCS +set(kvisetup_SRCS libkvisetup.cpp SetupWizard.cpp ) -SET(kvi_module_name kvisetup) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisetup) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/sharedfile/CMakeLists.txt b/src/modules/sharedfile/CMakeLists.txt index 64b1041f1..c4e050cd1 100644 --- a/src/modules/sharedfile/CMakeLists.txt +++ b/src/modules/sharedfile/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/sharedfile -SET(kvisharedfile_SRCS +set(kvisharedfile_SRCS libkvisharedfile.cpp ) -SET(kvi_module_name kvisharedfile) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisharedfile) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/sharedfileswindow/CMakeLists.txt b/src/modules/sharedfileswindow/CMakeLists.txt index cbfde16c1..5589461c1 100644 --- a/src/modules/sharedfileswindow/CMakeLists.txt +++ b/src/modules/sharedfileswindow/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/sharedfileswindow -SET(kvisharedfileswindow_SRCS +set(kvisharedfileswindow_SRCS libkvisharedfileswindow.cpp SharedFilesWindow.cpp ) -SET(kvi_module_name kvisharedfileswindow) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisharedfileswindow) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/snd/CMakeLists.txt b/src/modules/snd/CMakeLists.txt index 479332f22..ae75c3fdd 100644 --- a/src/modules/snd/CMakeLists.txt +++ b/src/modules/snd/CMakeLists.txt @@ -1,22 +1,22 @@ # CMakeLists for src/modules/snd -IF(COMPILE_PHONON_SUPPORT) - INCLUDE_DIRECTORIES(${PHONON_INCLUDE_DIR}) -ENDIF() +if(COMPILE_PHONON_SUPPORT) + include_directories(${PHONON_INCLUDE_DIR}) +endif() -IF(MINGW) - LIST(APPEND LIBS -lwinmm) -ENDIF() +if(MINGW) + list(APPEND LIBS -lwinmm) +endif() -IF(MSVC) - LIST(APPEND LIBS winmm.lib) -ENDIF() +if(MSVC) + list(APPEND LIBS winmm.lib) +endif() -SET(kvisnd_SRCS +set(kvisnd_SRCS libkvisnd.cpp ) -SET(kvi_module_name kvisnd) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisnd) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/socketspy/CMakeLists.txt b/src/modules/socketspy/CMakeLists.txt index 94b7a7399..00e3ff954 100644 --- a/src/modules/socketspy/CMakeLists.txt +++ b/src/modules/socketspy/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/socketspy -SET(kvisocketspy_SRCS +set(kvisocketspy_SRCS libkvisocketspy.cpp SocketSpyWindow.cpp ) -SET(kvi_module_name kvisocketspy) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisocketspy) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/spaste/CMakeLists.txt b/src/modules/spaste/CMakeLists.txt index 7746be3f4..1182bc9f4 100644 --- a/src/modules/spaste/CMakeLists.txt +++ b/src/modules/spaste/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/spaste -SET(kvispaste_SRCS +set(kvispaste_SRCS libkvispaste.cpp SlowPasteController.cpp ) -SET(kvi_module_name kvispaste) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvispaste) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/str/CMakeLists.txt b/src/modules/str/CMakeLists.txt index 2d0781294..9e4b1bcda 100644 --- a/src/modules/str/CMakeLists.txt +++ b/src/modules/str/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/str -SET(kvistr_SRCS +set(kvistr_SRCS libkvistr.cpp ) -SET(kvi_module_name kvistr) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvistr) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/system/CMakeLists.txt b/src/modules/system/CMakeLists.txt index 549d9daf8..cd5f1a1c1 100644 --- a/src/modules/system/CMakeLists.txt +++ b/src/modules/system/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/system -SET(kvisystem_SRCS +set(kvisystem_SRCS libkvisystem.cpp Plugin.cpp ) -SET(kvi_module_name kvisystem) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvisystem) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/term/CMakeLists.txt b/src/modules/term/CMakeLists.txt index 1e31629de..4491a08ec 100644 --- a/src/modules/term/CMakeLists.txt +++ b/src/modules/term/CMakeLists.txt @@ -1,10 +1,10 @@ # CMakeLists for src/modules/term -SET(kviterm_SRCS +set(kviterm_SRCS libkviterm.cpp TermWidget.cpp TermWindow.cpp ) -SET(kvi_module_name kviterm) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviterm) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/texticons/CMakeLists.txt b/src/modules/texticons/CMakeLists.txt index 3a5abdda6..90ed579ad 100644 --- a/src/modules/texticons/CMakeLists.txt +++ b/src/modules/texticons/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/texticons -SET(kvitexticons_SRCS +set(kvitexticons_SRCS libkvitexticons.cpp ) -SET(kvi_module_name kvitexticons) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitexticons) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/theme/CMakeLists.txt b/src/modules/theme/CMakeLists.txt index 024d74a57..26e89aa88 100644 --- a/src/modules/theme/CMakeLists.txt +++ b/src/modules/theme/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/theme -SET(kvitheme_SRCS +set(kvitheme_SRCS libkvitheme.cpp WebThemeInterfaceDialog.cpp ThemeManagementDialog.cpp @@ -9,5 +9,5 @@ SET(kvitheme_SRCS ThemeFunctions.cpp ) -SET(kvi_module_name kvitheme) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitheme) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/tip/CMakeLists.txt b/src/modules/tip/CMakeLists.txt index 3dc50b888..1e14e4c9a 100644 --- a/src/modules/tip/CMakeLists.txt +++ b/src/modules/tip/CMakeLists.txt @@ -1,26 +1,26 @@ # CMakeLists for src/modules/tip -SET(kvitip_SRCS +set(kvitip_SRCS libkvitip.cpp ) -FILE(GLOB tips "*.kvc") -FILE(GLOB pics "*.png") +file(GLOB tips "*.kvc") +file(GLOB pics "*.png") -SET(kvi_module_name kvitip) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitip) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) # Install rule -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/config/modules/) - INSTALL(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/config/modules/) + install(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/modules/) - INSTALL(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/config/modules/) - INSTALL(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF()
\ No newline at end of file + install(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/config/modules/) + install(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${tips} DESTINATION ${CMAKE_INSTALL_PREFIX}/config/modules/) + install(FILES ${pics} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif()
\ No newline at end of file diff --git a/src/modules/tmphighlight/CMakeLists.txt b/src/modules/tmphighlight/CMakeLists.txt index 96ced70cb..ed14fe619 100644 --- a/src/modules/tmphighlight/CMakeLists.txt +++ b/src/modules/tmphighlight/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/tmphighlight -SET(kvitmphighlight_SRCS +set(kvitmphighlight_SRCS libkvitmphighlight.cpp ) -SET(kvi_module_name kvitmphighlight) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitmphighlight) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/toolbar/CMakeLists.txt b/src/modules/toolbar/CMakeLists.txt index 4c4f90ed0..90d0b624d 100644 --- a/src/modules/toolbar/CMakeLists.txt +++ b/src/modules/toolbar/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/toolbar -SET(kvitoolbar_SRCS +set(kvitoolbar_SRCS libkvitoolbar.cpp ) -SET(kvi_module_name kvitoolbar) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitoolbar) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/toolbareditor/CMakeLists.txt b/src/modules/toolbareditor/CMakeLists.txt index aa7322aa6..87d107350 100644 --- a/src/modules/toolbareditor/CMakeLists.txt +++ b/src/modules/toolbareditor/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/toolbareditor -SET(kvitoolbareditor_SRCS +set(kvitoolbareditor_SRCS libkvitoolbareditor.cpp CustomizeToolBarsDialog.cpp ) -SET(kvi_module_name kvitoolbareditor) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitoolbareditor) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/torrent/CMakeLists.txt b/src/modules/torrent/CMakeLists.txt index 8742dfde9..636ee7c48 100644 --- a/src/modules/torrent/CMakeLists.txt +++ b/src/modules/torrent/CMakeLists.txt @@ -1,11 +1,11 @@ # CMakeLists for src/modules/torrent -SET(kvitorrent_SRCS +set(kvitorrent_SRCS libkvitorrent.cpp StatusBarApplet.cpp KTorrentDbusInterface.cpp TorrentInterface.cpp ) -SET(kvi_module_name kvitorrent) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitorrent) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/trayicon/CMakeLists.txt b/src/modules/trayicon/CMakeLists.txt index dbec283cb..3304f479f 100644 --- a/src/modules/trayicon/CMakeLists.txt +++ b/src/modules/trayicon/CMakeLists.txt @@ -1,35 +1,35 @@ # CMakeLists for src/modules/trayicon -SET(kvitrayicon_SRCS +set(kvitrayicon_SRCS libkvitrayicon.cpp ) -SET(unixFiles +set(unixFiles kvi_dock.png kvi_dock_part-0.png kvi_dock_part-1.png kvi_dock_part-2.png ) -SET(win32Files +set(win32Files kvi_dock_win32.png kvi_dock_win32-0.png kvi_dock_win32-1.png kvi_dock_win32-2.png ) -FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.png") -SET(kvi_module_name kvitrayicon) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kvitrayicon) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) - ELSE() +if(UNIX) + if(APPLE) + install(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + else() # Assume linux - INSTALL(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${win32Files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) -ENDIF()
\ No newline at end of file + install(FILES ${unixFiles} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + endif() +elseif(WIN32) + install(FILES ${win32Files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +endif()
\ No newline at end of file diff --git a/src/modules/upnp/CMakeLists.txt b/src/modules/upnp/CMakeLists.txt index e0e55713f..648f2fcdc 100644 --- a/src/modules/upnp/CMakeLists.txt +++ b/src/modules/upnp/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists for src/modules/upnp -SET(kviupnp_SRCS +set(kviupnp_SRCS igdcontrolpoint.cpp libkviupnp.cpp Manager.cpp @@ -13,5 +13,5 @@ SET(kviupnp_SRCS -SET(kvi_module_name kviupnp) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviupnp) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/url/CMakeLists.txt b/src/modules/url/CMakeLists.txt index 91fdacb9c..bdd8bf47a 100644 --- a/src/modules/url/CMakeLists.txt +++ b/src/modules/url/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/url -SET(kviurl_SRCS +set(kviurl_SRCS libkviurl.cpp ) -SET(kvi_module_name kviurl) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviurl) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/userlist/CMakeLists.txt b/src/modules/userlist/CMakeLists.txt index d4f8bebde..adedaf3f5 100644 --- a/src/modules/userlist/CMakeLists.txt +++ b/src/modules/userlist/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for src/modules/userlist -SET(kviuserlist_SRCS +set(kviuserlist_SRCS libkviuserlist.cpp ) -SET(kvi_module_name kviuserlist) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviuserlist) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/window/CMakeLists.txt b/src/modules/window/CMakeLists.txt index e68e2627a..832c9b172 100644 --- a/src/modules/window/CMakeLists.txt +++ b/src/modules/window/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists for src/modules/window -SET(kviwindow_SRCS +set(kviwindow_SRCS libkviwindow.cpp UserWindow.cpp ) -SET(kvi_module_name kviwindow) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +set(kvi_module_name kviwindow) +include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) diff --git a/src/modules/zzz_afterlastmodule/CMakeLists.txt b/src/modules/zzz_afterlastmodule/CMakeLists.txt index ff885a22d..39d29c157 100644 --- a/src/modules/zzz_afterlastmodule/CMakeLists.txt +++ b/src/modules/zzz_afterlastmodule/CMakeLists.txt @@ -1,9 +1,9 @@ # CMakeLists.txt for src/modules/zzz_afterlastmodule -IF(APPLE) - INSTALL(CODE " +if(APPLE) + install(CODE " file(GLOB_RECURSE KVIRC_INSTALLED_MODULES \"${KVIRC_MOD_PATH}/*.so\") include(BundleUtilities) fixup_bundle(\"${CMAKE_INSTALL_PREFIX}\" \"\${KVIRC_INSTALLED_MODULES}\" \"\") " COMPONENT Runtime) -ENDIF() +endif() diff --git a/win32build/CMakeLists.txt b/win32build/CMakeLists.txt index 542ef6f10..265f608de 100644 --- a/win32build/CMakeLists.txt +++ b/win32build/CMakeLists.txt @@ -1,8 +1,8 @@ # CMakeLists for win32build
-SUBDIRS(translations)
+subdirs(translations)
-IF(WIN32)
+if(WIN32)
#attention: nsis scripts contains ${variables} that would be replaced by cmake
- CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/KVIrc.nsi.cmake ${PROJECT_BINARY_DIR}/KVIrc.nsi @ONLY)
-ENDIF()
\ No newline at end of file + configure_file(${PROJECT_SOURCE_DIR}/cmake/KVIrc.nsi.cmake ${PROJECT_BINARY_DIR}/KVIrc.nsi @ONLY)
+endif()
\ No newline at end of file diff --git a/win32build/translations/CMakeLists.txt b/win32build/translations/CMakeLists.txt index 17ac52dfb..84762fa06 100644 --- a/win32build/translations/CMakeLists.txt +++ b/win32build/translations/CMakeLists.txt @@ -1,7 +1,7 @@ # CMakeLists for win32build/translations
-FILE(GLOB translations "${CMAKE_CURRENT_SOURCE_DIR}/*.nsi")
+file(GLOB translations "${CMAKE_CURRENT_SOURCE_DIR}/*.nsi")
-IF(WIN32)
- INSTALL(FILES ${translations} DESTINATION ${PROJECT_BINARY_DIR}/translations/)
-ENDIF()
\ No newline at end of file +if(WIN32)
+ install(FILES ${translations} DESTINATION ${PROJECT_BINARY_DIR}/translations/)
+endif()
\ No newline at end of file |