From 2d5912d57778987ebcf9cafd1905151d6e900875 Mon Sep 17 00:00:00 2001 From: verbalshadow Date: Mon, 31 Mar 2008 20:38:11 +0000 Subject: [PATCH] Cmake: config.h.cmake add package name and version info --- CMakeLists.txt | 5 +++-- config.h.cmake | 15 ++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bb826bcc..8b3c5ef23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ PROJECT(inkscape CXX C) -SET(INKSCAPE_VERSION 0.46+devel) +SET(INKSCAPE_VERSION 0.46+devel) +SET(PROJECT_NAME inkscape) SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4) SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) @@ -10,7 +11,7 @@ INCLUDE(ConfigCompileFlags) INCLUDE(ConfigInkscapeDepends) SET(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/config.h") -INCLUDE_DIRECTORIES (src/) +INCLUDE_DIRECTORIES (src/ ${CMAKE_CURRENT_BINARY_DIR} ) LINK_DIRECTORIES (src/) #SET(CMAKE_MAJOR_MINOR "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}") diff --git a/config.h.cmake b/config.h.cmake index 17263a31c..9429103bf 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -7,7 +7,7 @@ #endif /* This is for require-config.h */ -#define PACKAGE_TARNAME +#define PACKAGE_TARNAME "$PROJECT_NAME} ${INKSCAPE_VERSION}" /* Use binreloc thread support? */ #cmakedefine BR_PTHREADS @@ -25,7 +25,7 @@ #cmakedefine ENABLE_OSX_APP_LOCATIONS /* Translation domain used */ -#cmakedefine GETTEXT_PACKAGE +#define GETTEXT_PACKAGE "$PROJECT_NAME}" /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #cmakedefine HAVE_BIND_TEXTDOMAIN_CODESET @@ -211,7 +211,7 @@ #cmakedefine NO_MINUS_C_MINUS_O /* Name of package */ -#cmakedefine PACKAGE +#define PACKAGE "$PROJECT_NAME}" /* Define to the address where bug reports for this package should be sent. */ #cmakedefine PACKAGE_BUGREPORT @@ -220,16 +220,13 @@ #cmakedefine PACKAGE_LOCALE_DIR /* Define to the full name of this package. */ -#cmakedefine PACKAGE_NAME +#cmakedefine PACKAGE_NAME "$PROJECT_NAME}" /* Define to the full name and version of this package. */ -#cmakedefine PACKAGE_STRING VERSION - -/* Define to the one symbol short name of this package. */ -#cmakedefine PACKAGE_TARNAME +#cmakedefine PACKAGE_STRING "$PROJECT_NAME} ${INKSCAPE_VERSION}" /* Define to the version of this package. */ -#cmakedefine PACKAGE_VERSION +#cmakedefine PACKAGE_VERSION "${INKSCAPE_VERSION}" /* Define as the return type of signal handlers (`int' or `void'). */ #cmakedefine RETSIGTYPE -- 2.30.2