mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use major version only for SOVERSION

Browse Source 
For 2.0+ major will be increased if ABI/API isn't compatible anymore.
This commit is contained in:
Bernhard Miklautz 2016-01-13 17:37:19 +01:00
parent 3b7d95225f
commit 3232be51b0
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -72,8 +72,8 @@ set(FREERDP_VERSION_MAJOR "2")
set(FREERDP_VERSION_MINOR "0") set(FREERDP_VERSION_MINOR "0")
set(FREERDP_VERSION_REVISION "0") set(FREERDP_VERSION_REVISION "0")
set(FREERDP_VERSION_SUFFIX "dev") set(FREERDP_VERSION_SUFFIX "dev")
set(FREERDP_API_VERSION "${FREERDP_VERSION_MAJOR}.${FREERDP_VERSION_MINOR}") set(FREERDP_API_VERSION "${FREERDP_VERSION_MAJOR}")
set(FREERDP_VERSION "${FREERDP_API_VERSION}.${FREERDP_VERSION_REVISION}") set(FREERDP_VERSION "${FREERDP_VERSION_MAJOR}.${FREERDP_VERSION_MINOR}.${FREERDP_VERSION_REVISION}")
if (FREERDP_VERSION_SUFFIX) if (FREERDP_VERSION_SUFFIX)
set(FREERDP_VERSION_FULL "${FREERDP_VERSION}-${FREERDP_VERSION_SUFFIX}") set(FREERDP_VERSION_FULL "${FREERDP_VERSION}-${FREERDP_VERSION_SUFFIX}")
else() else()

4
rdtk/CMakeLists.txt
View File

@ -44,8 +44,8 @@ include(CMakePackageConfigHelpers)
set(RDTK_VERSION_MAJOR "0") set(RDTK_VERSION_MAJOR "0")
set(RDTK_VERSION_MINOR "0") set(RDTK_VERSION_MINOR "0")
set(RDTK_VERSION_REVISION "1") set(RDTK_VERSION_REVISION "1")
set(RDTK_API_VERSION "${RDTK_VERSION_MAJOR}.${RDTK_VERSION_MINOR}") set(RDTK_API_VERSION "${RDTK_VERSION_MAJOR}")
set(RDTK_VERSION "${RDTK_API_VERSION}.${RDTK_VERSION_REVISION}") set(RDTK_VERSION "${RDTK_VERSION_MAJOR}.${RDTK_VERSION_MINOR}.${RDTK_VERSION_REVISION}")
set(RDTK_VERSION_FULL "${RDTK_VERSION}") set(RDTK_VERSION_FULL "${RDTK_VERSION}")
# Default to release build type # Default to release build type

7
winpr/CMakeLists.txt
View File

@ -53,10 +53,11 @@ set(WINPR_VERSION_MINOR "1")
set(WINPR_VERSION_REVISION "0") set(WINPR_VERSION_REVISION "0")
set(WINPR_VERSION "${WINPR_VERSION_MAJOR}.${WINPR_VERSION_MINOR}.${WINPR_VERSION_REVISION}") set(WINPR_VERSION "${WINPR_VERSION_MAJOR}.${WINPR_VERSION_MINOR}.${WINPR_VERSION_REVISION}")
set(WINPR_VERSION_FULL "${WINPR_VERSION}") set(WINPR_VERSION_FULL "${WINPR_VERSION}")
set(WINPR_API_VERSION "${WINPR_VERSION_MAJOR}")
if(FREERDP_BUILD) if(FREERDP_BUILD)
set(WINPR_VERSION_FULL ${WINPR_VERSION_FULL} PARENT_SCOPE) set(WINPR_VERSION_FULL ${WINPR_VERSION_FULL} PARENT_SCOPE)
set(WINPR_VERSION_FULL ${WINPR_VERSION} PARENT_SCOPE) set(WINPR_VERSION ${WINPR_VERSION} PARENT_SCOPE)
else() else()
set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
@ -180,6 +181,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
endif() endif()
set(WINPR_PKG_CONFIG_FILENAME winpr${WINPR_VERSION_MAJOR} PARENT_SCOPE) if(FREERDP_BUILD)
set(WINPR_PKG_CONFIG_FILENAME winpr${WINPR_VERSION_MAJOR} PARENT_SCOPE)
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr.pc.in ${CMAKE_CURRENT_BINARY_DIR}/winpr${WINPR_VERSION_MAJOR}.pc @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr.pc.in ${CMAKE_CURRENT_BINARY_DIR}/winpr${WINPR_VERSION_MAJOR}.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr${WINPR_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpr${WINPR_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

2
winpr/libwinpr/CMakeLists.txt
View File

@ -114,7 +114,7 @@ endif()
add_library(${MODULE_NAME} ${WINPR_SRCS}) add_library(${MODULE_NAME} ${WINPR_SRCS})
set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C) set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C)
if (WITH_LIBRARY_VERSIONING) if (WITH_LIBRARY_VERSIONING)
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION}) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION} SOVERSION ${WINPR_API_VERSION})
endif() endif()
add_definitions(${WINPR_DEFINITIONS}) add_definitions(${WINPR_DEFINITIONS})