[Opensync-commits] r1260 - trunk

[<svn...@op...>]

Author: bellmich
Date: Thu Sep 10 17:24:56 2009
New Revision: 1260
URL: http://libsyncml.opensync.org/changeset/1260

Log:
updated version handling

Added:
   trunk/libsyncml.pc.cmake.in
      - copied unchanged from r1201, trunk/libsyncml-1.0.pc.cmake.in
Deleted:
   trunk/libsyncml-1.0.pc.cmake.in
Modified:
   trunk/CMakeLists.txt

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt	Thu Sep 10 17:24:34 2009	(r1259)
+++ trunk/CMakeLists.txt	Thu Sep 10 17:24:56 2009	(r1260)
@@ -47,7 +47,7 @@
 #MESSAGE(STATUS "CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}" )
 
 SET( LIBSYNCML_LIBRARIES_DIR "${LIB_INSTALL_DIR}" CACHE PATH "Syncml library location" )
-SET( LIBSYNCML_INCLUDE_DIR "${INCLUDE_INSTALL_DIR}/libsyncml-1.0" CACHE PATH "Syncml headers location" )
+SET( LIBSYNCML_INCLUDE_DIR "${INCLUDE_INSTALL_DIR}/libsyncml-${LIBSYNCML_LIBVERSION_SOVERSION}.${LIBSYNCML_LIBVERSION_AGE}" CACHE PATH "Syncml headers location" )
 SET( LIBSYNCML_BIN_DIR "${BIN_INSTALL_DIR}" CACHE PATH "Syncml binaries location" )
 SET( LIBSYNCML_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Syncml data location" )
 SET( LIBSYNCML_EXEC_INSTALL_DIR "${BIN_INSTALL_DIR}" CACHE PATH "Syncml binary location" )
@@ -208,7 +208,7 @@
 SET( VERSION "${LIBSYNCML_VERSION}" )
 
 CONFIGURE_FILE( "config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h")
-CONFIGURE_FILE( "libsyncml-1.0.pc.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/libsyncml-1.0.pc" @ONLY)
+CONFIGURE_FILE( "libsyncml.pc.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/libsyncml-${LIBSYNCML_LIBVERSION_SOVERSION}.${LIBSYNCML_LIBVERSION_AGE}.pc" @ONLY)
 
 # add uninstall target
 CONFIGURE_FILE(	"${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
@@ -247,7 +247,7 @@
 ENDIF ( BUILD_DOCUMENTATION )
 
 # todo: add requires in pc file
-INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libsyncml-1.0.pc" DESTINATION "${LIBDATA_INSTALL_DIR}/pkgconfig/" )
+INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libsyncml-${LIBSYNCML_LIBVERSION_SOVERSION}.${LIBSYNCML_LIBVERSION_AGE}.pc" DESTINATION "${LIBDATA_INSTALL_DIR}/pkgconfig/" )
 
 # status output
 INCLUDE( ShowStatus )