Merge branch 'master' of gitlab.2:f1x1t/myxlib

This commit is contained in:
2019-10-19 06:47:55 +03:00
28 changed files with 302 additions and 66 deletions

View File

@ -35,21 +35,24 @@ pkg_check_modules(SPDLOG spdlog>=1.3.1)
# Автоматически генерируемый заголовочный файл
cmlib_config_hpp_generate()
configure_file(${CMAKE_SOURCE_DIR}/src/base/config_flags.hpp.in
configure_file(${CMAKE_SOURCE_DIR}/src/myx/base/config_flags.hpp.in
${CMAKE_BINARY_DIR}/include/config_flags.hpp)
# Подключение внешних проектов
include(ExternalProject)
# Библиотеки
add_subdirectory(src/base)
add_subdirectory(src/filesystem)
add_subdirectory(src/log)
add_subdirectory(src/myx/base)
add_subdirectory(src/myx/filesystem)
add_subdirectory(src/myx/log)
add_subdirectory(src/myx/qt)
add_subdirectory(doc)
# Примеры
if (BUILD_EXAMPLES)
add_subdirectory(examples/filesystem)
add_subdirectory(examples/log)
add_subdirectory(examples/qt)
endif()
add_subdirectory(doc)