diff options
| author | Howard Butler <howard@hobu.co> | 2015-02-21 16:36:30 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2015-02-21 16:36:30 +0000 |
| commit | d06e4b3c2ecf905ccb2c4e0ce17778997384b778 (patch) | |
| tree | 28bd4b14fc2bf02d89d0c438fb011b88c6e12744 | |
| parent | fab753b40728709da376680efbc503ba2643faad (diff) | |
| download | PROJ-d06e4b3c2ecf905ccb2c4e0ce17778997384b778.tar.gz PROJ-d06e4b3c2ecf905ccb2c4e0ce17778997384b778.zip | |
align CMake SOVERSION with autotools #263
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2629 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | cmake/Proj4Version.cmake | 14 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 2 |
4 files changed, 7 insertions, 15 deletions
@@ -1,4 +1,8 @@ 2015-02-21 Howard Butler <howard@hobu.co> + * cmake/Proj4Version.cmake src\lib_proj.cmake: Align + SOVERSION CMake configuration with autotools #263 + +2015-02-21 Howard Butler <howard@hobu.co> * src/lib_proj.cmake: define PROJ_LIB as part of the compilation defines #261 @@ -26,6 +26,8 @@ o Fix Windows compilation on PJ_aitoff.c + o Align CMake SOVERSION with autotools #263 + 4.9.0 Release Notes ------------------- diff --git a/cmake/Proj4Version.cmake b/cmake/Proj4Version.cmake index 72db4310..fafaf24d 100644 --- a/cmake/Proj4Version.cmake +++ b/cmake/Proj4Version.cmake @@ -32,27 +32,15 @@ macro(proj_version) set(${PROJECT_INTERN_NAME}_VERSION "${${PROJECT_INTERN_NAME}_VERSION_MAJOR}.${${PROJECT_INTERN_NAME}_VERSION_MINOR}.${${PROJECT_INTERN_NAME}_VERSION_PATCH}") - # Set SOVERSION based on major and minor - set(${PROJECT_INTERN_NAME}_SOVERSION - "${${PROJECT_INTERN_NAME}_VERSION_MAJOR}.${${PROJECT_INTERN_NAME}_VERSION_MINOR}") - # Set ABI version string used to name binary output # On Windows, ABI version is specified using binary file name suffix. - # On Unix, suffix ix empty and SOVERSION is used instead. - if (UNIX) - set(${PROJECT_INTERN_NAME}_ABI_VERSION ${${PROJECT_INTERN_NAME}_SOVERSION}) - elseif(WIN32) + if(WIN32) set(${PROJECT_INTERN_NAME}_ABI_VERSION "${${PROJECT_INTERN_NAME}_VERSION_MAJOR}_${${PROJECT_INTERN_NAME}_VERSION_MINOR}") - else() - message(FATAL_ERROR "Ambiguous target platform with unknown ABI version scheme. Giving up.") endif() message(STATUS "") boost_report_value(${PROJECT_INTERN_NAME}_VERSION) - if(UNIX) - boost_report_value(${PROJECT_INTERN_NAME}_SOVERSION) - endif(UNIX) if(WIN32) boost_report_value(${PROJECT_INTERN_NAME}_ABI_VERSION) endif(WIN32) diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index a2a9fd22..e0ed351b 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -265,7 +265,6 @@ if(WIN32) set_target_properties(${PROJ_CORE_TARGET} PROPERTIES OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}" - VERSION ${${PROJECT_INTERN_NAME}_VERSION} CLEAN_DIRECT_OUTPUT 1) elseif(BUILD_FRAMEWORKS_AND_BUNDLE) set_target_properties(${PROJ_CORE_TARGET} @@ -275,7 +274,6 @@ elseif(BUILD_FRAMEWORKS_AND_BUNDLE) else() set_target_properties(${PROJ_CORE_TARGET} PROPERTIES - VERSION "${${PROJECT_INTERN_NAME}_VERSION}" SOVERSION "${${PROJECT_INTERN_NAME}_SOVERSION}" CLEAN_DIRECT_OUTPUT 1) endif() |