Commit b60f24cc authored by Philip Trettner's avatar Philip Trettner

Merge branch 'master' into develop

parents a30c8963 6d9c650a
Pipeline #12105 passed with stage
in 7 minutes and 37 seconds
......@@ -7,3 +7,18 @@
[submodule "extern/glm"]
path = extern/glm
url = https://github.com/g-truc/glm.git
[submodule "extern/glfw"]
path = extern/glfw
url = https://github.com/glfw/glfw.git
[submodule "extern/glow"]
path = extern/glow
url = https://www.graphics.rwth-aachen.de:9000/Glow/glow.git
[submodule "extern/glow-extras"]
path = extern/glow-extras
url = https://www.graphics.rwth-aachen.de:9000/Glow/glow-extras.git
[submodule "extern/imgui-lean"]
path = extern/imgui-lean
url = https://www.graphics.rwth-aachen.de:9000/ptrettner/imgui-lean.git
[submodule "extern/ctracer"]
path = extern/ctracer
url = https://www.graphics.rwth-aachen.de:9000/ptrettner/ctracer.git
......@@ -12,11 +12,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
option(PM_BUILD_TESTS "Build polymesh tests" OFF)
option(PM_FORCE_CPP14 "Build samples and tests with C++14" OFF)
if (PM_FORCE_CPP14)
set(CMAKE_CXX_STANDARD 14)
endif()
# ==============================================================================
# Set bin dir
......@@ -34,6 +29,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${BIN_DIR})
# ===============================================
# Dependencies
# profiling library
add_subdirectory(extern/ctracer)
# glm
add_library(glm INTERFACE)
target_include_directories(glm INTERFACE extern/glm)
......@@ -43,22 +41,38 @@ target_compile_definitions(glm INTERFACE
GLM_FORCE_CTOR_INIT # 0.9.9 breaks a lot otherwise
)
# Add GLFW lib (with disabled spam)
option(GLFW_BUILD_EXAMPLES "" OFF)
option(GLFW_BUILD_TESTS "" OFF)
option(GLFW_BUILD_DOCS "" OFF)
option(GLFW_INSTALL "" OFF)
add_subdirectory(extern/glfw)
# math library
add_subdirectory(extern/typed-geometry)
# mesh library
add_subdirectory(extern/polymesh)
# opengl library
add_subdirectory(extern/glow)
# UI library
add_subdirectory(extern/imgui-lean)
# glow extras
add_subdirectory(extern/glow-extras)
# ===============================================
# Compile flags
if (MSVC)
set(SAMPLE_FLAGS
set(SAMPLE_FLAGS
/MP
)
else()
set(SAMPLE_FLAGS
set(SAMPLE_FLAGS
-Wall
-Wno-unused-variable
)
......@@ -113,6 +127,11 @@ if (PM_BUILD_TESTS)
target_link_libraries(pm-tests PUBLIC
typed-geometry
polymesh
ctracer
glfw
imgui
glow
glow-extras
)
target_include_directories(pm-tests PUBLIC "tests")
......@@ -129,7 +148,7 @@ foreach(TARGET_NAME
polymesh
typed-geometry-src
)
if (TARGET ${TARGET_NAME})
set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "Extern")
if (TARGET ${TARGET_NAME})
set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "Extern")
endif()
endforeach()
Subproject commit 56d33f9b69854c7339e8ddd71fe81095ddd5cc41
Subproject commit 7f02898264d6077738f0e8032f027eb7e252c90e
Subproject commit af31c1cccb3fcdac0ed05517654b122b138de73a
Subproject commit 0b6506e3f67f3ea84ec8e54560ede9abc10051d2
Subproject commit 11db8750f990c6ae1a09fb21f7031d7d177fe4c1
Subproject commit 384f659443ccd40c3bc355d79fd7333d6cf399db
Subproject commit f1ec496eb60b71f4bbc4f53ebb9b646b5c08a63f
Subproject commit d00bebc1b4e0428a22c89c9c73403e29ed687ae7
Subproject commit 650e30988351cf11f15141347c867a223d80f728
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