# HG changeset patch # User Alpar Juttner # Date 1232728205 0 # Node ID 64c2641286dfc75bac8d7b913402de637c86d73c # Parent e58c511a5eba92f39d140b59c8b8d0d563aa3fe8 Set the proper version for CMAKE in the tarballs (made by autotools). diff -r e58c511a5eba -r 64c2641286df CMakeLists.txt --- a/CMakeLists.txt Thu Jan 22 10:39:13 2009 +0000 +++ b/CMakeLists.txt Fri Jan 23 16:30:05 2009 +0000 @@ -1,7 +1,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -SET(PROJECT_NAME "LEMON") -SET(PROJECT_VERSION "hg-tip" CACHE STRING "The version string.") +IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake) + INCLUDE(${CMAKE_SOURCE_DIR}/cmake/version.cmake) +ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake) + SET(PROJECT_NAME "LEMON") + SET(PROJECT_VERSION "hg-tip" CACHE STRING "LEMON version string.") +ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake) PROJECT(${PROJECT_NAME}) diff -r e58c511a5eba -r 64c2641286df Makefile.am --- a/Makefile.am Thu Jan 22 10:39:13 2009 +0000 +++ b/Makefile.am Fri Jan 23 16:30:05 2009 +0000 @@ -10,7 +10,11 @@ m4/lx_check_glpk.m4 \ m4/lx_check_soplex.m4 \ CMakeLists.txt \ - cmake + cmake/FindGhostscript.cmake \ + cmake/version.cmake.in \ + cmake/version.cmake \ + cmake/nsis/lemon.ico \ + cmake/nsis/uninstall.ico pkgconfigdir = $(libdir)/pkgconfig lemondir = $(pkgincludedir) diff -r e58c511a5eba -r 64c2641286df cmake/version.cmake.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cmake/version.cmake.in Fri Jan 23 16:30:05 2009 +0000 @@ -0,0 +1,2 @@ +SET(PROJECT_NAME "@PACKAGE_NAME@") +SET(PROJECT_VERSION "@PACKAGE_VERSION@" CACHE STRING "LEMON version string.") diff -r e58c511a5eba -r 64c2641286df configure.ac --- a/configure.ac Thu Jan 22 10:39:13 2009 +0000 +++ b/configure.ac Fri Jan 23 16:30:05 2009 +0000 @@ -97,10 +97,11 @@ dnl Add dependencies on files generated by configure. AC_SUBST([CONFIG_STATUS_DEPENDENCIES], - ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in']) + ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in']) AC_CONFIG_FILES([ Makefile +cmake/version.cmake doc/Doxyfile lemon/lemon.pc ])