Fix PACKAGE_VERSION_* generation with cmake

diff --git a/extras/buildsystem/cmake/config.h.cmake b/extras/buildsystem/cmake/config.h.cmake
index 2c5d41e45f3c951622af8e2d753c25155056ccc0..c86e15f69a71b3c8cc0817154b3b0efff1820094 100644 (file)
--- a/extras/buildsystem/cmake/config.h.cmake
+++ b/extras/buildsystem/cmake/config.h.cmake
@@ -333,9 +333,9 @@
 #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

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index bdba95c8a68a5e72c6af28a3a9bd090c10f67cba..dd11f61e4fd409ee935757d888bf92484f2a4872 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -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})