Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0fa36a9e31d769f3b4bd879ff0f2a2224368aef3
commit 0fa36a9e31d769f3b4bd879ff0f2a2224368aef3 Author: Michel Hermier <[email protected]> Date: Wed Jul 30 11:23:21 2014 +0200 cmake: Revise versionning, make current version to 3.90.0. diff --git a/CMakeLists.txt b/CMakeLists.txt index a0524e8..3429bd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,10 +13,13 @@ include (UseAsciidoc) enable_testing() STRING(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_LOWER) -SET(PACMAN_G2_VERSION 3.10.0) -SET(PACMAN_G2_LIB_VERSION ${PACMAN_G2_VERSION}) -SET(PM_VERSION_TEMP "0." ${PACMAN_G2_LIB_VERSION}) -STRING(REPLACE ";" "" PM_VERSION ${PM_VERSION_TEMP}) +SET(PACMAN_G2_VERSION_MAJOR 3) +SET(PACMAN_G2_VERSION_MINOR 90) +SET(PACMAN_G2_VERSION_REVISION 0) +SET(PACMAN_G2_VERSION "${PACMAN_G2_VERSION_MAJOR}.${PACMAN_G2_VERSION_MINOR}.${PACMAN_G2_VERSION_REVISION}") +SET(LIBPACMAN_SOVERSION_MAJOR 0) +SET(LIBPACMAN_SOVERSION "${LIBPACMAN_SOVERSION_MAJOR}.${PACMAN_G2_VERSION_MAJOR}.${PACMAN_G2_VERSION_MINOR}") +SET(LIBPACMAN_VERSION "${LIBPACMAN_SOVERSION_MAJOR}.${PACMAN_G2_VERSION}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -std=c99 -Wall -D_GNU_SOURCE") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -std=c++11 -Wall -D_GNU_SOURCE -fpermissive") diff --git a/cmake_config.h b/cmake_config.h index 1211b39..7499475 100644 --- a/cmake_config.h +++ b/cmake_config.h @@ -103,7 +103,7 @@ #define PM_DEFAULT_BYTES_PER_BLOCK 10240 /* libpacman version number */ -#define PM_VERSION "@PM_VERSION@" +#define PM_VERSION "@LIBPACMAN_VERSION@" /* Define to 1 if you have the ANSI C header files. */ #cmakedefine STDC_HEADERS 1 diff --git a/lib/libpacman/CMakeLists.txt b/lib/libpacman/CMakeLists.txt index 1ed215a..7afad86 100644 --- a/lib/libpacman/CMakeLists.txt +++ b/lib/libpacman/CMakeLists.txt @@ -78,7 +78,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE") add_library(pacman ${BUILD_TYPE} ${LIBPACMAN_SOURCES}) target_link_libraries(pacman ${LIBPACMAN_LIBRARIES}) if(BUILD_SHARED_LIBS) - set_target_properties(pacman PROPERTIES SOVERSION 0.${PACMAN_G2_LIB_VERSION}) + set_target_properties(pacman PROPERTIES SOVERSION "${LIBPACMAN_SOVERSION}") else(BUILD_SHARED_LIBS) set_target_properties(pacman PROPERTIES LINK_SEARCH_START_STATIC ON) set_target_properties(pacman PROPERTIES LINK_SEARCH_END_STATIC ON) diff --git a/lib/libpacman/pacman.pc.in b/lib/libpacman/pacman.pc.in index b8d9982..8230887 100644 --- a/lib/libpacman/pacman.pc.in +++ b/lib/libpacman/pacman.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@ Name: pacman-g2 library Description: package management library -Version: @PM_VERSION@ +Version: @LIBPACMAN_VERSION@ Libs: -L${libdir} -lpacman Cflags: -I${includedir} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
