Branch: r14.0.x

93c1526b 2018-07-03 18:22:14 Michele Calgaro 
cmake: Use set_property( SOURCE ... COMPILE_DEFINITIONS )
instead of set_source_files_properties( ... COMPILE_FLAGS )
to avoid the problem of double escaping quotation marks.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit 967cf90889abe8df9f6c262319a92a5c8a660f12)
M kcontrol/displayconfig/CMakeLists.txt
M kcontrol/dnssd/CMakeLists.txt
M kcontrol/hwmanager/CMakeLists.txt
M kcontrol/iccconfig/CMakeLists.txt
M kcontrol/tdm/CMakeLists.txt
M kcontrol/usbview/CMakeLists.txt
M kdesktop/CMakeLists.txt

kcontrol/displayconfig/CMakeLists.txt

diff --git a/kcontrol/displayconfig/CMakeLists.txt b/kcontrol/displayconfig/CMakeLists.txt
index dfa4588..a4d2696 100644
--- a/kcontrol/displayconfig/CMakeLists.txt
+++ b/kcontrol/displayconfig/CMakeLists.txt
@@ -31,7 +31,7 @@
 
 ##### kcm_displayconfig (module) ####################
 
-set_source_files_properties( displayconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
+set_property( SOURCE displayconfig.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
 
 tde_add_kpart( kcm_displayconfig AUTOMOC
   SOURCES

kcontrol/dnssd/CMakeLists.txt

diff --git a/kcontrol/dnssd/CMakeLists.txt b/kcontrol/dnssd/CMakeLists.txt
index e0036ba..527e9f1 100644
--- a/kcontrol/dnssd/CMakeLists.txt
+++ b/kcontrol/dnssd/CMakeLists.txt
@@ -27,7 +27,7 @@
 
 ##### kcm_tdednssd (module) #######################
 
-set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
+set_property( SOURCE kcmdnssd.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
 
 tde_add_kpart( kcm_tdednssd AUTOMOC
   SOURCES configdialog.ui kcmdnssd.cpp

kcontrol/hwmanager/CMakeLists.txt

diff --git a/kcontrol/hwmanager/CMakeLists.txt b/kcontrol/hwmanager/CMakeLists.txt
index 584eba7..cf6fc74 100644
--- a/kcontrol/hwmanager/CMakeLists.txt
+++ b/kcontrol/hwmanager/CMakeLists.txt
@@ -29,7 +29,7 @@
 
 ##### kcm_iccconfig (module) ####################
 
-set_source_files_properties( hwmanager.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
+set_property( SOURCE hwmanager.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
 
 tde_add_kpart( kcm_hwmanager AUTOMOC
   SOURCES

kcontrol/iccconfig/CMakeLists.txt

diff --git a/kcontrol/iccconfig/CMakeLists.txt b/kcontrol/iccconfig/CMakeLists.txt
index 4af3af6..e3b47ce 100644
--- a/kcontrol/iccconfig/CMakeLists.txt
+++ b/kcontrol/iccconfig/CMakeLists.txt
@@ -28,7 +28,7 @@
 
 ##### kcm_iccconfig (module) ####################
 
-set_source_files_properties( iccconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
+set_property( SOURCE iccconfig.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
 
 tde_add_kpart( kcm_iccconfig AUTOMOC
   SOURCES

kcontrol/tdm/CMakeLists.txt

diff --git a/kcontrol/tdm/CMakeLists.txt b/kcontrol/tdm/CMakeLists.txt
index 7c2a1f8..4283d06 100644
--- a/kcontrol/tdm/CMakeLists.txt
+++ b/kcontrol/tdm/CMakeLists.txt
@@ -29,8 +29,7 @@
 
 ##### kcm_tdm (module) ##########################
 
-set_source_files_properties( background.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
-set_source_files_properties( main.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
+set_property( SOURCE background.cpp main.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
 
 tde_add_kpart( kcm_tdm AUTOMOC
   SOURCES

kcontrol/usbview/CMakeLists.txt

diff --git a/kcontrol/usbview/CMakeLists.txt b/kcontrol/usbview/CMakeLists.txt
index 1584d06..61138a7 100644
--- a/kcontrol/usbview/CMakeLists.txt
+++ b/kcontrol/usbview/CMakeLists.txt
@@ -26,7 +26,7 @@
 install( FILES kcmusb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 if( WITH_USBIDS )
-  set_source_files_properties( usbdb.cpp PROPERTIES COMPILE_FLAGS -DUSBIDS_FILE=\\"${WITH_USBIDS}\\" )
+  set_property( SOURCE usbdb.cpp APPEND PROPERTY COMPILE_DEFINITIONS USBIDS_FILE="${WITH_USBIDS}" )
 else( )
   install( FILES usb.ids DESTINATION ${DATA_INSTALL_DIR} )
 endif( )

kdesktop/CMakeLists.txt

diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index fcb84a6..c8fdabf 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -81,8 +81,7 @@
 ##### kdesktop (tdeinit) ########################
 
 set( target kdesktop )
-set_source_files_properties( lockeng.cc PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
-
+set_property( SOURCE lockeng.cc APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
 
 set( ${target}_SRCS
   main.cc krootwm.cc xautolock.cc kdiconview.cc init.cc