[CMake] Simplify generation of geos_revision.h

Remove tools/geos_revision_cmake.h.in as no longer required
- geos_revision.h is generated on-fly.
Add geos_revision target set as dependency of geos_c target.
Fix autogen.bat to generate string instead of integer constant.

CMakeLists.txt

@@ -252,62 +252,27 @@ include_directories(${PROJECT_BINARY_DIR})
 #################################################################################
 # Setup checks and generate config headers
 #################################################################################
-
-#################################################################################
-#  MACRO: GET_SVN_REVISION
-#
-#  DESCRIPTION:
-#      MACRO FOR GETTING THE SVN revision for this build
-#################################################################################
-MACRO (GET_SVN_REVISION)
-   FIND_PACKAGE(Subversion)
-   IF(SUBVERSION_FOUND)
-      Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
-      # MESSAGE("Current revision is ${Project_WC_REVISION}")
-      # Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)
-      # MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")
-   ENDIF()
-ENDMACRO(GET_SVN_REVISION)
-
-# Determine SVN/Git revision
-# Determine SVN/Git revision
-if(EXISTS "${PROJECT_SOURCE_DIR}/.svn")
-  GET_SVN_REVISION()
-endif()
-
-# geos_revision.h does not exists in source or binary directory, we generate it
-if( NOT EXISTS "${PROJECT_SOURCE_DIR}/geos_revision.h" AND
-    NOT EXISTS "${PROJECT_BINARY_DIR}/geos_revision.h")
-
-  message(STATUS "Generating GEOS revision header in ${PROJECT_BINARY_DIR}/geos_revision.h")
-
-  # CI builds (Travis CI, AppVeyor, etc.) perform git clone, not svn checkout.
-  # So, CI environment needs a dummy revision to generate the required header.
-  if (DEFINED ENV{CI})
-     set(Project_WC_REVISION 999999)
-  endif()
-
-  if ( NOT ${Project_WC_REVISION} EQUAL 0 )
-     set( GEOS_REVISION ${Project_WC_REVISION} )
-     configure_file (
-        "${PROJECT_SOURCE_DIR}/tools/geos_revision_cmake.h.in"
-        "${PROJECT_BINARY_DIR}/geos_revision.h" )
-  else()
-     find_program(SH sh)
-     if(SH)
-        execute_process(COMMAND ${SH} -c
-        "cd ${PROJECT_SOURCE_DIR} && ${PROJECT_SOURCE_DIR}/tools/repo_revision.sh")
-
-        file(RENAME "${PROJECT_SOURCE_DIR}/geos_revision.h"
-        "${PROJECT_BINARY_DIR}/geos_revision.h")
-     else()
-        message("*** sh-compatible command not found, cannot create geos_revision.h")
-        message("*** Check SVN revision and create revision header manually:")
-        message("*** echo '#define GEOS_REVISION XYZ' > ${PROJECT_SOURCE_DIR}/geos_revision.h")
-     endif()
-  endif()
-endif()
-# End: Determine SVN/Git revision
+find_package(Git)
+
+message(STATUS "Generating GEOS ${PROJECT_BINARY_DIR}/geos_revision.h")
+file(WRITE ${CMAKE_BINARY_DIR}/geos_revision.h.in "\#define GEOS_REVISION \"@GEOS_REVISION@\"\n")
+
+file(WRITE ${CMAKE_BINARY_DIR}/geos_revision.cmake
+"
+execute_process(COMMAND \${GIT} describe --tags --always
+  WORKING_DIRECTORY \${CWD}
+  OUTPUT_VARIABLE GEOS_REVISION
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+configure_file(\${SRC} \${DST} @ONLY)
+")
+
+add_custom_target(geos_revision
+  COMMAND ${CMAKE_COMMAND}
+    -D CWD=${CMAKE_CURRENT_SOURCE_DIR}
+    -D GIT=${GIT_EXECUTABLE}
+    -D SRC=${PROJECT_BINARY_DIR}/geos_revision.h.in
+    -D DST=${PROJECT_BINARY_DIR}/geos_revision.h
+    -P ${PROJECT_BINARY_DIR}/geos_revision.cmake)
 
 if(EXISTS ${PROJECT_SOURCE_DIR}/include/geos/platform.h)
   message(STATUS "Disabling existing ${PROJECT_SOURCE_DIR}/include/geos/platform.h")

autogen.bat

@@ -11,7 +11,8 @@ REM
 
 set GEOS_HEADERS=include\geos
 
-COPY %GEOS_HEADERS%\version.h.vc %GEOS_HEADERS%\version.h 
+COPY %GEOS_HEADERS%\version.h.vc %GEOS_HEADERS%\version.h
 COPY %GEOS_HEADERS%\platform.h.vc %GEOS_HEADERS%\platform.h
 COPY capi\geos_c.h.in capi\geos_c.h
-@ECHO #define GEOS_REVISION 0 > geos_revision.h
+REM Empty string as dummy git SHA-1
+@ECHO #define GEOS_REVISION "" > geos_revision.h

capi/CMakeLists.txt

@@ -6,7 +6,7 @@
 #
 # This is free software; you can redistribute and/or modify it under
 # the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation. 
+# by the Free Software Foundation.
 # See the COPYING file for more information.
 #
 #################################################################################
@@ -21,9 +21,9 @@ set(geos_c_SOURCES
 
 file(GLOB geos_capi_HEADERS ${CMAKE_BINARY_DIR}/capi/*.h) # fix source_group issue
 
-if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK) 
-  # if building OS X framework, CAPI built into C++ library 
-  add_library(geos_c SHARED ${geos_c_SOURCES}) 
+if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK)
+  # if building OS X framework, CAPI built into C++ library
+  add_library(geos_c SHARED ${geos_c_SOURCES})
 
   target_link_libraries(geos_c geos)
 
@@ -42,6 +42,8 @@ if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK)
 
 endif()
 
+add_dependencies(geos_c geos_revision)
+
 #################################################################################
 # Installation
 #################################################################################
@@ -55,7 +57,7 @@ else()
     DESTINATION include)
 endif()
 
-if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK) 
+if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK)
   install(TARGETS geos_c
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib