From 81c94a5772218fdad75e67f9efcbe25c15f3a25a Mon Sep 17 00:00:00 2001 From: Karl Goetz Date: Sun, 7 Dec 2014 08:50:05 +1100 Subject: [PATCH] Remove special CUSTOM_DATA_INSTALL_PATH for OSX The special codepath for CUSTOM_DATA_INSTALL_PATH on OSX means the path is generated multiple backslashes which cause problems later on in the compile. Having the same codepath as everything else appears to resolve this problem. --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e68cb97..d6c58009 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -269,11 +269,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) ENDIF() IF(NOT CUSTOM_DATA_INSTALL_PATH) - IF(APPLE) - SET(CUSTOM_DATA_INSTALL_PATH "'\\\\'${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}\\\\''" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)") - ELSE() - SET(CUSTOM_DATA_INSTALL_PATH "\"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}\"" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)") - ENDIF() + SET (CUSTOM_DATA_INSTALL_PATH "\"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}\"" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)") ENDIF() SET(CUSTOM_DATA_INSTALL_PATH_VALUE "-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}") ADD_DEFINITIONS("-DCUSTOM_DATA_INSTALL_PATH=${CUSTOM_DATA_INSTALL_PATH}")