Merge pull request #682 from kbenzie/benie/use-project-version

Use PROJECT_VERSION not CMAKE_PROJECT_VERSION

Author: igchor

CMakeLists.txt

@@ -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()

src/CMakeLists.txt

@@ -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

src/libumf.rc.in

@@ -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

src/proxy_lib/CMakeLists.txt

@@ -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)
 

src/proxy_lib/proxy_lib.rc.in

@@ -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