From 167907ef2eac5f17865c6571c36d38f018e72cbb Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Thu, 25 Feb 2016 23:46:56 +0100 Subject: [PATCH] uwac: enable library versioning --- uwac/CMakeLists.txt | 9 ++++++++- uwac/include/CMakeLists.txt | 3 +-- uwac/libuwac/CMakeLists.txt | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/uwac/CMakeLists.txt b/uwac/CMakeLists.txt index cbfecb8..dc8c9f0 100644 --- a/uwac/CMakeLists.txt +++ b/uwac/CMakeLists.txt @@ -15,6 +15,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Soname versioning +set(UWAC_VERSION_MAJOR "0") +set(UWAC_VERSION_MINOR "0") +set(UWAC_VERSION_REVISION "1") +set(UWAC_VERSION "${UWAC_VERSION_MAJOR}.${UWAC_VERSION_MINOR}.${UWAC_VERSION_REVISION}") +set(UWAC_VERSION_FULL "${UWAC_VERSION}") +set(UWAC_API_VERSION "${UWAC_VERSION_MAJOR}") + add_subdirectory(include) add_subdirectory(libuwac) - diff --git a/uwac/include/CMakeLists.txt b/uwac/include/CMakeLists.txt index b6e7129..6858728 100644 --- a/uwac/include/CMakeLists.txt +++ b/uwac/include/CMakeLists.txt @@ -16,5 +16,4 @@ # limitations under the License. file(GLOB UWAC_HEADERS "uwac/*.h") -install(FILES ${UWAC_HEADERS} DESTINATION include/uwac COMPONENT headers) - +install(FILES ${UWAC_HEADERS} DESTINATION include/uwac${UWAC_API_VERSION}/uwac COMPONENT headers) diff --git a/uwac/libuwac/CMakeLists.txt b/uwac/libuwac/CMakeLists.txt index 49a6634..4de9325 100644 --- a/uwac/libuwac/CMakeLists.txt +++ b/uwac/libuwac/CMakeLists.txt @@ -65,12 +65,12 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) if (WITH_LIBRARY_VERSIONING) - #set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${UWAC_VERSION} SOVERSION ${UWAC_API_VERSION}) + set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${UWAC_VERSION} SOVERSION ${UWAC_API_VERSION}) endif() -target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS}) +target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${WAYLAND_LIBS} ${XKBCOMMON_LIBS} freerdp) -install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT Uwac) +install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT uwac) set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "uwac") -- 2.7.4