songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3718 from lrineau/CGAL-SOVERSION_for_CGAL_ImageIO-GF 

Allow to have different SOVERSION for each CGAL libraries
This commit is contained in:
Laurent Rineau 2019-02-28 20:54:43 +01:00
parent b3b513c20d eb9687aaf4
commit 3f66d8f00a
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Installation/CMakeLists.txt
View File

@ -366,11 +366,14 @@ endif()
# CGAL-4.10 : 13.0.0 (Change the API/ABI in CGAL_ImageIO.)
# CGAL-4.11 : 13.0.1 (Nothing different in CGAL compiled libraries.)
# CGAL-4.12 : 13.0.2 (Nothing different in CGAL compiled libraries.)
# CGAL-4.14 : 14.0.0 (ABI broken in CGAL::Image_3.)
# CGAL-4.14 : 14.0.0 , but only for CGAL_ImageIO (ABI broken in CGAL::Image_3.)
# CGAL-4.14 : 13.0.3 , for other libraries
# ¹) According to http://upstream-tracker.org/versions/cgal.html
set( CGAL_SONAME_VERSION "14" )
set( CGAL_SOVERSION "14.0.0" )
set( CGAL_SONAME_VERSION "13" )
set( CGAL_SOVERSION "13.0.3" )
set( CGAL_ImageIO_SONAME_VERSION "14" )
set( CGAL_ImageIO_SOVERSION "14.0.0" )
message( STATUS "CGAL_SONAME_VERSION=${CGAL_SONAME_VERSION}" )
message( STATUS "CGAL_SOVERSION =${CGAL_SOVERSION}" )

6
Installation/src/CMakeLists.txt
View File

@ -50,7 +50,11 @@ function (collect_cgal_library LIBRARY_NAME ADDITIONAL_FILES)
${rc_file}
${ADDITIONAL_FILES})
# add_library (${LIBRARY_NAME} ${CGAL_LIBRARY_SOURCE_FILES} ${rc_file} ${ADDITIONAL_FILES}) # builing not creating temporary all_files.cpp
if(CGAL_SOVERSION AND CGAL_SONAME_VERSION)
if(${LIBRARY_NAME}_SOVERSION AND ${LIBRARY_NAME}_SONAME_VERSION)
set_target_properties(${LIBRARY_NAME} PROPERTIES
VERSION "${${LIBRARY_NAME}_SOVERSION}"
SOVERSION "${${LIBRARY_NAME}_SONAME_VERSION}")
elseif(CGAL_SOVERSION AND CGAL_SONAME_VERSION)
set_target_properties(${LIBRARY_NAME} PROPERTIES
VERSION "${CGAL_SOVERSION}"
SOVERSION "${CGAL_SONAME_VERSION}")

4
Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
View File

@ -107,7 +107,7 @@ if(EXISTS ${release_dir})
file(REMOVE_RECURSE ${release_dir})
endif()
if (PUBLIC)
if (PUBLIC AND NOT TESTSUITE)
message(STATUS "Creating a public release ${CGAL_VERSION} in ${release_dir}")
else()
message(STATUS "Creating an internal release ${CGAL_VERSION} in ${release_dir}")
@ -274,7 +274,7 @@ file(REMOVE ${release_dir}/include/CGAL/license/README.md)
file(REMOVE ${release_dir}/include/CGAL/license/gpl.h.in)
file(REMOVE ${release_dir}/include/CGAL/license/package_list.txt)
if(PUBLIC) # we are not creating an internal release.
if(PUBLIC AND NOT TESTSUITE) # we are not creating an internal release.
# Taken from create_new_release.
file(REMOVE_RECURSE ${release_dir}/test)
file(REMOVE_RECURSE ${release_dir}/package_info)