From 62384e924b4d3b173bb24f77a99f2316234f1a66 Mon Sep 17 00:00:00 2001
From: Hombre <natureh@free.fr>
Date: Sat, 16 Apr 2011 17:28:29 +0200
Subject: [PATCH] Build failed in some situations

---
 About-Apple.cmake   | 14 +++++++-------
 About-Linux.cmake   | 14 +++++++-------
 About-Windows.cmake | 14 +++++++-------
 CMakeLists.txt      | 13 ++++++++-----
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/About-Apple.cmake b/About-Apple.cmake
index 96a7913cf..f1ef3f008 100644
--- a/About-Apple.cmake
+++ b/About-Apple.cmake
@@ -11,16 +11,16 @@ else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
   message(STATUS "hg command found: ${HG_CMD}")
 endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
 
-set (OUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt")
+set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt")
 set (SHELL "/bin/bash")
 # there should be a better way of getting the compiler + compiler version, not restrained to Gcc
 execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} -R ${CMAKE_CURRENT_SOURCE_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 # build version.h from template
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h)
+configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h)
 # build AboutThisBuild.txt from template
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt.in ${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt)
+configure_file (${SRC_DIR}/AboutThisBuild.txt.in ${SRC_DIR}/AboutThisBuild.txt)
diff --git a/About-Linux.cmake b/About-Linux.cmake
index 26d58639b..261132aee 100644
--- a/About-Linux.cmake
+++ b/About-Linux.cmake
@@ -11,16 +11,16 @@ else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
   message(STATUS "hg command found: ${HG_CMD}")
 endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
 
-set (OUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt")
+set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt")
 set (SHELL "/bin/bash")
 # there should be a better way of getting the compiler + compiler version, not restrained to Gcc
 execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} -R ${CMAKE_CURRENT_SOURCE_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 # build version.h from template
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h)
+configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h)
 # build AboutThisBuild.txt from template
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt.in ${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt)
+configure_file (${SRC_DIR}/AboutThisBuild.txt.in ${SRC_DIR}/AboutThisBuild.txt)
diff --git a/About-Windows.cmake b/About-Windows.cmake
index b6e677511..26d78040d 100644
--- a/About-Windows.cmake
+++ b/About-Windows.cmake
@@ -11,16 +11,16 @@ else (HG_CMD STREQUAL HG_CMD-NOTFOUND)
   message(STATUS "hg command found: ${HG_CMD}")
 endif (HG_CMD STREQUAL HG_CMD-NOTFOUND)
 
-set (OUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt")
+set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt")
 
 # there should be a better way of getting the compiler + compiler version, not restrained to Gcc
 execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} -R ${CMAKE_CURRENT_SOURCE_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 # build version.h from template
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/rtgui/version.h)
+configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h)
 # build AboutThisBuild.txt from template
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt.in ${CMAKE_CURRENT_SOURCE_DIR}/AboutThisBuild.txt)
+configure_file (${SRC_DIR}/AboutThisBuild.txt.in ${SRC_DIR}/AboutThisBuild.txt)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ecc90622..2ce87bc95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,11 +178,12 @@ else (AUTOMATED_BUILD_SYSTEM)
 
     add_custom_target (AboutFile ALL
       COMMAND ${CMAKE_COMMAND}
+              -DSRC_DIR:STRING=${CMAKE_CURRENT_SOURCE_DIR}
               -DSYSTEM:STRING=Windows
               -DPROC_LABEL:STRING=\"${PROC_LABEL}\"
               -DPROC_BIT_DEPTH:STRING=\"${PROC_BIT_DEPTH}\"
               -DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-			  -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
+              -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
               -DCXX_FLAGS:STRING=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}\"
               -DLFLAGS:STRING=\"${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}\"
               -DOPTION_OMP:STRING=${OPTION_OMP}
@@ -197,11 +198,12 @@ else (AUTOMATED_BUILD_SYSTEM)
  
     add_custom_target (AboutFile ALL
       COMMAND ${CMAKE_COMMAND}
+              -DSRC_DIR:STRING=${CMAKE_CURRENT_SOURCE_DIR}
               -DSYSTEM:STRING=Apple
               -DPROC_LABEL:STRING=\"${PROC_LABEL}\"
               -DPROC_BIT_DEPTH:STRING=\"${PROC_BIT_DEPTH}\"
               -DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-			  -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
+              -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
               -DCXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
               -DLFLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
               -DOPTION_OMP:STRING=${OPTION_OMP}
@@ -209,7 +211,7 @@ else (AUTOMATED_BUILD_SYSTEM)
               -DWITH_RAWZOR:STRING=${WITH_RAWZOR}
               -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Apple.cmake
       COMMENT "Creating the about file"
-	)
+    )
     find_file(HG_CMD hg PATHS "/opt/local/bin" "/usr/local/bin" "/usr/bin")
     find_file(HG_CMD hg)
 
@@ -217,11 +219,12 @@ else (AUTOMATED_BUILD_SYSTEM)
  
     add_custom_target (AboutFile ALL
       COMMAND ${CMAKE_COMMAND}
+              -DSRC_DIR:STRING=${CMAKE_CURRENT_SOURCE_DIR}
               -DSYSTEM:STRING=Linux
               -DPROC_LABEL:STRING=\"${PROC_LABEL}\"
               -DPROC_BIT_DEPTH:STRING=\"${PROC_BIT_DEPTH}\"
               -DBUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-			  -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
+              -DGTKMM_VERSION:STRING=${GTKMM_VERSION}
               -DCXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
               -DLFLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${UPPER_CMAKE_BUILD_TYPE}}
               -DOPTION_OMP:STRING=${OPTION_OMP}
@@ -229,7 +232,7 @@ else (AUTOMATED_BUILD_SYSTEM)
               -DWITH_RAWZOR:STRING=${WITH_RAWZOR}
               -P ${CMAKE_CURRENT_SOURCE_DIR}/About-Linux.cmake
       COMMENT "Creating the about file"
-	)
+    )
     find_file(HG_CMD hg)
 
   endif (WIN32)