Fix to set DCOP_PATH properly

It is only used in dcop module and empty is unwanted situation,
so properly define it in dcop/CMakeLists.txt.
Rerevant header generation is also moved to there, and prevent
to define in main config.h file too.

Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 56c5973b6b)
r14.0.x
OBATA Akio 4 years ago committed by Slávek Banko
parent c428e74c00
commit 928f3ce5fa
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -1155,7 +1155,6 @@ endif ( WITH_TDEICONLOADER_DEBUG )
##### write configure files #####################
configure_file( config.h.cmake config.h )
configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h )
configure_file( tdecore/kdemacros.h.cmake tdecore/kdemacros.h )
configure_file( kjs/global.h.in kjs/global.h )
configure_file( tdeio/kssl/ksslconfig.h.cmake tdeio/kssl/ksslconfig.h )

@ -15,9 +15,6 @@
/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA
/* Define where your dcop binary is */
#cmakedefine DCOP_PATH "@DCOP_PATH@"
/* Use su or sudo */
#define DEFAULT_SUPER_USER_COMMAND "@DEFAULT_SUPER_USER_COMMAND@"

@ -30,6 +30,12 @@ link_directories(
)
##### Define where your dcop binary is ##########
set( DCOP_PATH "${BIN_INSTALL_DIR}" )
configure_file( dcop-path.h.cmake dcop-path.h )
##### headers ###################################
install( FILES

Loading…
Cancel
Save