summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2020-08-08 18:33:11 +0900
committerSlávek Banko <slavek.banko@axis.cz>2020-08-31 11:51:45 +0200
commit928f3ce5fabcf1794a1843be442f366844d2b74c (patch)
tree043189584c2bd5d3cd41ea996e2cd0faab9e029a
parentc428e74c00bea87af94016138a6a88b19150db2c (diff)
downloadtdelibs-928f3ce5fabcf1794a1843be442f366844d2b74c.tar.gz
tdelibs-928f3ce5fabcf1794a1843be442f366844d2b74c.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.txt1
-rw-r--r--config.h.cmake3
-rw-r--r--dcop/CMakeLists.txt6
3 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eba0a1549..ae92022f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 )
diff --git a/config.h.cmake b/config.h.cmake
index 86ff0491f..5c80c0921 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 7d2b46617..c93085a0b 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