From 9b0e3818b0ea6c99ac02d99185a6a7d1e6998fd3 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 25 Jan 2012 16:04:21 +0000 Subject: [PATCH] + fix VCS stuff for cmake git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5426 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- src/Build/CMakeLists.txt | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index a75f881e2..0be8d4204 100644 --- a/src/Build/CMakeLists.txt +++ b/src/Build/CMakeLists.txt @@ -18,16 +18,20 @@ if (WIN32) # TortoiseSVN FIND_PROGRAM(Subversion_WCREF_EXECUTABLE SubWCRev) + SET (RESULT 1) if(Subversion_WCREF_EXECUTABLE) EXECUTE_PROCESS(COMMAND ${Subversion_WCREF_EXECUTABLE} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Version.h.in ${CMAKE_CURRENT_BINARY_DIR}/Version.h + RESULT_VARIABLE RESULT OUTPUT_STRIP_TRAILING_WHITESPACE) - else(Subversion_WCREF_EXECUTABLE) + endif(Subversion_WCREF_EXECUTABLE) + # No SVN repo + if (NOT RESULT EQUAL 0) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/SubWCRev.py --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE) - endif(Subversion_WCREF_EXECUTABLE) + endif(NOT RESULT EQUAL 0) else (WIN32) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/SubWCRev.py --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR} @@ -37,16 +41,6 @@ endif (WIN32) # as fallback if Version.h isn't created for any reason if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Version.h) - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Version.h - "/// Version Number\n" - "#define FCVersionMajor \"0\"\n" - "#define FCVersionMinor \"11\"\n" - "#define FCVersionName \"Dagoba\"\n" - "\n" - "#define FCRevision \"unknown\"\n" - "#define FCRevisionDate \"unknown\"\n" - "#define FCRevisionRange \"unknown\"\n" - "#define FCRepositoryURL \"https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk\"\n" - "#define FCCurrentDateT \"unknown\"\n" - ) + file(READ ${CMAKE_CURRENT_SOURCE_DIR}/Version.h.in VERSION_INFO) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Version.h ${VERSION_INFO}) endif (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Version.h)