Рефакторинг 2

This commit is contained in:
2020-04-22 10:17:37 +03:00
parent 44817a8a94
commit 4e2cff180c
21 changed files with 665 additions and 535 deletions

View File

@ -13,6 +13,14 @@ else()
endif()
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/find)
if(NOT DEFINED MYXLIB_MASTER_PROJECT)
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
set(MYXLIB_MASTER_PROJECT ON)
else()
set(MYXLIB_MASTER_PROJECT OFF)
endif()
endif()
include(CMLibCommon)
option(MYXLIB_HEADER_ONLY "Build header only version of library" ON)
@ -31,18 +39,13 @@ find_package(
COMPONENTS
Core
Network
Gui
Widgets
DBus
Concurrent
Sql
REQUIRED)
# Автоматически генерируемый заголовочный файл
cmlib_config_hpp_generate()
# cmlib_config_hpp_generate()
configure_file(${CMAKE_SOURCE_DIR}/src/myx/base/config_flags.hpp.in
${CMAKE_BINARY_DIR}/include/myx/base/config_flags.hpp)
# configure_file(${CMAKE_SOURCE_DIR}/src/myx/base/config_flags.hpp.in
# ${CMAKE_BINARY_DIR}/include/myx/base/config_flags.hpp)
# Подключение внешних проектов
include(ExternalProject)