Commit adf89af5 authored by Dominik Charousset's avatar Dominik Charousset

Correctly propagate version to subprojects

parent a3065c30
...@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 2.8) ...@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 2.8)
project(caf C CXX) project(caf C CXX)
# extract version from VERSION file # extract version from VERSION file
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1) file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" CAF_VERSION LIMIT_COUNT 1)
string(REPLACE "." " " version_numbers ${VERSION}) string(REPLACE "." " " version_numbers ${CAF_VERSION})
separate_arguments(version_numbers) separate_arguments(version_numbers)
list(GET version_numbers 0 LIBCAF_VERSION_MAJOR) list(GET version_numbers 0 CAF_VERSION_MAJOR)
list(GET version_numbers 1 LIBCAF_VERSION_MINOR) list(GET version_numbers 1 CAF_VERSION_MINOR)
list(GET version_numbers 2 LIBCAF_VERSION_PATCH) list(GET version_numbers 2 CAF_VERSION_PATCH)
# prohibit in-source builds # prohibit in-source builds
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
...@@ -239,7 +239,7 @@ endif () ...@@ -239,7 +239,7 @@ endif ()
message(STATUS message(STATUS
"\n====================| Build Summary |====================" "\n====================| Build Summary |===================="
"\n" "\n"
"\nLibcaf version: ${LIBRARY_VERSION}" "\nLibcaf version: ${CAF_VERSION}"
"\n" "\n"
"\nBuild type: ${CMAKE_BUILD_TYPE}" "\nBuild type: ${CMAKE_BUILD_TYPE}"
"\nRuntime checks: ${DEBUG_MODE_STR}" "\nRuntime checks: ${DEBUG_MODE_STR}"
...@@ -260,5 +260,6 @@ message(STATUS ...@@ -260,5 +260,6 @@ message(STATUS
"\nExecutable path: ${EXECUTABLE_OUTPUT_PATH}" "\nExecutable path: ${EXECUTABLE_OUTPUT_PATH}"
"\nLibrary path: ${LIBRARY_OUTPUT_PATH}" "\nLibrary path: ${LIBRARY_OUTPUT_PATH}"
"\nInstall prefix: ${CMAKE_INSTALL_PREFIX}" "\nInstall prefix: ${CMAKE_INSTALL_PREFIX}"
"\nGenerator: ${CMAKE_GENERATOR}"
"\n" "\n"
"\n===========================================================\n") "\n===========================================================\n")
...@@ -78,12 +78,11 @@ set (LIBCAF_CORE_SRCS ...@@ -78,12 +78,11 @@ set (LIBCAF_CORE_SRCS
if (NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes") if (NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes")
add_library(libcaf_core SHARED ${LIBCAF_CORE_SRCS} ${LIBCAF_CORE_HDRS}) add_library(libcaf_core SHARED ${LIBCAF_CORE_SRCS} ${LIBCAF_CORE_HDRS})
target_link_libraries(libcaf_core ${LD_FLAGS}) target_link_libraries(libcaf_core ${LD_FLAGS})
set(LIBRARY_VERSION ${LIBCAF_VERSION_MAJOR}.${LIBCAF_VERSION_MINOR}.${LIBCAF_VERSION_PATCH}) set(LIBRARY_SOVERSION ${CAF_VERSION_MAJOR})
set(LIBRARY_SOVERSION ${LIBCAF_VERSION_MAJOR})
set_target_properties(libcaf_core set_target_properties(libcaf_core
PROPERTIES PROPERTIES
SOVERSION ${LIBRARY_SOVERSION} SOVERSION ${LIBRARY_SOVERSION}
VERSION ${LIBRARY_VERSION} VERSION ${CAF_VERSION}
OUTPUT_NAME caf_core) OUTPUT_NAME caf_core)
if(NOT MINGW) if(NOT MINGW)
install(TARGETS libcaf_core LIBRARY DESTINATION lib) install(TARGETS libcaf_core LIBRARY DESTINATION lib)
......
...@@ -19,12 +19,11 @@ set (LIBCAF_IO_SRCS ...@@ -19,12 +19,11 @@ set (LIBCAF_IO_SRCS
if (NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes") if (NOT "${CAF_BUILD_STATIC_ONLY}" STREQUAL "yes")
add_library(libcaf_io SHARED ${LIBCAF_IO_SRCS} ${LIBCAF_IO_HDRS}) add_library(libcaf_io SHARED ${LIBCAF_IO_SRCS} ${LIBCAF_IO_HDRS})
target_link_libraries(libcaf_io ${LD_FLAGS} ${LIBCAF_CORE_LIBRARY}) target_link_libraries(libcaf_io ${LD_FLAGS} ${LIBCAF_CORE_LIBRARY})
set(LIBRARY_VERSION ${LIBCAF_VERSION_MAJOR}.${LIBCAF_VERSION_MINOR}.${LIBCAF_VERSION_PATCH}) set(LIBRARY_SOVERSION ${CAF_VERSION_MAJOR})
set(LIBRARY_SOVERSION ${LIBCAF_VERSION_MAJOR})
set_target_properties(libcaf_io set_target_properties(libcaf_io
PROPERTIES PROPERTIES
SOVERSION ${LIBRARY_SOVERSION} SOVERSION ${LIBRARY_SOVERSION}
VERSION ${LIBRARY_VERSION} VERSION ${CAF_VERSION}
OUTPUT_NAME caf_io) OUTPUT_NAME caf_io)
if(NOT MINGW) if(NOT MINGW)
install(TARGETS libcaf_io LIBRARY DESTINATION lib) install(TARGETS libcaf_io LIBRARY DESTINATION lib)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment