diff options
| author |   Andrej Rode <mail@andrejro.de> | 2019-05-15 09:31:26 -0700 |
|---|---|---|
| committer |   Martin Braun <martin.braun@ettus.com> | 2019-05-23 08:50:28 -0700 |
| commit | bd8dbcbc3e3333738d25d58c40ba625531288ada (patch) | |
| tree | 1535ddc14270b4f914d14e6910c845b00b46e665 | |
| parent | analog: correct errors of automatic conversion script in fm_preemph (diff) | |
| download | gnuradio-bd8dbcbc3e3333738d25d58c40ba625531288ada.tar.xz gnuradio-bd8dbcbc3e3333738d25d58c40ba625531288ada.zip | |
cmake: incorporate SO versioning from debian downstream patches
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 31 | ||||
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 2 |
2 files changed, 2 insertions, 31 deletions
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index 32681ac39..5dddc1ba2 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -72,6 +72,7 @@ endmacro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE) function(GR_LIBRARY_FOO target) #set additional target properties set_target_properties(${target} PROPERTIES SOVERSION ${LIBVER}) + set_target_properties(${target} PROPERTIES VERSION ${VERSION}) #install the generated files like so... install(TARGETS ${target} @@ -102,36 +103,6 @@ function(GR_LIBRARY_FOO target) DESTINATION ${GR_CMAKE_DIR} ) - #extras mode enabled automatically on linux - if(NOT DEFINED LIBRARY_EXTRAS) - set(LIBRARY_EXTRAS ${LINUX}) - endif() - - #special extras mode to enable alternative naming conventions - if(LIBRARY_EXTRAS) - - #give the library a special name with ultra-zero soversion - set_target_properties(${target} PROPERTIES OUTPUT_NAME ${target}-${LIBVER} SOVERSION "0.0.0") - set(target_name lib${target}-${LIBVER}.so.0.0.0) - - #custom command to generate symlinks - add_custom_command( - TARGET ${target} - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so - COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} ${CMAKE_CURRENT_BINARY_DIR}/lib${target}-${LIBVER}.so.0 - COMMAND ${CMAKE_COMMAND} -E touch ${target_name} #so the symlinks point to something valid so cmake 2.6 will install - ) - - #and install the extra symlinks - install( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so - ${CMAKE_CURRENT_BINARY_DIR}/lib${target}-${LIBVER}.so.0 - DESTINATION ${GR_LIBRARY_DIR} - ) - - endif(LIBRARY_EXTRAS) endfunction(GR_LIBRARY_FOO) ######################################################################## diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index 938d14e60..a899442a5 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -85,7 +85,7 @@ else() # LIBVER: 3.3.1{.x} set(VERSION "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}.${MAINT_VERSION}") set(DOCVER "${VERSION}") - set(LIBVER "${VERSION}") + set(LIBVER "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}") set(RC_MINOR_VERSION ${MINOR_VERSION}) set(RC_MAINT_VERSION ${MAINT_VERSION}) endif() |