1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36
|
From: Leopold Palomo-Avellaneda <leo@alaxarxa.net>
Date: Mon, 29 Oct 2018 15:53:33 +0100
Subject: Adding Qt major version to Soname
---
CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cb8bbb..25cfada 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,7 @@ set(PROJECT_DESCRIPTION "SoQt is a Qt GUI component toolkit library for Coin")
string(TIMESTAMP SO${GUI}_BUILD_YEAR "%Y")
math(EXPR SO${GUI}_SO_VERSION ${PROJECT_VERSION_MAJOR}*20)
+
set(VERSION ${SO${GUI}_VERSION})
if(POLICY CMP0072)
@@ -91,12 +92,15 @@ if(Qt5_FOUND)
string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${Qt5Core_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${Qt5Core_VERSION_STRING}")
set(PACKAGE_ADDITIONAL_REQUIREMENTS "Qt5Core, Qt5Gui, Qt5OpenGL, Qt5Widgets")
+ set(QTMAJOR 5)
else()
set(QT_USE_IMPORTED_TARGETS ON)
find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL REQUIRED)
include(${QT_USE_FILE})
set(PACKAGE_ADDITIONAL_REQUIREMENTS "QtCore, QtGui, QtOpenGL")
+ set(QTMAJOR 4)
endif()
+set(SO${GUI}_SO_VERSION ${QTMAJOR}${SO${GUI}_SO_VERSION})
find_package(X11)
|