Fix PACKAGE_VERSION_* generation with cmake
authorRafaël Carré <funman@videolan.org>
Sun, 9 Mar 2008 15:22:10 +0000 (16:22 +0100)
committerRafaël Carré <funman@videolan.org>
Sun, 9 Mar 2008 15:22:10 +0000 (16:22 +0100)
extras/buildsystem/cmake/config.h.cmake
extras/buildsystem/cmake/include/config.cmake

index 2c5d41e..c86e15f 100644 (file)
 #cmakedefine PACKAGE_TARNAME "${PACKAGE_TARNAME}"
 #cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}"
 #cmakedefine PACKAGE_VERSION_EXTRA "${PACKAGE_VERSION_EXTRA}"
-#cmakedefine PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR}
-#cmakedefine PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR}
-#cmakedefine PACKAGE_VERSION_REVISION ${PACKAGE_VERSION_REVISION}
+#define PACKAGE_VERSION_MAJOR "@PACKAGE_VERSION_MAJOR@"
+#define PACKAGE_VERSION_MINOR "@PACKAGE_VERSION_MINOR@"
+#define PACKAGE_VERSION_REVISION "@PACKAGE_VERSION_REVISION@"
 #cmakedefine PRI_MACROS_BROKEN
 #cmakedefine RETSIGTYPE
 #cmakedefine SDL_IMAGE_INCLUDE_FILE
index bdba95c..dd11f61 100644 (file)
@@ -63,9 +63,9 @@ include( ${CMAKE_SOURCE_DIR}/cmake/pkg_check_modules.cmake )
 # Versioning
 ###########################################################
 
-set(VLC_VERSION_MAJOR 0)
-set(VLC_VERSION_MINOR 9)
-set(VLC_VERSION_PATCH 0)
+set(VLC_VERSION_MAJOR "0")
+set(VLC_VERSION_MINOR "9")
+set(VLC_VERSION_PATCH "0")
 set(VLC_VERSION_EXTRA "-svn")
 set(VLC_VERSION ${VLC_VERSION_MAJOR}.${VLC_VERSION_MINOR}.${VLC_VERSION_PATCH}${VLC_VERSION_EXTRA})