Commit c3991cd8 authored by Florian Oetke's avatar Florian Oetke
Browse files

Merge branch 'develop' of...

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/dependencies/cpp/mirrage into develop
parents 7613b589 2f044e7f
Pipeline #2658 passed with stage
in 9 minutes and 56 seconds
......@@ -40,6 +40,7 @@ variables:
- cd build
- cmake -E remove_directory src
- cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=../../mirrage -DCMAKE_BUILD_TYPE=Release -DMIRRAGE_EXPORT_EXECUTABLE=ON ..
- cmake --build .
- cmake --build . --target src/install
- cmake --build . --target test
<<: *linux-cache-spec
......@@ -81,6 +82,7 @@ build-mingw:
- cd build
- cmake -E remove_directory src
- cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=../../mirrage -DCMAKE_BUILD_TYPE=Release -DMIRRAGE_ENABLE_COTIRE=OFF -DMIRRAGE_EXPORT_EXECUTABLE=ON ..
- cmake --build .
- cmake --build . --target src/install
- cmake --build . --target test
variables:
......
......@@ -25,6 +25,6 @@ endif()
add_subdirectory(dependencies)
add_subdirectory(src)
if(MSVC_IDE)
if(MSVC_IDE AND MIRRAGE_BUILD_DEMO)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT demo)
endif()
......@@ -13,7 +13,9 @@ include(gsl_interface.cmake)
include(moodycamel_interface.cmake)
include(imgui_interface.cmake)
include(magic_get_interface.cmake)
if(NOT TARGET boost::pfr)
include(magic_get_interface.cmake)
endif()
SET(PHYSFS_ARCHIVE_7Z FALSE CACHE BOOL "" FORCE)
SET(PHYSFS_BUILD_SHARED FALSE CACHE BOOL "" FORCE)
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
project(magic_get)
include_guard()
add_library(magic_get INTERFACE)
add_library(boost::magic_get ALIAS magic_get)
target_include_directories(magic_get INTERFACE
add_library(pfr INTERFACE)
add_library(boost::pfr ALIAS pfr)
target_include_directories(pfr INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/magic_get/include>
$<INSTALL_INTERFACE:include>)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
# GCC broke their structured binding implementation in 7.2.0.
# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81888
# TODO: Remove when fixed.
target_compile_options(magic_get INTERFACE -DBOOST_PFR_USE_CPP17=0)
endif()
install(TARGETS magic_get EXPORT magic_get_targets INCLUDES DESTINATION include)
install(TARGETS pfr EXPORT magic_get_targets INCLUDES DESTINATION include)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/magic_get/include/
DESTINATION include
......
......@@ -35,7 +35,7 @@ target_link_libraries(mirrage_net
glm::glm
mirrage::error
enet
boost::magic_get
boost::pfr
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment