Cmake: config.h.cmake add package name and version info

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bb826bccc102e1c0d05570d987de1ef51accc10..8b3c5ef23d721862ed3d305440910576eadda684 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 PROJECT(inkscape CXX C)\r
-SET(INKSCAPE_VERSION 0.46+devel)\r
+SET(INKSCAPE_VERSION 0.46+devel)
+SET(PROJECT_NAME inkscape)\r
 SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4)\r
 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)\r
 \r
@@ -10,7 +11,7 @@ INCLUDE(ConfigCompileFlags)
 INCLUDE(ConfigInkscapeDepends)\r
 
 SET(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/config.h")\r
-INCLUDE_DIRECTORIES (src/)\r
+INCLUDE_DIRECTORIES (src/ ${CMAKE_CURRENT_BINARY_DIR} )\r
 LINK_DIRECTORIES (src/)\r
 \r
 #SET(CMAKE_MAJOR_MINOR "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")\r

diff --git a/config.h.cmake b/config.h.cmake
index 17263a31ce40222ffd0feecdfc584ad2d7ae5f02..9429103bf6616875e8164c397d8936d0f6d669c1 100644 (file)
--- 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