From 967cf90889abe8df9f6c262319a92a5c8a660f12 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 4 Jul 2018 01:20:59 +0200
Subject: cmake: Use set_property( SOURCE ... COMPILE_DEFINITIONS ) instead of
 set_source_files_properties( ... COMPILE_FLAGS ) to avoid the problem of
 double escaping quotation marks.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 kcontrol/displayconfig/CMakeLists.txt | 2 +-
 kcontrol/dnssd/CMakeLists.txt         | 2 +-
 kcontrol/hwmanager/CMakeLists.txt     | 2 +-
 kcontrol/iccconfig/CMakeLists.txt     | 2 +-
 kcontrol/tdm/CMakeLists.txt           | 3 +--
 kcontrol/usbview/CMakeLists.txt       | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'kcontrol')

diff --git a/kcontrol/displayconfig/CMakeLists.txt b/kcontrol/displayconfig/CMakeLists.txt
index dfa45882b..a4d26960d 100644
--- a/kcontrol/displayconfig/CMakeLists.txt
+++ b/kcontrol/displayconfig/CMakeLists.txt
@@ -31,7 +31,7 @@ install( FILES displayconfig.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 ##### 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
diff --git a/kcontrol/dnssd/CMakeLists.txt b/kcontrol/dnssd/CMakeLists.txt
index e0036ba24..527e9f163 100644
--- a/kcontrol/dnssd/CMakeLists.txt
+++ b/kcontrol/dnssd/CMakeLists.txt
@@ -27,7 +27,7 @@ install( FILES kcm_tdednssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 ##### 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
diff --git a/kcontrol/hwmanager/CMakeLists.txt b/kcontrol/hwmanager/CMakeLists.txt
index dfe327740..954c41fc3 100644
--- a/kcontrol/hwmanager/CMakeLists.txt
+++ b/kcontrol/hwmanager/CMakeLists.txt
@@ -35,7 +35,7 @@ install( FILES hwdevicetray-autostart.desktop
 
 ##### 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
diff --git a/kcontrol/iccconfig/CMakeLists.txt b/kcontrol/iccconfig/CMakeLists.txt
index 4af3af694..e3b47ce0d 100644
--- a/kcontrol/iccconfig/CMakeLists.txt
+++ b/kcontrol/iccconfig/CMakeLists.txt
@@ -28,7 +28,7 @@ install( FILES iccconfig.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 ##### 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
diff --git a/kcontrol/tdm/CMakeLists.txt b/kcontrol/tdm/CMakeLists.txt
index 7c2a1f887..4283d0612 100644
--- a/kcontrol/tdm/CMakeLists.txt
+++ b/kcontrol/tdm/CMakeLists.txt
@@ -29,8 +29,7 @@ install( FILES tdm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 ##### 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
diff --git a/kcontrol/usbview/CMakeLists.txt b/kcontrol/usbview/CMakeLists.txt
index 1584d0699..61138a72c 100644
--- a/kcontrol/usbview/CMakeLists.txt
+++ b/kcontrol/usbview/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 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( )
-- 
cgit v1.2.3