[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/kgllib
From:       Rivo Laks <rivolaks () hot ! ee>
Date:       2008-08-24 15:36:32
Message-ID: 1219592192.649009.6914.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 851775 by rivol:

Proper versioning:
- Version is set in CMakeLists.txt
- This version is used to version the libraries
- And also to generate kgllib_version.h which provides both compile-time constants, \
e.g.  KGLLIB_VERSION_MAJOR, as well as runtime methods like KGLLib::isVersion()

 M  +9 -0      CMakeLists.txt  
 M  +7 -2      core/kgllib/CMakeLists.txt  
 M  +1 -0      core/kgllib/kgllib.h  
 A             core/kgllib/kgllib_version.cpp   [License: LGPL (v2.1+)]
 A             core/kgllib/kgllib_version.h.cmake  
 M  +1 -0      examples/CMakeLists.txt  
 M  +3 -2      extras/kgllib/CMakeLists.txt  


--- trunk/playground/libs/kgllib/CMakeLists.txt #851774:851775
@@ -1,6 +1,15 @@
 project(kgllib)
+# version info
+set(KGLLIB_VERSION_MAJOR 0)
+set(KGLLIB_VERSION_MINOR 0)
+set(KGLLIB_VERSION_RELEASE 5)
+set(KGLLIB_LIB_VERSION \
"${KGLLIB_VERSION_MAJOR}.${KGLLIB_VERSION_MINOR}.${KGLLIB_VERSION_RELEASE}") \
+set(KGLLIB_LIB_SOVERSION "${KGLLIB_VERSION_MAJOR}.${KGLLIB_VERSION_MINOR}") +
+# Add our own cmake files
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules \
)  
+# Find required packages
 set(QT_USE_OPENGL true)
 find_package(Qt4 REQUIRED)
 find_package(OpenGL REQUIRED)
--- trunk/playground/libs/kgllib/core/kgllib/CMakeLists.txt #851774:851775
@@ -1,3 +1,5 @@
+configure_file(kgllib_version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kgllib_version.h)
+
 add_definitions(${QT_DEFINITIONS} -Wall)
 include_directories(
         ${CMAKE_CURRENT_SOURCE_DIR}
@@ -22,14 +24,15 @@
         mesh.cpp
         textrenderer.cpp
         geometrybuffer.cpp
+        kgllib_version.cpp
         )
 qt4_automoc(${kgllib_SRCS})
 add_library(kgllib SHARED ${kgllib_SRCS})
 
 target_link_libraries(kgllib ${OPENGL_gl_LIBRARY} ${QT_QTOPENGL_LIBRARY} \
${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${GLEW_GLEW_LIBRARY} ${OPENGL_glu_LIBRARY})  \
                set_target_properties(kgllib PROPERTIES
-        VERSION 0.1.0
-        SOVERSION 0.1
+        VERSION ${KGLLIB_LIB_VERSION}
+        SOVERSION ${KGLLIB_LIB_SOVERSION}
         DEFINE_SYMBOL MAKE_KGLLIB_LIB)
 
 install(FILES
@@ -46,6 +49,8 @@
         mesh.h
         textrenderer.h
         geometrybuffer.h
+        ${CMAKE_CURRENT_BINARY_DIR}/kgllib_version.h
+
         DESTINATION ${INCLUDE_INSTALL_DIR}/kgllib
         )
 install(TARGETS kgllib ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/playground/libs/kgllib/core/kgllib/kgllib.h #851774:851775
@@ -21,6 +21,7 @@
 #include "GL/glew.h"
 
 #include "kgllib_export.h"
+#include "kgllib_version.h"
 
 
 class QString;
--- trunk/playground/libs/kgllib/examples/CMakeLists.txt #851774:851775
@@ -6,6 +6,7 @@
         ${QT_QTOPENGL_INCLUDE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/../core
         ${CMAKE_CURRENT_SOURCE_DIR}/../core/kgllib
+        ${CMAKE_CURRENT_BINARY_DIR}/../core/kgllib
         ${CMAKE_CURRENT_SOURCE_DIR}/../extras
         ${EIGEN_INCLUDE_DIR}
         )
--- trunk/playground/libs/kgllib/extras/kgllib/CMakeLists.txt #851774:851775
@@ -7,6 +7,7 @@
         ${QT_QTGUI_INCLUDE_DIR}
         ${QT_QTOPENGL_INCLUDE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/../../core/kgllib
+        ${CMAKE_CURRENT_BINARY_DIR}/../../core/kgllib
         ${EIGEN_INCLUDE_DIR}
         )
 
@@ -25,8 +26,8 @@
 
 target_link_libraries(kgllib-extras kgllib)
 set_target_properties(kgllib-extras PROPERTIES
-        VERSION 0.1.0
-        SOVERSION 0.1
+        VERSION ${KGLLIB_LIB_VERSION}
+        SOVERSION ${KGLLIB_LIB_SOVERSION}
         DEFINE_SYMBOL MAKE_KGLLIB_EXTRAS_LIB)
 
 install(FILES


[prev in list] [next in list] [prev in thread] [next in thread]