Ecrire: Improved config.h a bit.

SVN revision: 70235
This commit is contained in:
Tom Hacohen 2012-04-16 15:57:30 +00:00
parent 3aab6fa920
commit b8c46fb1de
2 changed files with 12 additions and 12 deletions

View File

@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project(ecrire) project(ecrire)
set(ECRIRE_VERSION_MAJOR 0) set(VMAJ 0)
set(ECRIRE_VERSION_MINOR 1) set(VMIN 1)
set(ECRIRE_VERSION_MICRO 0) set(VMIC 0)
set(ECRIRE_VERSION ${ECRIRE_VERSION_MAJOR}.${ECRIRE_VERSION_MINOR}.${ECRIRE_VERSION_MICRO}) set(PACKAGE_VERSION ${VMAJ}.${VMIN}.${VMIC})
set(PACKAGE ${CMAKE_PROJECT_NAME}) set(PACKAGE ${CMAKE_PROJECT_NAME})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
@ -67,9 +67,9 @@ add_subdirectory(data)
add_subdirectory(po) add_subdirectory(po)
# Make dist # Make dist
set(CPACK_PACKAGE_VERSION_MAJOR ${ECRIRE_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MAJOR ${VMAJ})
set(CPACK_PACKAGE_VERSION_MINOR ${ECRIRE_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_MINOR ${VMIN})
set(CPACK_PACKAGE_VERSION_PATCH ${ECRIRE_VERSION_MICRO}) set(CPACK_PACKAGE_VERSION_PATCH ${VMIC})
set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2") set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
set(CPACK_SOURCE_PACKAGE_FILE_NAME set(CPACK_SOURCE_PACKAGE_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")

View File

@ -1,9 +1,9 @@
#define PACKAGE "@CMAKE_PROJECT_NAME@" #define PACKAGE "@PACKAGE@"
#define PACKAGE_NAME PACKAGE #define PACKAGE_NAME PACKAGE
#define VERSION "@ECRIRE_VERSION@" #define VERSION "@PACKAGE_VERSION@"
#define VMAJ @ECRIRE_VERSION_MAJOR@ #define VMAJ @VMAJ@
#define VMIN @ECRIRE_VERSION_MINOR@ #define VMIN @VMIN@
#define VMIC @ECRIRE_VERSION_MICRO@ #define VMIC @VMIC@
#cmakedefine HAVE___ATTRIBUTE__ #cmakedefine HAVE___ATTRIBUTE__
#ifdef HAVE___ATTRIBUTE__ #ifdef HAVE___ATTRIBUTE__