diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-06-16 01:56:21 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-03 22:23:43 +0100 |
| commit | 610545c103d42ae1659dc0b4cf8bc181f30d66d2 (patch) | |
| tree | c63791d2d02f0fe4b64da8df3a78347a5934b164 | |
| parent | d37bb843d18966a1b2f38e49363dc9f8ebbaed43 (diff) | |
| download | tdelibs-610545c103d42ae1659dc0b4cf8bc181f30d66d2.tar.gz tdelibs-610545c103d42ae1659dc0b4cf8bc181f30d66d2.zip | |
Use target names for commands instead of full paths.
When using target names for commands, CMake automatically resolves
the necessary dependencies without having to specify them in the
CMakeLists.txt source code or in the common TDE CMake module.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 98436f882d2146fe156c26e81bb87d409cfcf819)
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | dnssd/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | doc/kspell/CMakeLists.txt | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 390cd420f..1252f8461 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1094,15 +1094,15 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML ) ##### tools ##################################### -set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl ) +set( KDE3_DCOPIDL_EXECUTABLE dcopidl ) set( KDE3_DCOPIDLNG_EXECUTABLE perl -I"${CMAKE_SOURCE_DIR}/dcop/dcopidlng" "${CMAKE_SOURCE_DIR}/dcop/dcopidlng/kalyptus" --allow_k_dcop_accessors -f dcopidl ) -set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp ) -set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc ) -set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdecore/kconfig_compiler/kconfig_compiler ) +set( KDE3_DCOPIDL2CPP_EXECUTABLE dcopidl2cpp ) +set( KDE3_MEINPROC_EXECUTABLE meinproc ) +set( KDE3_KCFGC_EXECUTABLE kconfig_compiler ) ##### global compiler settings ################## diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt index d973df137..3306f49aa 100644 --- a/dnssd/CMakeLists.txt +++ b/dnssd/CMakeLists.txt @@ -45,6 +45,5 @@ tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 LINK kdecore-shared ${AVAHI_TQT_LIBRARIES} ${AVAHI_CLIENT_LIBRARIES} - DEPENDENCIES kconfig_compiler DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/doc/kspell/CMakeLists.txt b/doc/kspell/CMakeLists.txt index 94bc7cff5..2c67b9295 100644 --- a/doc/kspell/CMakeLists.txt +++ b/doc/kspell/CMakeLists.txt @@ -10,4 +10,3 @@ ################################################# tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION kspell ) -add_dependencies( kspell-en-handbook meinproc ) |