Merge pull request #21 from QuasarApp/cmake_fixes

Cmake fixes
This commit is contained in:
Andrei Yankovich 2021-04-29 23:38:25 +03:00 committed by GitHub
commit 7281435f64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 12 deletions

2
CMake

@ -1 +1 @@
Subproject commit c59a0c81555a281273b38095613472abc0fe73b7
Subproject commit 5e0fc2b92801eff4fb490f8db1cc2bd28e8d94e8

View File

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

View File

@ -10,8 +10,8 @@ set(CURRENT_PROJECT ${PROJECT_NAME})
project(QtBigint LANGUAGES CXX)
include(../CMake/ProjectOut.cmake)
include(../CMake/Version.cmake)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
file(GLOB SOURCE_CPP
"*.cpp"

View File

@ -10,10 +10,10 @@
#ifdef _WIN32
# define MINIGMPSHARED_EXPORT __declspec(dllexport)
#endif
#if defined (linux) || defined (__linux__) || defined (__APPLE__)
#elif (linux) || defined (__linux__) || defined (__APPLE__)
# define MINIGMPSHARED_EXPORT __attribute__((visibility("default")))
#else
# define MINIGMPSHARED_EXPORT
#endif

View File

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

View File

@ -1,6 +1,7 @@
#include <QtTest>
#include <bigint.h>
#include <limits>
#include <random>
// add necessary includes here