diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:18:44 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:18:44 -0600 |
commit | 297232d9c6412522b1e0386b71d1b110bf7fbd0c (patch) | |
tree | 4d1ad211da2bdc015536e27c8db2e6b91127dce8 | |
parent | ed2f03b8912223e657c22abcd4adf516739546a0 (diff) | |
download | kbfx-297232d9c6412522b1e0386b71d1b110bf7fbd0c.tar.gz kbfx-297232d9c6412522b1e0386b71d1b110bf7fbd0c.zip |
Additional kde to tde renaming
-rw-r--r-- | cmakemodules/FindKDE4Internal.cmake | 62 | ||||
-rw-r--r-- | cmakemodules/FindKdeLibs.cmake | 14 | ||||
-rw-r--r-- | cmakemodules/KDE3Macros.cmake | 6 | ||||
-rw-r--r-- | cmakemodules/KDE4Macros.cmake | 12 |
4 files changed, 47 insertions, 47 deletions
diff --git a/cmakemodules/FindKDE4Internal.cmake b/cmakemodules/FindKDE4Internal.cmake index 3923172..7238a35 100644 --- a/cmakemodules/FindKDE4Internal.cmake +++ b/cmakemodules/FindKDE4Internal.cmake @@ -22,8 +22,8 @@ # The following variables point to the location of the KDE libraries, # but shouldn't be used directly: # -# KDE4_KDECORE_LIBRARY - the kdecore library -# KDE4_KDEUI_LIBRARY - the kdeui library +# KDE4_KDECORE_LIBRARY - the tdecore library +# KDE4_KDEUI_LIBRARY - the tdeui library # KDE4_KIO_LIBRARY - the kio library # KDE4_KPARTS_LIBRARY - the kparts library # KDE4_KUTILS_LIBRARY - the kutils library @@ -32,13 +32,13 @@ # KDE4_KHTML_LIBRARY - the khtml library # KDE4_KJS_LIBRARY - the kjs library # KDE4_KNEWSTUFF_LIBRARY - the knewstuff library -# KDE4_KDEPRINT_LIBRARY - the kdeprint library +# KDE4_KDEPRINT_LIBRARY - the tdeprint library # KDE4_KSPELL2_LIBRARY - the kspell2 library # KDE4_KDNSSD_LIBRARY - the kdnssd library # KDE4_PHONONCORE_LIBRARY - the phononcore library # KDE4_PHONONUI_LIBRARY - the phononui library # KDE4_KAUDIODEVICELIST_LIBRARY - the kaudiodevicelist library -# KDE4_KDEFX_LIBRARY - the kdefx library +# KDE4_KDEFX_LIBRARY - the tdefx library # KDE4_THREADWEAVER_LIBRARY- the threadweaver library # KDE4_SOLID_LIBRARY - the solid library # KDE4_SOLIDIFACES_LIBRARY - the solidiface library @@ -51,8 +51,8 @@ # also contain all of the depending libraries, so the variables below # should be used instead of the ones above: # -# KDE4_KDECORE_LIBS - the kdecore library and all depending libraries -# KDE4_KDEUI_LIBS - the kdeui library and all depending libraries +# KDE4_KDECORE_LIBS - the tdecore library and all depending libraries +# KDE4_KDEUI_LIBS - the tdeui library and all depending libraries # KDE4_KIO_LIBS - the kio library and all depending libraries # KDE4_KPARTS_LIBS - the kparts library and all depending libraries # KDE4_KUTILS_LIBS - the kutils library and all depending libraries @@ -61,13 +61,13 @@ # KDE4_KHTML_LIBS - the khtml library and all depending libraries # KDE4_KJS_LIBS - the kjs library and all depending libraries # KDE4_KNEWSTUFF_LIBS - the knewstuff library and all depending libraries -# KDE4_KDEPRINT_LIBS - the kdeprint library and all depending libraries +# KDE4_KDEPRINT_LIBS - the tdeprint library and all depending libraries # KDE4_KSPELL2_LIBS - the kspell2 library and all depending libraries # KDE4_KDNSSD_LIBS - the kdnssd library and all depending libraries -# KDE4_KDESU_LIBS - the kdesu library and all depending libraries +# KDE4_KDESU_LIBS - the tdesu library and all depending libraries # KDE4_PHONONCORE_LIBS - the phononcore library and all depending librairies # KDE4_PHONONUI_LIBRARIES - the phononui library and all depending librairies -# KDE4_KDEFX_LIBS - the kdefx library and all depending librairies +# KDE4_KDEFX_LIBS - the tdefx library and all depending librairies # KDE4_THREADWEAVER_LIBRARIES- the threadweaver library and all depending libraries # KDE4_SOLID_LIBS - the solid library and all depending libraries # KDE4_SOLIDIFACES_LIBS - the solid iface library and all depending libraries @@ -156,8 +156,8 @@ # It creates and installs an appropriate libtool la-file. # # KDE4_ADD_KDEINIT_EXECUTABLE (name [NOGUI] [RUN_UNINSTALLED] 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. +# Create a KDE application in the form of a module loadable via tdeinit. +# A library named tdeinit_<name> will be created and a small executable which links to it. # It supports KDE4_ENABLE_FINAL # If the executable has to be run from the buildtree (e.g. unit tests and code generators # used later on when compiling), set the option RUN_UNINSTALLED. @@ -323,17 +323,17 @@ option(KDE4_ENABLE_FPIE "Enable platform supports PIE linking") #are we trying to compile kdelibs ? #then enter bootstrap mode -if(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) +if(EXISTS ${CMAKE_SOURCE_DIR}/tdecore/kernel/kglobal.h) message(STATUS "Building kdelibs...") set(KDE4_INCLUDE_DIR ${CMAKE_SOURCE_DIR}) - set(KDE4_KDECORE_LIBS ${QT_QTCORE_LIBRARY} kdecore) - set(KDE4_KDEUI_LIBS ${KDE4_KDECORE_LIBS} kdeui) + set(KDE4_KDECORE_LIBS ${QT_QTCORE_LIBRARY} tdecore) + set(KDE4_KDEUI_LIBS ${KDE4_KDECORE_LIBS} tdeui) set(KDE4_KIO_LIBS ${KDE4_KDEUI_LIBS} kio) set(KDE4_KPARTS_LIBS ${KDE4_KIO_LIBS} kparts) set(KDE4_KUTILS_LIBS ${KDE4_KIO_LIBS} kutils) - set(KDE4_KDEFX_LIBS ${KDE4_KDEFX_LIBS} kdefx) + set(KDE4_KDEFX_LIBS ${KDE4_KDEFX_LIBS} tdefx) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) @@ -360,7 +360,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) set(KDE4_INSTALLED_VERSION_OK TRUE) -else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) +else(EXISTS ${CMAKE_SOURCE_DIR}/tdecore/kernel/kglobal.h) # ... but NOT otherwise set( _KDE4_KCONFIG_COMPILER_DEP) @@ -394,14 +394,14 @@ else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) # this file contains all dependencies of all libraries of kdelibs, Alex include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) - find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) - set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) + find_library(KDE4_KDECORE_LIBRARY NAMES tdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_KDECORE_LIBS ${tdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} ) - find_library(KDE4_KDEFX_LIBRARY NAMES kdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) - set(KDE4_KDEFX_LIBS ${kdefx_LIB_DEPENDS} ${KDE4_KDEFX_LIBRARY} ) + find_library(KDE4_KDEFX_LIBRARY NAMES tdefx PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_KDEFX_LIBS ${tdefx_LIB_DEPENDS} ${KDE4_KDEFX_LIBRARY} ) - find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) - set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) + find_library(KDE4_KDEUI_LIBRARY NAMES tdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_KDEUI_LIBS ${tdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ) find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ) @@ -424,15 +424,15 @@ else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) find_library(KDE4_KNEWSTUFF_LIBRARY NAMES knewstuff PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) set(KDE4_KNEWSTUFF_LIBS ${knewstuff_LIB_DEPENDS} ${KDE4_KNEWSTUFF_LIBRARY} ) - find_library(KDE4_KDEPRINT_LIBRARY NAMES kdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) - set(KDE4_KDEPRINT_LIBS ${kdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} ) + find_library(KDE4_KDEPRINT_LIBRARY NAMES tdeprint PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_KDEPRINT_LIBS ${tdeprint_LIB_DEPENDS} ${KDE4_KDEPRINT_LIBRARY} ) find_library(KDE4_KSPELL2_LIBRARY NAMES kspell2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) set(KDE4_KSPELL2_LIBS ${kspell2_LIB_DEPENDS} ${KDE4_KSPELL2_LIBRARY} ) if (UNIX) - find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) - set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) + find_library(KDE4_KDESU_LIBRARY NAMES tdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) + set(KDE4_KDESU_LIBS ${tdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ) endif (UNIX) find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) @@ -515,7 +515,7 @@ else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) ) find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets ) -endif(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) +endif(EXISTS ${CMAKE_SOURCE_DIR}/tdecore/kernel/kglobal.h) ##################### and now the platform specific stuff ############################ @@ -543,9 +543,9 @@ if (WIN32) # if we are compiling kdelibs, add KDEWIN32_LIBRARIES explicitely, # otherwise they come from KDELibsDependencies.cmake, Alex - if(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) + if(EXISTS ${CMAKE_SOURCE_DIR}/tdecore/kernel/kglobal.h) set( KDE4_KDECORE_LIBS ${KDE4_KDECORE_LIBS} ${KDEWIN32_LIBRARIES} ) - endif(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) + endif(EXISTS ${CMAKE_SOURCE_DIR}/tdecore/kernel/kglobal.h) # windows, mingw if(MINGW) @@ -786,7 +786,7 @@ endif (KDE4_INCLUDE_DIR AND KDE4_LIB_DIR AND KDE4_KCFGC_EXECUTABLE AND KDE4_INST macro (KDE4_PRINT_RESULTS) # inside kdelibs the include dir and lib dir are internal, not "found" - if(NOT EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) + if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tdecore/kernel/kglobal.h) if(KDE4_INCLUDE_DIR) message(STATUS "Found KDE4 include dir: ${KDE4_INCLUDE_DIR}") else(KDE4_INCLUDE_DIR) @@ -798,7 +798,7 @@ macro (KDE4_PRINT_RESULTS) else(KDE4_LIB_DIR) message(STATUS "Didn't find KDE4 core library") endif(KDE4_LIB_DIR) - endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h) + endif(NOT EXISTS ${CMAKE_SOURCE_DIR}/tdecore/kernel/kglobal.h) if(KDE4_KCFGC_EXECUTABLE) message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}") diff --git a/cmakemodules/FindKdeLibs.cmake b/cmakemodules/FindKdeLibs.cmake index 826d035..85d6c2a 100644 --- a/cmakemodules/FindKdeLibs.cmake +++ b/cmakemodules/FindKdeLibs.cmake @@ -7,7 +7,7 @@ include(FindQt3) # 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 +# QT_AND_KDECORE_LIBS - this contains both the Qt and the tdecore library # KDE3_DCOPIDL_EXECUTABLE - the dcopidl executable # KDE3_DCOPIDL2CPP_EXECUTABLE - the dcopidl2cpp executable # KDE3_KCFGC_EXECUTABLE - the kconfig_compiler executable @@ -56,8 +56,8 @@ include(FindQt3) # 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. +# Create a KDE application in the form of a module loadable via tdeinit. +# A library named tdeinit_<name> will be created and a small executable which links to it. # # The option KDE3_ENABLE_FINAL to enable all-in-one compilation is # no longer supported. @@ -122,7 +122,7 @@ ENDIF(KDECONFIG_EXECUTABLE) # at first the KDE include direcory -# kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore +# kpassdlg.h comes from tdeui and doesn't exist in KDE4 anymore FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h HINTS $ENV{KDEDIR}/include @@ -139,7 +139,7 @@ FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h # SET(KDE3_INCLUDE_DIR "/usr/include/kde") #now the KDE library directory -FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore +FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES tdecore HINTS $ENV{KDEDIR}/lib ${KDE3PREFIX}/lib @@ -330,7 +330,7 @@ IF (LIB_SUFFIX) ${LIB_SEARCH_PATHES}) ENDIF (LIB_SUFFIX) -FIND_LIBRARY(KDE3_UI_LIBRARY NAMES kdeui +FIND_LIBRARY(KDE3_UI_LIBRARY NAMES tdeui PATHS ${LIB_SEARCH_PATHES} ) @@ -355,7 +355,7 @@ FIND_LIBRARY(KDE3_WALLET_LIBRARY NAMES kwalletclient ${LIB_SEARCH_PATHES} ) -FIND_LIBRARY(KDE3_KINIT_KDED_LIBRARY NAMES kdeinit_kded +FIND_LIBRARY(KDE3_KINIT_KDED_LIBRARY NAMES tdeinit_kded PATHS ${LIB_SEARCH_PATHES} ) diff --git a/cmakemodules/KDE3Macros.cmake b/cmakemodules/KDE3Macros.cmake index 38c9b8f..b188d6c 100644 --- a/cmakemodules/KDE3Macros.cmake +++ b/cmakemodules/KDE3Macros.cmake @@ -365,15 +365,15 @@ 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) + ADD_LIBRARY(tdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp) ELSE (KDE3_ENABLE_FINAL) - ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} ) + ADD_LIBRARY(tdeinit_${_target_NAME} SHARED ${ARGN} ) ENDIF (KDE3_ENABLE_FINAL) CONFIGURE_FILE(${KDE3_MODULE_DIR}/trinityinit_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ) - TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} ) + TARGET_LINK_LIBRARIES( ${_target_NAME} tdeinit_${_target_NAME} ) ENDMACRO(KDE3_ADD_KDEINIT_EXECUTABLE) diff --git a/cmakemodules/KDE4Macros.cmake b/cmakemodules/KDE4Macros.cmake index 8be1538..ea4753d 100644 --- a/cmakemodules/KDE4Macros.cmake +++ b/cmakemodules/KDE4Macros.cmake @@ -464,7 +464,7 @@ macro (KDE4_CREATE_FINAL_FILES _filenameCPP _filesExcludedFromFinalFile ) endmacro (KDE4_CREATE_FINAL_FILES) -# This macro sets the RPATH related options for libraries, plugins and kdeinit executables. +# This macro sets the RPATH related options for libraries, plugins and tdeinit executables. # It overrides the defaults set in FindKDE4Internal.cmake. # If RPATH is not explicitely disabled, libraries and plugins are built without RPATH, in # the hope that the RPATH which is compiled into the executable is good enough. @@ -648,19 +648,19 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) kde4_get_automoc_files(_automoc_FILES ${_SRCS}) if (KDE4_ENABLE_FINAL) - kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/kdeinit_${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS}) - add_library(kdeinit_${_target_NAME} SHARED ${CMAKE_CURRENT_BINARY_DIR}/kdeinit_${_target_NAME}_final_cpp.cpp ${_separate_files} ${_automoc_FILES}) + kde4_create_final_files(${CMAKE_CURRENT_BINARY_DIR}/tdeinit_${_target_NAME}_final_cpp.cpp _separate_files ${_SRCS}) + add_library(tdeinit_${_target_NAME} SHARED ${CMAKE_CURRENT_BINARY_DIR}/tdeinit_${_target_NAME}_final_cpp.cpp ${_separate_files} ${_automoc_FILES}) else (KDE4_ENABLE_FINAL) - add_library(kdeinit_${_target_NAME} SHARED ${_SRCS} ${_automoc_FILES}) + add_library(tdeinit_${_target_NAME} SHARED ${_SRCS} ${_automoc_FILES}) endif (KDE4_ENABLE_FINAL) - kde4_handle_rpath_for_library(kdeinit_${_target_NAME}) + kde4_handle_rpath_for_library(tdeinit_${_target_NAME}) configure_file(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) kde4_add_executable(${_target_NAME} "${_nogui}" "${_uninst}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) - target_link_libraries(${_target_NAME} kdeinit_${_target_NAME}) + target_link_libraries(${_target_NAME} tdeinit_${_target_NAME}) # endif (WIN32) if (WIN32) |