Change dependency management

This commit is contained in:
2020-11-22 11:12:13 +01:00
parent 02232b17ef
commit aec792fc65
16 changed files with 91 additions and 43 deletions

View File

@@ -9,6 +9,8 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunknown-pragmas")
endif()
add_subdirectory(3rdParty)
#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/bin/release")
@@ -22,6 +24,7 @@ file(GLOB_RECURSE sources CONFIGURE_DEPENDS "openVulkanoCpp/*.cpp")
target_sources(openVulkanoCpp PRIVATE ${sources})
target_include_directories(openVulkanoCpp PUBLIC openVulkanoCpp)
#Setup Vulkan
find_package(Vulkan REQUIRED)
set(Vulkan_LIBRARIES Vulkan::Vulkan)
@@ -41,34 +44,14 @@ endif()
set_property(TARGET openVulkanoCpp PROPERTY CXX_STANDARD 17)
target_compile_options(openVulkanoCpp PRIVATE -Wall)
# glfw
if (NOT ANDROID)
add_subdirectory(external/glfw EXCLUDE_FROM_ALL)
add_dependencies(openVulkanoCpp glfw)
target_include_directories(openVulkanoCpp PUBLIC external/glfw/include/GLFW)
if (NOT ANDROID AND NOT IOS)
target_link_libraries(openVulkanoCpp PRIVATE glfw)
endif()
# glm
include_directories(external/glm)
target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp spdlog glm assimp)
add_compile_definitions(GLM_FORCE_INTRINSICS)
# fmt
#add_subdirectory(external/fmt EXCLUDE_FROM_ALL)
#target_link_libraries(openVulkanoCpp PRIVATE fmt)
# spdlog
include_directories(external/spdlog/include)
#add_definitions(-SPDLOG_FMT_EXTERNAL)
# assimp
include_directories(external/assimp)
IF(WIN32)
find_library(ASSIMP_LIBRARIES NAMES assimp libassimp.dll.a PATHS ${CMAKE_SOURCE_DIR}/libs/assimp)
ELSE(WIN32)
find_package(assimp REQUIRED)
ENDIF(WIN32)
# copy shaders
file(GLOB SHADERS "openVulkanoCpp/Shader/*.spv")
file(COPY ${SHADERS} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Shader/)