From 8689903f5861e985cc467e6b1e002851ba4d508c Mon Sep 17 00:00:00 2001
From: Stoabrogga <38475780+Stoabrogga@users.noreply.github.com>
Date: Tue, 24 Sep 2019 21:11:13 +0200
Subject: [PATCH] fix(CMake): Use cmake-generator-expressions for escaping
 quotes (#2307)

---
 src/cmake/showoptions.cmake           | 2 +-
 src/server/worldserver/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cmake/showoptions.cmake b/src/cmake/showoptions.cmake
index 1d0b4bcb6..cd9a19905 100644
--- a/src/cmake/showoptions.cmake
+++ b/src/cmake/showoptions.cmake
@@ -14,7 +14,7 @@ if( UNIX )
 endif()
 
 message("* Install configs to              : ${CONF_DIR}")
-add_definitions(-D_CONF_DIR="\\"${CONF_DIR}\\"")
+add_definitions(-D_CONF_DIR=$<1:"${CONF_DIR}">)
 
 message("")
 
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index e1938d781..cf32739aa 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -131,7 +131,7 @@ FOREACH(configFile ${MODULE_CONFIG_FILE_LIST})
     get_filename_component(file_name ${configFile} NAME_WE)
     set(CONFIG_LIST ${CONFIG_LIST}${file_name},)
 ENDFOREACH()
-add_definitions(-DCONFIG_FILE_LIST="\\"${CONFIG_LIST}\\"")
+add_definitions(-DCONFIG_FILE_LIST=$<1:"${CONFIG_LIST}">)
 # end handle config file
 
 CU_RUN_HOOK("AFTER_WORLDSERVER_CMAKE")