diff options
| -rw-r--r-- | Modules/FindKDE3.cmake | 29 | ||||
| -rw-r--r-- | Modules/KDE3Macros.cmake | 40 |
2 files changed, 35 insertions, 34 deletions
diff --git a/Modules/FindKDE3.cmake b/Modules/FindKDE3.cmake index 12ab449..bca71de 100644 --- a/Modules/FindKDE3.cmake +++ b/Modules/FindKDE3.cmake @@ -1,20 +1,19 @@ # - Find the KDE3 include and library dirs, KDE preprocessors and define a some macros # # This module defines the following variables: -# KDE3_DEFINITIONS - compiler definitions required for compiling KDE software -# KDE3_INCLUDE_DIR - the KDE include directory -# KDE3_INCLUDE_DIRS - the KDE and the Qt include directory, for use with INCLUDE_DIRECTORIES() -# KDE3_LIB_DIR - the directory where the KDE libraries are installed, for use with LINK_DIRECTORIES() -# QT_AND_KDECORE_LIBS - this contains both the Qt and the kdecore library -# KDE3_DCOPIDL_EXECUTABLE - the dcopidl executable -# KDE3_DCOPIDL2CPP_EXECUTABLE - the dcopidl2cpp executable -# KDE3_KCFGC_EXECUTABLE - the kconfig_compiler executable -# KDE3_FOUND - set to TRUE if all of the above has been found +# KDE3_DEFINITIONS - compiler definitions required for compiling KDE software +# KDE3_INCLUDE_DIR - the KDE include directory +# KDE3_INCLUDE_DIRS - the KDE and the Qt include directory, for use with INCLUDE_DIRECTORIES() +# KDE3_LIB_DIR - the directory where the KDE libraries are installed, for use with LINK_DIRECTORIES() +# QT_AND_KDECORE_LIBS - this contains both the Qt and the kdecore library +# KDE3_DCOPIDL_EXECUTABLE - the dcopidl executable +# KDE3_DCOPIDL2CPP_EXECUTABLE - the dcopidl2cpp executable +# KDE3_KCFGC_EXECUTABLE - the kconfig_compiler executable +# KDE3_FOUND - set to TRUE if all of the above has been found # # The following user adjustable options are provided: # -# KDE3_ENABLE_FINAL - enable this for KDE-style enable-final all-in-one compilation -# KDE3_BUILD_TESTS - enable this to build KDE testcases +# KDE3_BUILD_TESTS - enable this to build KDE testcases # # # It also adds the following macros (from KDE3Macros.cmake) @@ -47,18 +46,20 @@ # This will create and install a simple libtool file for the given target. # # KDE3_ADD_EXECUTABLE(name file1 ... fileN ) -# Equivalent to ADD_EXECUTABLE(), but additionally supports KDE3_ENABLE_FINAL +# Currently identical to ADD_EXECUTABLE(), may provide some advanced features in the future. # # KDE3_ADD_KPART(name [WITH_PREFIX] file1 ... fileN ) # Create a KDE plugin (KPart, kioslave, etc.) from the given source files. -# It supports KDE3_ENABLE_FINAL # If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't. # It creates and installs an appropriate libtool la-file. # # KDE3_ADD_KDEINIT_EXECUTABLE(name file1 ... fileN ) # Create a KDE application in the form of a module loadable via kdeinit. # A library named kdeinit_<name> will be created and a small executable which links to it. -# It supports KDE3_ENABLE_FINAL +# +# The option KDE3_ENABLE_FINAL to enable all-in-one compilation is +# no longer supported. +# # # Author: Alexander Neundorf <neundorf@kde.org> diff --git a/Modules/KDE3Macros.cmake b/Modules/KDE3Macros.cmake index 6866fe2..722e299 100644 --- a/Modules/KDE3Macros.cmake +++ b/Modules/KDE3Macros.cmake @@ -39,7 +39,7 @@ MACRO(KDE3_ADD_DCOP_SKELS _sources) ARGS ${_tmp_FILE} > ${_kidl} DEPENDS ${_tmp_FILE} ) - + ENDIF (NOT HAVE_${_basename}_KIDL_RULE) IF (NOT HAVE_${_basename}_SKEL_RULE) @@ -334,7 +334,7 @@ MACRO(KDE3_CREATE_FINAL_FILE _filename) ENDMACRO(KDE3_CREATE_FINAL_FILE) -OPTION(KDE3_ENABLE_FINAL "Enable final all-in-one compilation") +# OPTION(KDE3_ENABLE_FINAL "Enable final all-in-one compilation") OPTION(KDE3_BUILD_TESTS "Build the tests") @@ -346,12 +346,12 @@ MACRO(KDE3_ADD_KPART _target_NAME _with_PREFIX) SET(_first_SRC ${_with_PREFIX}) ENDIF (${_with_PREFIX} STREQUAL "WITH_PREFIX") - IF (KDE3_ENABLE_FINAL) - KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN}) - ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final.cpp) - ELSE (KDE3_ENABLE_FINAL) - ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN}) - ENDIF (KDE3_ENABLE_FINAL) +# IF (KDE3_ENABLE_FINAL) +# KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN}) +# ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final.cpp) +# ELSE (KDE3_ENABLE_FINAL) + ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN}) +# ENDIF (KDE3_ENABLE_FINAL) IF(_first_SRC) SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "") @@ -364,12 +364,12 @@ ENDMACRO(KDE3_ADD_KPART) MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME ) - IF (KDE3_ENABLE_FINAL) - KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN}) - ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp) - ELSE (KDE3_ENABLE_FINAL) - ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} ) - ENDIF (KDE3_ENABLE_FINAL) +# IF (KDE3_ENABLE_FINAL) +# KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN}) +# ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp) +# ELSE (KDE3_ENABLE_FINAL) + ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} ) +# ENDIF (KDE3_ENABLE_FINAL) CONFIGURE_FILE(${KDE3_MODULE_DIR}/kde3init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) @@ -381,12 +381,12 @@ ENDMACRO(KDE3_ADD_KDEINIT_EXECUTABLE) MACRO(KDE3_ADD_EXECUTABLE _target_NAME ) - IF (KDE3_ENABLE_FINAL) - KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN}) - ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final.cpp) - ELSE (KDE3_ENABLE_FINAL) - ADD_EXECUTABLE(${_target_NAME} ${ARGN} ) - ENDIF (KDE3_ENABLE_FINAL) +# IF (KDE3_ENABLE_FINAL) +# KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN}) +# ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final.cpp) +# ELSE (KDE3_ENABLE_FINAL) + ADD_EXECUTABLE(${_target_NAME} ${ARGN} ) +# ENDIF (KDE3_ENABLE_FINAL) ENDMACRO(KDE3_ADD_EXECUTABLE) |