From e920cba84b33f0e2589b07563be8bf444effdce2 Mon Sep 17 00:00:00 2001 From: Karl Goetz Date: Sun, 7 Dec 2014 14:09:58 +1100 Subject: [PATCH 1/3] Remove special casing on GIT_VERSION_CMD This special casing has been causing cmake -GXcode to fail. --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e68cb97..949e4df8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,12 +242,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) ENDIF() ENDIF() - IF(APPLE AND NOT CMAKE_COMPILER_IS_GNUCXX) - SET(GIT_VERSION_CMD "-DGITVERSION='\\\\'${GIT_LIVE_REV_CMD}\\\\''") - ELSE() - SET(GIT_VERSION_CMD "-DGITVERSION='\\\"${GIT_LIVE_REV_CMD}\\\"'") -# SET(SVN_VERSION_CMD "-DSVNVERSION='\\\"`svnversion -n ${PROJECT_SOURCE_DIR}`\\\"'") - ENDIF() + SET(GIT_VERSION_CMD "-DGITVERSION='\\\\"${GIT_LIVE_REV_CMD}\\\\"'") IF(CMAKE_INSTALL_PREFIX STREQUAL "") MESSAGE(STATUS "*NOTE: NOT USING a Custom Data Install Path...") From 35347ed36b16badaf24b6c64bf6f72ea5ba15796 Mon Sep 17 00:00:00 2001 From: Karl Goetz Date: Sun, 7 Dec 2014 15:43:04 +1100 Subject: [PATCH 2/3] Re-add IF check around GIT_VERSION_CMD Previous removal included a APPLE check which I'm told needs to remain. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 949e4df8..348ed726 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,7 +242,9 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) ENDIF() ENDIF() - SET(GIT_VERSION_CMD "-DGITVERSION='\\\\"${GIT_LIVE_REV_CMD}\\\\"'") + IF(APPLE) + SET(GIT_VERSION_CMD "-DGITVERSION='\\\\"${GIT_LIVE_REV_CMD}\\\\"'") + ENDIF() IF(CMAKE_INSTALL_PREFIX STREQUAL "") MESSAGE(STATUS "*NOTE: NOT USING a Custom Data Install Path...") From 4919307d8ff8bcfe4094a7729edd2bd0ca89c8ec Mon Sep 17 00:00:00 2001 From: Karl Goetz Date: Sun, 7 Dec 2014 16:06:13 +1100 Subject: [PATCH 3/3] Reintroduce ELSE clause Had a chat with softcoder who explained what was going on. We should now be almost identical to the original but the compiler specific test has been removed. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 348ed726..c4f5ca3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,7 +243,9 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) ENDIF() IF(APPLE) - SET(GIT_VERSION_CMD "-DGITVERSION='\\\\"${GIT_LIVE_REV_CMD}\\\\"'") + SET(GIT_VERSION_CMD "-DGITVERSION='\\\\'${GIT_LIVE_REV_CMD}\\\\''") + ELSE() + SET(GIT_VERSION_CMD "-DGITVERSION='\\\"${GIT_LIVE_REV_CMD}\\\"'") ENDIF() IF(CMAKE_INSTALL_PREFIX STREQUAL "")