From 57f5597179a414577701ee0578f6cc2937d78fe6 Mon Sep 17 00:00:00 2001
From: "a.yankovich" <EndrIIMail@gmail.com>
Date: Thu, 17 Dec 2020 18:18:35 +0300
Subject: [PATCH] added support nonQt libs
---
CMakeLists.txt | 5 +++--
src/CMakeLists.txt | 9 ++++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c16c821..75b9848 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,8 +13,10 @@ if(TARGET ${PROJECT_NAME})
endif()
set (QT_VERSION_MAJOR OFF)
+set (BUILD_SHARED_LIBS ON)
+
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Test QUIET)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET)
include(CMake/ccache.cmake)
include(CMake/QuasarAppCITargets.cmake)
@@ -26,7 +28,6 @@ if (${QT_VERSION_MAJOR})
endif()
-
initAll()
addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5999f07..60c6ff5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,6 @@ cmake_minimum_required(VERSION 3.14)
include(../CMake/ProjectOut.cmake)
include(../CMake/Version.cmake)
-
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
@@ -23,6 +22,7 @@ add_definitions(-DRENAME_ME_LIBRARY)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
file(GLOB SOURCE_CPP
"*.cpp" "*.qrc"
@@ -35,8 +35,11 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/src")
set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Private")
-add_library(${PROJECT_NAME} SHARED ${SOURCE_CPP})
-target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core)
+add_library(${PROJECT_NAME} ${SOURCE_CPP})
+
+if (${QT_VERSION_MAJOR})
+ target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core)
+endif()
target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR})
target_include_directories(${PROJECT_NAME} PRIVATE ${PRIVATE_INCUDE_DIR})