more tweaking of version.c ... maybe it works now
authorTero Marttila <terom@fixme.fi>
Fri, 16 Jan 2009 01:05:34 +0200
changeset 398 306825786fba
parent 397 13fa0546ef87
child 399 c7295b72731a
more tweaking of version.c ... maybe it works now
cmake/BuildVersion.cmake
cmake/FindVersion.cmake
cmake/VersionScript.cmake
src/Config.hh
--- a/cmake/BuildVersion.cmake	Fri Jan 16 00:42:02 2009 +0200
+++ b/cmake/BuildVersion.cmake	Fri Jan 16 01:05:34 2009 +0200
@@ -1,13 +1,12 @@
 #
 # Run a cmake script to update version info on every build
 #
-ADD_CUSTOM_COMMAND (
-    OUTPUT "src/version.c"
+ADD_CUSTOM_TARGET (
+    version_info ALL 
     COMMAND ${CMAKE_COMMAND} -DOUTPUT_PATH="${CMAKE_BINARY_DIR}/src/version.c" -P ${CMAKE_SOURCE_DIR}/cmake/VersionScript.cmake
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
 
-ADD_CUSTOM_TARGET (version_info ALL DEPENDS "src/version.c")
+# include it for greater justice
+include ("cmake/VersionScript.cmake")
 
-MESSAGE (STATUS "Added custom command for src/version.c output")
-
--- a/cmake/FindVersion.cmake	Fri Jan 16 00:42:02 2009 +0200
+++ b/cmake/FindVersion.cmake	Fri Jan 16 01:05:34 2009 +0200
@@ -44,8 +44,8 @@
         endif ("${hg_tag}" STREQUAL "tip")
 
     else (EXISTS ${project_path}/.hg)
-        SET (PROJECT_VERSION "0.0" PARENT_SCOPE)
-        MESSAGE (STATUS "No version information available, assuming version ${PROJECT_VERSION}")
+        SET (PROJECT_VERSION "???" PARENT_SCOPE)
+        MESSAGE (STATUS "No version information available")
 
     endif (EXISTS ${project_path}/.hg)
 ENDFUNCTION (FindProjectVersion)
--- a/cmake/VersionScript.cmake	Fri Jan 16 00:42:02 2009 +0200
+++ b/cmake/VersionScript.cmake	Fri Jan 16 01:05:34 2009 +0200
@@ -11,11 +11,8 @@
 # build date
 FindBuildTimestamp ()
 
-
 # create version.c
 CONFIGURE_FILE (
     "src/version.c.in" ${PROJECT_VERSION_FILE} @ONLY
 )
 
-MESSAGE (STATUS "wrote version.c -> ${PROJECT_VERSION_FILE}")
-
--- a/src/Config.hh	Fri Jan 16 00:42:02 2009 +0200
+++ b/src/Config.hh	Fri Jan 16 01:05:34 2009 +0200
@@ -113,7 +113,7 @@
 const CL_Color COLOR_ROCK(132, 136, 135);
 
 // graphics params
-const std::string GRAPHICS_WINDOW_TITLE = PROJECT_LONG_NAME; /* (PROJECT_LONG_NAME " : Version " PROJECT_VERSION); */
+const std::string GRAPHICS_WINDOW_TITLE = (std::string() + PROJECT_LONG_NAME + " : Version " + PROJECT_VERSION);
 const uint32_t GRAPHICS_RESOLUTION_WIDTH = 800;
 const uint32_t GRAPHICS_RESOLUTION_HEIGHT = 600;
 const uint16_t GRAPHICS_UPDATE_INTERVAL_MS = 20;