diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-08-08 18:33:11 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-03 22:39:32 +0100 |
| commit | f250423e9d9f93562ad82fc04620b335e0c6c783 (patch) | |
| tree | ddc23a67aeda32f7264fd6d2af178d5b11a48f6f | |
| parent | b92175e2a345f29e4ac9af7680b4799a14662644 (diff) | |
| download | tdelibs-f250423e9d9f93562ad82fc04620b335e0c6c783.tar.gz tdelibs-f250423e9d9f93562ad82fc04620b335e0c6c783.zip | |
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 56c5973b6b33df77a7491b07411cbd772c0d5d79)
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | dcop/CMakeLists.txt | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c3a305458..1b7142ca2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1097,7 +1097,6 @@ endif( WITH_HSPELL ) ##### write configure files ##################### configure_file( config.h.cmake config.h ) -configure_file( dcop/dcop-path.h.cmake dcop/dcop-path.h ) configure_file( kdecore/kdemacros.h.cmake kdecore/kdemacros.h ) configure_file( kjs/global.h.in kjs/global.h ) configure_file( kio/kssl/ksslconfig.h.cmake kio/kssl/ksslconfig.h ) diff --git a/config.h.cmake b/config.h.cmake index 169d07538..b4927f631 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -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@" diff --git a/dcop/CMakeLists.txt b/dcop/CMakeLists.txt index 8a69361f7..783035805 100644 --- a/dcop/CMakeLists.txt +++ b/dcop/CMakeLists.txt @@ -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 |