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 98436f882d)
v3.5.13-sru
Slávek Banko 4 years ago
parent d37bb843d1
commit 610545c103
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -1094,15 +1094,15 @@ configure_file( kdoctools/checkXML.cmake kdoctools/checkXML )
##### tools ##################################### ##### tools #####################################
set( KDE3_DCOPIDL_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl/dcopidl ) set( KDE3_DCOPIDL_EXECUTABLE dcopidl )
set( KDE3_DCOPIDLNG_EXECUTABLE set( KDE3_DCOPIDLNG_EXECUTABLE
perl -I"${CMAKE_SOURCE_DIR}/dcop/dcopidlng" perl -I"${CMAKE_SOURCE_DIR}/dcop/dcopidlng"
"${CMAKE_SOURCE_DIR}/dcop/dcopidlng/kalyptus" "${CMAKE_SOURCE_DIR}/dcop/dcopidlng/kalyptus"
--allow_k_dcop_accessors -f dcopidl --allow_k_dcop_accessors -f dcopidl
) )
set( KDE3_DCOPIDL2CPP_EXECUTABLE ${CMAKE_BINARY_DIR}/dcop/dcopidl2cpp/dcopidl2cpp ) set( KDE3_DCOPIDL2CPP_EXECUTABLE dcopidl2cpp )
set( KDE3_MEINPROC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdoctools/meinproc ) set( KDE3_MEINPROC_EXECUTABLE meinproc )
set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdecore/kconfig_compiler/kconfig_compiler ) set( KDE3_KCFGC_EXECUTABLE kconfig_compiler )
##### global compiler settings ################## ##### global compiler settings ##################

@ -45,6 +45,5 @@ tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS} SOURCES ${${target}_SRCS}
VERSION 1.0.0 VERSION 1.0.0
LINK kdecore-shared ${AVAHI_TQT_LIBRARIES} ${AVAHI_CLIENT_LIBRARIES} LINK kdecore-shared ${AVAHI_TQT_LIBRARIES} ${AVAHI_CLIENT_LIBRARIES}
DEPENDENCIES kconfig_compiler
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -10,4 +10,3 @@
################################################# #################################################
tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION kspell ) tde_create_handbook( SRCDIR ${CMAKE_SOURCE_DIR}/kdoctools DESTINATION kspell )
add_dependencies( kspell-en-handbook meinproc )

Loading…
Cancel
Save