[vlc-devel] commit: Fix PACKAGE_VERSION_* generation with cmake ( Rafaël Carré )

git version control git at videolan.org
Sun Mar 9 16:22:11 CET 2008


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Mar  9 16:22:10 2008 +0100| [fb120859aa3401d3c2f6b4f6601440a179c8ef5a]

Fix PACKAGE_VERSION_* generation with cmake

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fb120859aa3401d3c2f6b4f6601440a179c8ef5a
---

 extras/buildsystem/cmake/config.h.cmake       |    6 +++---
 extras/buildsystem/cmake/include/config.cmake |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extras/buildsystem/cmake/config.h.cmake b/extras/buildsystem/cmake/config.h.cmake
index 2c5d41e..c86e15f 100644
--- 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 bdba95c..dd11f61 100644
--- 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})
 




More information about the vlc-devel mailing list