fixed the problem of version.c not being built at the firs cmake run; set the minimum...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f403585a65826b9217d5c61a89fdc023cb7b532b..02326e4b250fb6d5297f837f3856dd0a1dce5b75 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6.2)
+cmake_minimum_required(VERSION 2.6)
 
 project(Gromacs)
 set(PROJECT_VERSION "4.0.99-dev-20100315"
@@ -45,6 +45,7 @@ option(USE_VERSION_H "Generate development version string/information" ON)
 # Check for options incompatible with OpenMM build                    #
 #######################################################################
 if(GMX_OPENMM)
+    cmake_minimum_required(VERSION 2.6.4)
     # we'll use the built-in fft to avoid unnecessary dependencies
     set (GMX_FFT_LIBRARY "fftpack")
     if(GMX_MPI)

diff --git a/cmake/gmxGenerateVersionInfo.cmake b/cmake/gmxGenerateVersionInfo.cmake
index 59094d20870e149e6418ca31e706df367c4cea4a..1a8e6e3342461765790cb682126e7a7399eec165 100644 (file)
--- a/cmake/gmxGenerateVersionInfo.cmake
+++ b/cmake/gmxGenerateVersionInfo.cmake
@@ -30,13 +30,13 @@ set(VER ${PROJECT_VERSION})
 
 # if we're generating variables for cache unset the variables 
 if(GEN_VERSION_INFO_INTERNAL)
-    unset(GMX_PROJECT_VERSION_STR CACHE)
-    unset(GMX_GIT_HEAD_HASH CACHE)
-    unset(GMX_GIT_REMOTE_HASH CACHE)
-    unset(USE_VERSION_H CACHE)
+    set(GMX_PROJECT_VERSION_STR)
+    set(GMX_GIT_HEAD_HASH)
+    set(GMX_GIT_REMOTE_HASH)
+    set(USE_VERSION_H)
 endif()
 
-unset(GIT_BIN)
+set(GIT_BIN)
 find_program(GIT_BIN "git")
 mark_as_advanced(GIT_BIN)
 

diff --git a/src/gmxlib/CMakeLists.txt b/src/gmxlib/CMakeLists.txt
index d03e9289298362f9ee519a9cfa24b1760e00d79f..1982d9d0edd64599641b88e39f6a549a111ed606 100644 (file)
--- a/src/gmxlib/CMakeLists.txt
+++ b/src/gmxlib/CMakeLists.txt
@@ -16,10 +16,13 @@ add_custom_target(gmx_version ALL
 # conditionally built, so we cannot use a GLOB_RECURSE here.
 
 file(GLOB GMXLIB_SOURCES *.c 
-     ${CMAKE_CURRENT_BINARY_DIR}/version.c # auto-generated
      selection/*.c trajana/*.c
      statistics/*.c nonbonded/*.c nonbonded/nb_kernel_c/*.c)
 
+LIST(APPEND GMXLIB_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/version.c) # auto-generated
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/version.c 
+                PROPERTIES GENERATED true)
+
 if(GMX_IA32_SSE)
   if(GMX_ASM_USEASM-ATT)
     if(GMX_ASM_USECCOMPILER)