Skip to content

Commit 76ff417

Browse files
committed
Use PROJECT_VERSION not CMAKE_PROJECT_VERSION
When building as a subproject the `CMAKE_PROJECT_VERSION` is the root project version not the current project version. As such, in a subproject which makes use of UMF, such as UR, the `.so` or `.dll` library version would be set to the UR project version, not the UMF version. This patch fixes this erroneous versioning by using `PROJECT_VERSION` (and derivatives) in place of `CMAKE_PROJECT_VERSION`.
1 parent 4f57234 commit 76ff417

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ project(
2323
VERSION ${UMF_CMAKE_VERSION}
2424
LANGUAGES C)
2525

26-
if(CMAKE_PROJECT_VERSION_PATCH GREATER 0)
26+
if(PROJECT_VERSION_PATCH GREATER 0)
2727
# set extra variable for Windows dll metadata
2828
set(UMF_VERSION_BUGFIX 1)
2929
endif()

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ if(UMF_BUILD_SHARED_LIBRARY)
168168
set_target_properties(
169169
umf
170170
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_UMF_OUTPUT_DIRECTORY}
171-
VERSION ${CMAKE_PROJECT_VERSION}
172-
SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR})
171+
VERSION ${PROJECT_VERSION}
172+
SOVERSION ${PROJECT_VERSION_MAJOR})
173173
else()
174174
add_umf_library(
175175
NAME umf

src/libumf.rc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "umf/base.h"
1010

11-
#define UMF_VERNUMBERS @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
11+
#define UMF_VERNUMBERS @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
1212
#define _UMF_VERSION "@UMF_VERSION@"
1313

1414
#ifdef _DEBUG

src/proxy_lib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ add_umf_library(
3333
LINUX_MAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/proxy_lib.map
3434
WINDOWS_DEF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/proxy_lib.def)
3535
set_target_properties(umf_proxy PROPERTIES SOVERSION
36-
${CMAKE_PROJECT_VERSION_MAJOR})
36+
${PROJECT_VERSION_MAJOR})
3737

3838
add_library(${PROJECT_NAME}::proxy ALIAS umf_proxy)
3939

src/proxy_lib/proxy_lib.rc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "umf/base.h"
1010

11-
#define UMF_VERNUMBERS @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
11+
#define UMF_VERNUMBERS @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
1212
#define _UMF_VERSION "@UMF_VERSION@"
1313

1414
#ifdef _DEBUG

0 commit comments

Comments
 (0)