some fixes to help build in nested project
This commit is contained in:
parent
ceb6df6eca
commit
e7f1d48db6
@ -9,6 +9,9 @@ option(BUILD_STATIC "Builds library as static library" ON)
|
|||||||
option(BUILD_TESTS "Builds tests" ON)
|
option(BUILD_TESTS "Builds tests" ON)
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
|
set(CMAKE_AUTOMOC ON)
|
||||||
|
set(CMAKE_AUTOUIC ON)
|
||||||
|
set(CMAKE_AUTORCC ON)
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
|
||||||
@ -68,7 +71,8 @@ endif ()
|
|||||||
|
|
||||||
set_target_properties(storage PROPERTIES PUBLIC_HEADER "${HEADERS}")
|
set_target_properties(storage PROPERTIES PUBLIC_HEADER "${HEADERS}")
|
||||||
|
|
||||||
target_include_directories(storage PRIVATE ${CMAKE_SOURCE_DIR})
|
target_include_directories(storage PUBLIC ${CMAKE_SOURCE_DIR})
|
||||||
|
target_include_directories(storage PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
target_include_directories(storage PRIVATE ${Qt${QT_VERSION_MAJOR}_INCLUDE_DIRS})
|
target_include_directories(storage PRIVATE ${Qt${QT_VERSION_MAJOR}_INCLUDE_DIRS})
|
||||||
target_include_directories(storage PRIVATE ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS})
|
target_include_directories(storage PRIVATE ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <optional>
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
|
@ -19,6 +19,8 @@
|
|||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <optional>
|
||||||
|
|
||||||
#include "database.h"
|
#include "database.h"
|
||||||
|
|
||||||
class DataBase::Exception : public std::exception
|
class DataBase::Exception : public std::exception
|
||||||
|
@ -17,6 +17,8 @@
|
|||||||
#ifndef CORE_DATABASE_SERIALIZER_H
|
#ifndef CORE_DATABASE_SERIALIZER_H
|
||||||
#define CORE_DATABASE_SERIALIZER_H
|
#define CORE_DATABASE_SERIALIZER_H
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QBuffer>
|
#include <QBuffer>
|
||||||
#include <QDataStream>
|
#include <QDataStream>
|
||||||
|
Loading…
Reference in New Issue
Block a user