kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: remove KDE3_ENABLE_FINAL (#4140): it doesn't work currently and I 

don't have the time to fix this since it would require bigger changes. Maybe
I'll do this if the KDE3 support of CMake becomes more widely used.

Alex
This commit is contained in:
Alexander Neundorf 2007-02-20 16:02:51 -05:00
parent 747f135d2c
commit 2ab03bd4f0
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindKDE3.cmake
View File

@ -13,7 +13,6 @@
# #
# The following user adjustable options are provided: # 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
# #
# #
@ -47,18 +46,20 @@
# This will create and install a simple libtool file for the given target. # This will create and install a simple libtool file for the given target.
# #
# KDE3_ADD_EXECUTABLE(name file1 ... fileN ) # 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 ) # KDE3_ADD_KPART(name [WITH_PREFIX] file1 ... fileN )
# Create a KDE plugin (KPart, kioslave, etc.) from the given source files. # 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. # 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. # It creates and installs an appropriate libtool la-file.
# #
# KDE3_ADD_KDEINIT_EXECUTABLE(name file1 ... fileN ) # KDE3_ADD_KDEINIT_EXECUTABLE(name file1 ... fileN )
# Create a KDE application in the form of a module loadable via kdeinit. # 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. # 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> # Author: Alexander Neundorf <neundorf@kde.org>

32
Modules/KDE3Macros.cmake
View File

@ -334,7 +334,7 @@ MACRO(KDE3_CREATE_FINAL_FILE _filename)
ENDMACRO(KDE3_CREATE_FINAL_FILE) 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") OPTION(KDE3_BUILD_TESTS "Build the tests")
@ -346,12 +346,12 @@ MACRO(KDE3_ADD_KPART _target_NAME _with_PREFIX)
SET(_first_SRC ${_with_PREFIX}) SET(_first_SRC ${_with_PREFIX})
ENDIF (${_with_PREFIX} STREQUAL "WITH_PREFIX") ENDIF (${_with_PREFIX} STREQUAL "WITH_PREFIX")
IF (KDE3_ENABLE_FINAL) # IF (KDE3_ENABLE_FINAL)
KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN}) # KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN})
ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final.cpp) # ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final.cpp)
ELSE (KDE3_ENABLE_FINAL) # ELSE (KDE3_ENABLE_FINAL)
ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN}) ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN})
ENDIF (KDE3_ENABLE_FINAL) # ENDIF (KDE3_ENABLE_FINAL)
IF(_first_SRC) IF(_first_SRC)
SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "")
@ -364,12 +364,12 @@ ENDMACRO(KDE3_ADD_KPART)
MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME ) MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME )
IF (KDE3_ENABLE_FINAL) # IF (KDE3_ENABLE_FINAL)
KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN}) # KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp) # ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp)
ELSE (KDE3_ENABLE_FINAL) # ELSE (KDE3_ENABLE_FINAL)
ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} ) ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} )
ENDIF (KDE3_ENABLE_FINAL) # ENDIF (KDE3_ENABLE_FINAL)
CONFIGURE_FILE(${KDE3_MODULE_DIR}/kde3init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) 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 ) MACRO(KDE3_ADD_EXECUTABLE _target_NAME )
IF (KDE3_ENABLE_FINAL) # IF (KDE3_ENABLE_FINAL)
KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN}) # KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final.cpp) # ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final.cpp)
ELSE (KDE3_ENABLE_FINAL) # ELSE (KDE3_ENABLE_FINAL)
ADD_EXECUTABLE(${_target_NAME} ${ARGN} ) ADD_EXECUTABLE(${_target_NAME} ${ARGN} )
ENDIF (KDE3_ENABLE_FINAL) # ENDIF (KDE3_ENABLE_FINAL)
ENDMACRO(KDE3_ADD_EXECUTABLE) ENDMACRO(KDE3_ADD_EXECUTABLE)