Redo of render paths

CMakeLists.txt

@@ -1,30 +1,25 @@
 cmake_minimum_required(VERSION 3.15)
 
-set(CMAKE_CXX_STANDARD_REQUIRED 20)
+set(CMAKE_CXX_STANDARD 17)
 
 # Handle superbuild first
 option (USE_SUPERBUILD "Whether or not a superbuild should be invoked" ON)
 
 set(ENGINE_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/src/Engine)
 set(EXTERNAL_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/external)
-set(SLANG_ROOT ${EXTERNAL_ROOT}/slang)
+set(ASSIMP_ROOT ${EXTERNAL_ROOT}/assimp)
 set(BOOST_ROOT ${EXTERNAL_ROOT}/boost)
+set(SLANG_ROOT ${EXTERNAL_ROOT}/slang)
 set(GLM_ROOT ${EXTERNAL_ROOT}/glm)
 set(GLFW_ROOT ${EXTERNAL_ROOT}/glfw)
 set(JSON_ROOT ${EXTERNAL_ROOT}/json)
-set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
-set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
+set(STB_ROOT ${EXTERNAL_ROOT}/stb)
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
 
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_LIB_PREFIX lib)
 
-set(ENKITS_BUILD_EXAMPLES OFF CACHE BOOL "Build basic example applications" )
-set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL  "GLFW lib only" )
-set(GLFW_BUILD_TESTS OFF CACHE BOOL  "GLFW lib only" )
-set(GLFW_BUILD_DOCS OFF CACHE BOOL  "GLFW lib only" )
-set(GLFW_BUILD_INSTALL OFF CACHE BOOL  "GLFW lib only" )
-
 if (USE_SUPERBUILD)
   project (SUPERBUILD NONE)
   # execute the superbuild (this script will be invoked again without the
@@ -35,17 +30,27 @@ else()
   project (Seele)
 endif()
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/Debug)
+#Workaround for vs, because it places artifacts into an additional subfolder
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin/Debug)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin/Release)
+
 find_package(Vulkan REQUIRED)
 find_package(Boost REQUIRED COMPONENTS serialization)
-find_package(Threads)
-include(${JSON_IMPORT})
-include(${GLFW_IMPORT})
+find_package(Threads REQUIRED)
+find_package(assimp REQUIRED ${ASSIMP_ROOT})
+find_package(JSON REQUIRED)
+find_package(GLFW REQUIRED)
 
-include_directories(${GLFW_ROOT}/include)
 include_directories(${GLM_INCLUDE_DIRS})
+include_directories(${STB_INCLUDE_DIRS})
 include_directories(${Vulkan_INCLUDE_DIR})
 include_directories(${Boost_INCLUDE_DIRS})
+include_directories(${GLFW_INCLUDE_DIRS})
 include_directories(${SLANG_INCLUDE_DIRS})
+include_directories(${ASSIMP_INCLUDE_DIRS})
+include_directories(${JSON_INCLUDE_DIRS})
+include_directories(${ENGINE_ROOT})
 include_directories(src/Engine)
 add_definitions(${GLM_DEFINITIONS})
 add_definitions(${Vulkan_DEFINITIONS})
@@ -55,20 +60,44 @@ if(WIN32)
 	add_compile_definitions(USE_EXTENSIONS)
 endif()
 add_executable(SeeleEngine "")
-target_link_libraries(SeeleEngine glfw)
-target_link_libraries(SeeleEngine nlohmann_json::nlohmann_json)
-target_link_libraries(SeeleEngine ${Boost_LIBRARIES})
 target_link_libraries(SeeleEngine ${Vulkan_LIBRARY})
+target_link_libraries(SeeleEngine ${Boost_LIBRARIES})
+target_link_libraries(SeeleEngine ${GLFW_LIBRARIES})
 target_link_libraries(SeeleEngine ${SLANG_LIBRARY})
+target_link_libraries(SeeleEngine ${ASSIMP_LIBRARIES})
+target_link_libraries(SeeleEngine ${JSON_LIBRARY})
+
+target_precompile_headers(SeeleEngine 
+  PRIVATE    
+    <assert.h>
+    <memory>
+    <atomic>
+    <cstring>
+    <iostream>
+    <string>
+    <thread>
+    <functional>
+    <filesystem>
+    <fstream>
+    <mutex>
+    <condition_variable>)
+
 add_subdirectory(src/)
 
 if(MSVC)
-  target_compile_options(SeeleEngine PRIVATE /DEBUG:FASTLINK /Zi /W4)
+  set(_CRT_SECURE_NO_WARNINGS)
+  target_compile_options(SeeleEngine PRIVATE /DEBUG:FASTLINK /Zi)
 else()
   target_compile_options(SeeleEngine PRIVATE -Wall -Wextra -pedantic)
 endif()
 
+add_executable(Seele_unit_tests "")
 add_subdirectory(test/)
 
-add_custom_command(TARGET SeeleEngine POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEPENDENT_BINARIES} $<TARGET_FILE_DIR:SeeleEngine>)
-
+add_custom_target(copy-runtime-files ALL
+	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/res $<TARGET_FILE_DIR:SeeleEngine>
+	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SLANG_ROOT}/${SLANG_BINARY} $<TARGET_FILE_DIR:SeeleEngine>
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SLANG_ROOT}/${SLANG_GLSLANG} $<TARGET_FILE_DIR:SeeleEngine>
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GLFW_BINARY} $<TARGET_FILE_DIR:SeeleEngine>
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ASSIMP_BINARY} $<TARGET_FILE_DIR:SeeleEngine>
+	DEPENDS SeeleEngine)