From 92c41206656d37e8686e30524c3cd376a7e1a216 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Wed, 5 Jun 2024 11:09:03 +0200 Subject: CMake: Simplified VERSION_DOTS and match version.mk SO version --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f4effc..51e3b6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ set(VENDOR_SOURCE https://github.com/themanaworld/tmwa) # Convenience set(VERSION_STRING "TMWA ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} dev${PROJECT_VERSION_TWEAK} +${VENDOR_POINT} (${VENDOR_NAME})") -set(VERSION_DOTS "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}.${VENDOR_POINT}") +set(VERSION_DOTS "${PROJECT_VERSION}.${VENDOR_POINT}") include(GNUInstallDirs) set(PACKAGEDATADIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/tmwa") @@ -101,7 +101,10 @@ add_library(tmwa-shared SHARED ${shared_SOURCES} ${strings_SOURCES} ) # SO versioning -set_target_properties(tmwa-shared PROPERTIES VERSION ${PROJECT_VERSION}.0 SOVERSION 0) +set(ABI_VERSION 0) +set_target_properties(tmwa-shared PROPERTIES + VERSION ${ABI_VERSION}.${VERSION_DOTS} + SOVERSION ${ABI_VERSION}) # We have four binaries we want to build: tmwa-{login,char,map,admin} add_executable(tmwa-login ${login_SOURCES} -- cgit v1.2.3-60-g2f50