From f04313ce556e43f9aff08cb5e8643d1a63150f08 Mon Sep 17 00:00:00 2001 From: EndrII Date: Thu, 29 Apr 2021 23:08:09 +0300 Subject: [PATCH] cmake fixes --- CMakeLists.txt | 9 ++++----- src/CMakeLists.txt | 3 --- tests/CMakeLists.txt | 1 - tests/tst_arithmetictests.cpp | 1 + 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08edf38..e46a271 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,13 +12,10 @@ if(TARGET ${PROJECT_NAME}) return() endif() -include(CMake/ccache.cmake) -include(CMake/QuasarAppCITargets.cmake) +include(CMake/QuasarApp.cmake) +include(CMake/Version.cmake) -# Add sub directories -add_subdirectory(src) - find_package(QT NAMES Qt6 Qt5 COMPONENTS Core QUIET) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core QUIET) @@ -41,6 +38,8 @@ if (NOT DEFINED BIGINT_TESTS) endif() +add_subdirectory(src) + if (BIGINT_TESTS) add_subdirectory(tests) else() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0453e92..4413850 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,9 +10,6 @@ set(CURRENT_PROJECT ${PROJECT_NAME}) project(QtBigint LANGUAGES CXX) -include(../CMake/ProjectOut.cmake) -include(../CMake/Version.cmake) - file(GLOB SOURCE_CPP "*.cpp" "mini-gmp.c" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 113b1be..04fd7ba 100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,7 +9,6 @@ cmake_minimum_required(VERSION 3.10) set(CURRENT_PROJECT ${PROJECT_NAME}Test) -include(../CMake/ProjectOut.cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) diff --git a/tests/tst_arithmetictests.cpp b/tests/tst_arithmetictests.cpp index 5d9bc42..aee01e2 100644 --- a/tests/tst_arithmetictests.cpp +++ b/tests/tst_arithmetictests.cpp @@ -1,6 +1,7 @@ #include #include #include +#include // add necessary includes here