Skip to content

Use PROJECT_VERSION not CMAKE_PROJECT_VERSION #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Use PROJECT_VERSION not CMAKE_PROJECT_VERSION #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ project(
VERSION ${UMF_CMAKE_VERSION}
LANGUAGES C)

if(CMAKE_PROJECT_VERSION_PATCH GREATER 0)
if(PROJECT_VERSION_PATCH GREATER 0)
# set extra variable for Windows dll metadata
set(UMF_VERSION_BUGFIX 1)
endif()
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ if(UMF_BUILD_SHARED_LIBRARY)
set_target_properties(
umf
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_UMF_OUTPUT_DIRECTORY}
VERSION ${CMAKE_PROJECT_VERSION}
SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR})
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR})
else()
add_umf_library(
NAME umf
Expand Down
2 changes: 1 addition & 1 deletion src/libumf.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "umf/base.h"

#define UMF_VERNUMBERS @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
#define UMF_VERNUMBERS @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
#define _UMF_VERSION "@UMF_VERSION@"

#ifdef _DEBUG
Expand Down
3 changes: 1 addition & 2 deletions src/proxy_lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ add_umf_library(
LIBS umf_utils ${PROXY_LIBS}
LINUX_MAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/proxy_lib.map
WINDOWS_DEF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/proxy_lib.def)
set_target_properties(umf_proxy PROPERTIES SOVERSION
${CMAKE_PROJECT_VERSION_MAJOR})
set_target_properties(umf_proxy PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR})

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

Expand Down
2 changes: 1 addition & 1 deletion src/proxy_lib/proxy_lib.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "umf/base.h"

#define UMF_VERNUMBERS @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
#define UMF_VERNUMBERS @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
#define _UMF_VERSION "@UMF_VERSION@"

#ifdef _DEBUG
Expand Down
Loading