Commit 7b7f5d8b authored by Florian Oetke's avatar Florian Oetke
Browse files

switched to target_compile_features

parent 1890ed91
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
project(mirrage LANGUAGES C CXX)
......
......@@ -7,6 +7,7 @@
Mirrage (Mirrage Indirect Radiance Renderer And Game Engine) is a Vulkan based deferred renderer with bits and pieces of a simple game engine, that has been developed as part of my CS Bachelor thesis about screen-space global illumination. As such it is (at least in its current state) mostly just a fancy renderer with a simple demo application and just enough engine stuff (ECS, input, ui, glue-code) to keep that running. But in the future I will hopefully get it to an actually usefull state and use it as a basis for my future projects.
The repository at <a href="https://github.com/lowkey42/mirrage">is a readonly mirror</a> and the main repository is located on <a href="https://gitlab.com/lowkey42/mirrage">Gitlab.com</a>.
### Demo
<a href="http://www.youtube.com/watch?feature=player_embedded&v=gHHLuwjDiZo" target="_blank"><img src="screenshots/video_thumbnail2.jpeg" alt="Demo Video" height="180" border="10" /></a>
......@@ -20,7 +21,7 @@ Mirrage (Mirrage Indirect Radiance Renderer And Game Engine) is a Vulkan based d
### Dependencies
Required:
- CMake >= 3.8
- CMake >= 3.9
- SDL2 >= 2.0.8
- Vulkan + Vulkan-HPP >= 1.1.80
- GLSLC
......@@ -43,7 +44,7 @@ Included in this repository:
### Build from Source
- git clone https://github.com/lowkey42/mirrage.git
- git clone https://gitlab.com/lowkey42/mirrage.git
- mkdir mirrage_build
- cd mirrage_build
- cmake ../mirrage
......
Subproject commit 0b0ea10eaad60ee280f9f8fbd745a42fda37ee67
Subproject commit ce88a28e3d5b2bb923bdcbbb2cc2f3f03abee7c7
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_demo LANGUAGES CXX ASM)
......@@ -17,6 +17,7 @@ add_executable(demo ${HEADER_FILES}
${BACKWARD_ENABLE}
)
add_backward(demo)
target_compile_features(demo PUBLIC cxx_std_17)
set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS})
target_compile_options(demo PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS})
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_mesh_converter LANGUAGES CXX)
......@@ -18,8 +18,8 @@ add_executable(mesh_converter
skeleton_parser.hpp
${BACKWARD_ENABLE}
)
add_backward(mesh_converter)
target_compile_features(mesh_converter PUBLIC cxx_std_17)
target_link_libraries(mesh_converter
PRIVATE
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_asset)
......@@ -17,6 +17,7 @@ add_library(mirrage_asset STATIC
${HEADER_FILES}
)
add_library(mirrage::asset ALIAS mirrage_asset)
target_compile_features(mirrage_asset PUBLIC cxx_std_17)
set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS})
target_compile_options(mirrage_asset PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS})
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage)
......@@ -24,6 +24,8 @@ add_library(mirrage STATIC
${HEADER_FILES}
)
add_library(mirrage::mirrage ALIAS mirrage)
target_compile_features(mirrage PUBLIC cxx_std_17)
file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/assets_mirrage_core.map" CONTENT
"cfg:input_mapping = settings/input_mapping.json
cfg:graphics = graphics-cfg.json
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_ecs)
......@@ -18,6 +18,7 @@ add_library(mirrage_ecs STATIC
${HEADER_FILES}
)
add_library(mirrage::ecs ALIAS mirrage_ecs)
target_compile_features(mirrage_ecs PUBLIC cxx_std_17)
set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS})
target_compile_options(mirrage_ecs PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS})
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_error)
......@@ -13,6 +13,7 @@ add_library(mirrage_error STATIC
${HEADER_FILES}
)
add_library(mirrage::error ALIAS mirrage_error)
target_compile_features(mirrage_error PUBLIC cxx_std_17)
set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS})
target_compile_options(mirrage_error PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS})
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_graphic)
......@@ -36,6 +36,7 @@ add_library(mirrage_graphic STATIC
${HEADER_FILES}
)
add_library(mirrage::graphic ALIAS mirrage_graphic)
target_compile_features(mirrage_graphic PUBLIC cxx_std_17)
set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS})
target_compile_options(mirrage_graphic PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS})
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_gui)
......@@ -17,6 +17,8 @@ add_library(mirrage_gui STATIC
${HEADER_FILES}
)
add_library(mirrage::gui ALIAS mirrage_gui)
target_compile_features(mirrage_gui PUBLIC cxx_std_17)
file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/assets_mirrage_gui.map" CONTENT
"cfg:gui = settings/gui.json
cfg:console_history = console_history.txt
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_input)
......@@ -20,6 +20,7 @@ add_library(mirrage_input STATIC
${HEADER_FILES}
)
add_library(mirrage::input ALIAS mirrage_input)
target_compile_features(mirrage_input PUBLIC cxx_std_17)
set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS})
target_compile_options(mirrage_input PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS})
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_net)
......@@ -19,6 +19,7 @@ add_library(mirrage_net STATIC
${HEADER_FILES}
)
add_library(mirrage::net ALIAS mirrage_net)
target_compile_features(mirrage_net PUBLIC cxx_std_17)
set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS})
target_compile_options(mirrage_net PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS})
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_renderer)
......@@ -73,6 +73,8 @@ add_library(mirrage_renderer STATIC
${HEADER_FILES}
)
add_library(mirrage::renderer ALIAS mirrage_renderer)
target_compile_features(mirrage_renderer PUBLIC cxx_std_17)
set(EMBEDDED_ASSETS
"${CMAKE_CURRENT_BINARY_DIR}/shader"
"${CMAKE_CURRENT_SOURCE_DIR}/assets/textures"
......
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
project(mirrage_utils)
......@@ -22,6 +22,7 @@ add_library(mirrage_utils STATIC
${HEADER_FILES}
)
add_library(mirrage::utils ALIAS mirrage_utils)
target_compile_features(mirrage_utils PUBLIC cxx_std_17)
set(MIRRAGE_DEFAULT_COMPILER_ARGS ${MIRRAGE_DEFAULT_COMPILER_ARGS})
target_compile_options(mirrage_utils PRIVATE ${MIRRAGE_DEFAULT_COMPILER_ARGS})
......
Supports Markdown
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