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> | 2020-06-16 04:01:51 +0200 |
| commit | 52d5b0c2378b07b40554d15fecaa65d1228cfa9a (patch) | |
| tree | 0ee827e24297dbef8874bbfb2e78054889a670a0 | |
| parent | 5bc932facd53871093c4b2874a1f615c52195154 (diff) | |
| download | tdelibs-52d5b0c2378b07b40554d15fecaa65d1228cfa9a.tar.gz tdelibs-52d5b0c2378b07b40554d15fecaa65d1228cfa9a.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/tdespell/CMakeLists.txt | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ea923b99..9f646b13e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1152,15 +1152,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}/tdecore/tdeconfig_compiler/tdeconfig_compiler ) +set( KDE3_DCOPIDL2CPP_EXECUTABLE dcopidl2cpp ) +set( KDE3_MEINPROC_EXECUTABLE meinproc ) +set( KDE3_KCFGC_EXECUTABLE tdeconfig_compiler ) ##### global compiler settings ################## diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt index 844ee16f4..1c1e40d11 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 tdecore-shared ${AVAHI_TQT_LIBRARIES} ${AVAHI_CLIENT_LIBRARIES} - DEPENDENCIES tdeconfig_compiler DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/doc/tdespell/CMakeLists.txt b/doc/tdespell/CMakeLists.txt index 6e2539833..72836d572 100644 --- a/doc/tdespell/CMakeLists.txt +++ b/doc/tdespell/CMakeLists.txt @@ -10,4 +10,3 @@ ################################################# tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION tdespell ) -add_dependencies( tdespell-en-handbook meinproc ) |