From cc770c8bc6d9d8c59be2eb86ffae01b1f2c06339 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Sun, 27 Jul 2025 16:37:21 -0700 Subject: [PATCH 1/2] change SOVERSION to use MAJOR.MINOR format instead of MAJOR.MINOR.PATCH format, i.e. "1.5" instead of "1.5.3" --- CMakeLists.txt | 7 ++++++- lib/IlmCtl/CMakeLists.txt | 4 ++-- lib/IlmCtlMath/CMakeLists.txt | 4 ++-- lib/IlmCtlSimd/CMakeLists.txt | 4 ++-- lib/IlmImfCtl/CMakeLists.txt | 6 +++--- lib/dpx/CMakeLists.txt | 4 ++-- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcc7ac3..7e76172 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ cmake_minimum_required(VERSION 3.12) -project(CTL VERSION 1.5.3) + +set(CTL_VERSION_MAJOR 1) +set(CTL_VERSION_MINOR 5) +set(CTL_VERSION_PATCH 3) +set(CTL_VERSION "${CTL_VERSION_MAJOR}.${CTL_VERSION_MINOR}.${CTL_VERSION_PATCH}") +project(CTL VERSION ${CTL_VERSION}) include(GNUInstallDirs) set(CMAKE_CXX_STANDARD 11) diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt index 5c0ad9c..4765710 100644 --- a/lib/IlmCtl/CMakeLists.txt +++ b/lib/IlmCtl/CMakeLists.txt @@ -42,8 +42,8 @@ target_link_libraries (IlmCtl set_target_properties(IlmCtl PROPERTIES - VERSION ${CTL_VERSION} - SOVERSION ${CTL_VERSION} + VERSION "${CTL_VERSION}" + SOVERSION "${CTL_VERSION_MAJOR}.${CTL_VERSION_MINOR}" ) install( FILES diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt index 08fdf00..cec94ca 100644 --- a/lib/IlmCtlMath/CMakeLists.txt +++ b/lib/IlmCtlMath/CMakeLists.txt @@ -29,8 +29,8 @@ target_link_libraries (IlmCtlMath set_target_properties(IlmCtlMath PROPERTIES - VERSION ${CTL_VERSION} - SOVERSION ${CTL_VERSION} + VERSION "${CTL_VERSION}" + SOVERSION "${CTL_VERSION_MAJOR}.${CTL_VERSION_MINOR}" ) install(FILES diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt index d9dc6ec..54d35a7 100644 --- a/lib/IlmCtlSimd/CMakeLists.txt +++ b/lib/IlmCtlSimd/CMakeLists.txt @@ -88,8 +88,8 @@ target_link_libraries(IlmCtlSimd set_target_properties(IlmCtlSimd PROPERTIES - VERSION ${CTL_VERSION} - SOVERSION ${CTL_VERSION} + VERSION "${CTL_VERSION}" + SOVERSION "${CTL_VERSION_MAJOR}.${CTL_VERSION_MINOR}" ) install(FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL) diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt index a0cd535..f61942b 100644 --- a/lib/IlmImfCtl/CMakeLists.txt +++ b/lib/IlmImfCtl/CMakeLists.txt @@ -36,9 +36,9 @@ target_link_libraries (IlmImfCtl ) set_target_properties(IlmImfCtl - PROPERTIES - VERSION ${CTL_VERSION} - SOVERSION ${CTL_VERSION} + PROPERTIES + VERSION "${CTL_VERSION}" + SOVERSION "${CTL_VERSION_MAJOR}.${CTL_VERSION_MINOR}" ) install(FILES diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt index e9aa5bb..38facab 100644 --- a/lib/dpx/CMakeLists.txt +++ b/lib/dpx/CMakeLists.txt @@ -37,6 +37,6 @@ target_link_libraries(ctldpx set_target_properties(ctldpx PROPERTIES - VERSION ${CTL_VERSION} - SOVERSION ${CTL_VERSION} + VERSION "${CTL_VERSION}" + SOVERSION "${CTL_VERSION_MAJOR}.${CTL_VERSION_MINOR}" ) From 10a6a1a894894a598b129699956628c1508d35f0 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 28 Jul 2025 11:42:27 -0700 Subject: [PATCH 2/2] revert changes to CMakeLists.txt --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e76172..bcc7ac3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,5 @@ cmake_minimum_required(VERSION 3.12) - -set(CTL_VERSION_MAJOR 1) -set(CTL_VERSION_MINOR 5) -set(CTL_VERSION_PATCH 3) -set(CTL_VERSION "${CTL_VERSION_MAJOR}.${CTL_VERSION_MINOR}.${CTL_VERSION_PATCH}") -project(CTL VERSION ${CTL_VERSION}) +project(CTL VERSION 1.5.3) include(GNUInstallDirs) set(CMAKE_CXX_STANDARD 11)