Update CMake

This commit is contained in:
Georg Hagen
2024-08-08 19:15:41 +02:00
parent 0da6b17d37
commit 729d1f3e55
2 changed files with 10 additions and 4 deletions

View File

@@ -32,13 +32,20 @@ option(ENABLE_TEST "Enable testing" ON)
option(ENABLE_EXAMPLE "Enable examples" ON)
# -----------------------------------------------------------------
if (IOS)
set(DEPLOYMENT_TARGET "14.0")
set_property(GLOBAL PROPERTY XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET})
set(CMAKE_OSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET})
set(MACOSX_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET})
endif ()
# First generate 3rdParty Libraries
add_subdirectory(3rdParty)
# Then generate the OpenVulkano Library
add_subdirectory(openVulkanoCpp)
if(ENABLE_TEST)
if(ENABLE_TEST AND NOT IOS)
enable_testing()
add_subdirectory(tests)
endif()
@@ -46,6 +53,5 @@ endif()
# Finally generate the tests and examples
if(ENABLE_EXAMPLE)
add_subdirectory(examples)
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT OpenVulkano_Examples)
endif()
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT openVulkanoCpp)

View File

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
include(SetupVulkan)
include(Utils)
file(GLOB_RECURSE SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
file(GLOB_RECURSE SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ExampleApps/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
if (IOS)
file(GLOB_RECURSE SRC_IOS "${CMAKE_CURRENT_SOURCE_DIR}/Host/iOS/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/Host/iOS/*.hpp" "${CMAKE_CURRENT_SOURCE_DIR}/Host/iOS/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Host/iOS/*.m" "${CMAKE_CURRENT_SOURCE_DIR}/Host/iOS/*.mm")
list(APPEND SOURCES ${SRC_IOS})