CMake: Use cmake project version variables

SkBlaz · May 18, 2020 · 79e4046 · 79e4046
1 parent 2ba4d79
commit 79e4046
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,7 @@
 cmake_minimum_required(VERSION 3.3)
-project(qxmpp)
+project(qxmpp VERSION 1.4.0)
 
-set(VERSION_MAJOR 1)
-set(VERSION_MINOR 4)
-set(VERSION_PATCH 0)
 set(SO_VERSION 3)
-set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_STRING)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/modules")
@@ -49,7 +44,7 @@ configure_package_config_file(
 
 write_basic_package_version_file(
     ${CMAKE_CURRENT_BINARY_DIR}/QXmppConfigVersion.cmake
-    VERSION ${VERSION_STRING}
+    VERSION ${PROJECT_VERSION}
     COMPATIBILITY SameMajorVersion
 )
 

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -1,5 +1,5 @@
 PROJECT_NAME           = "QXmpp"
-PROJECT_NUMBER         = Version:@VERSION_STRING@
+PROJECT_NUMBER         = "Version: @PROJECT_VERSION@"
 INPUT                  = @PROJECT_SOURCE_DIR@/doc/index.doc \
                          @PROJECT_SOURCE_DIR@/doc/using.doc \
                          @PROJECT_SOURCE_DIR@/doc/xep.doc \

diff --git a/qxmpp.pc.in b/qxmpp.pc.in
@@ -5,8 +5,8 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/qxmpp
 
 
 Name: Qxmpp
-Description: Qxmpp Library
-Version: @VERSION_STRING@
+Description: QXmpp Library
+Version: @PROJECT_VERSION@
 Libs: -lqxmpp
 Libs.private: -lQt5Network -lQt5Xml -lQt5Core
 Cflags: -I${includedir}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -214,7 +214,7 @@ else()
 endif()
 
 set_target_properties(qxmpp PROPERTIES
-    VERSION ${VERSION_STRING}
+    VERSION ${PROJECT_VERSION}
     SOVERSION ${SO_VERSION}
     EXPORT_NAME QXmpp
 )

diff --git a/src/base/QXmppGlobal.h.in b/src/base/QXmppGlobal.h.in
@@ -52,17 +52,17 @@
 /// available.
 ///
 
-#define QXMPP_VERSION QT_VERSION_CHECK(@VERSION_MAJOR@, @VERSION_MINOR@, @VERSION_PATCH@)
+#define QXMPP_VERSION QT_VERSION_CHECK(@PROJECT_VERSION_MAJOR@, @PROJECT_VERSION_MINOR@, @PROJECT_VERSION_PATCH@)
 
 inline QLatin1String QXmppVersion()
 {
-    return QLatin1String("@VERSION_STRING@");
+    return QLatin1String("@PROJECT_VERSION@");
 }
 
 // This sets which deprecated functions should still be usable
 // It works exactly like QT_DISABLE_DEPRECATED_BEFORE
 #ifndef QXMPP_DISABLE_DEPRECATED_BEFORE
-#   define QXMPP_DISABLE_DEPRECATED_BEFORE 0x@VERSION_MAJOR@ << 16
+#   define QXMPP_DISABLE_DEPRECATED_BEFORE 0x0
 #endif
 
 // This works exactly like QT_DEPRECATED_SINCE, but checks QXMPP_DISABLE_DEPRECATED_BEFORE instead.