GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix CheckTypeSize is being called from multiple projects' (#153) from misc into master

Browse Source 
Reviewed-on: https://git.madvoxel.net/OpenVulkano/OpenVulkano/pulls/153
Reviewed-by: Georg Hagen <georg.hagen@madvoxel.com>
This commit is contained in:
Oleksii_Hyzha
2024-11-01 12:57:18 +01:00
parent b3f131080a 822182d468
commit d214966eff
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -3,4 +3,4 @@
url = git@git.madvoxel.net:OpenVulkano/OpenVulkano.wiki.git url = git@git.madvoxel.net:OpenVulkano/OpenVulkano.wiki.git
[submodule "cmake/cmake-checks-cache"] [submodule "cmake/cmake-checks-cache"]
path = cmake/cmake-checks-cache path = cmake/cmake-checks-cache
url = https://github.com/cristianadam/cmake-checks-cache.git url = https://git.madvoxel.net/Mirrors/cmake-checks-cache

2
3rdParty/assimp/CMakeLists.txt vendored
View File

@@ -7,7 +7,7 @@ if (NOT IOS)
endif () endif ()
if (assimp_FOUND OR ASSIMP_FOUND) if (assimp_FOUND OR ASSIMP_FOUND)
message("Using system assimp") message("Using system assimp")
elseif (ENABLE_ASSIMP) elseif (ENABLE_ASSIMP AND NOT assimp_BUILT)
message("Building assimp from sources") message("Building assimp from sources")
if(NOT DEFINED ASSIMP_REPO) if(NOT DEFINED ASSIMP_REPO)
set(ASSIMP_REPO https://github.com/assimp/assimp.git) set(ASSIMP_REPO https://github.com/assimp/assimp.git)

4
CMakeLists.txt
View File

@@ -1,5 +1,9 @@
cmake_minimum_required(VERSION 3.28 FATAL_ERROR) cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
if (EXISTS "${CMAKE_CURRENT_BINARY_DIR}/cmake_checks_cache.txt")
FILE(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/cmake_checks_cache.txt")
endif()
if ("${PLATFORM}" STREQUAL "OS64" OR "${PLATFORM}" STREQUAL "OS64COMBINED") if ("${PLATFORM}" STREQUAL "OS64" OR "${PLATFORM}" STREQUAL "OS64COMBINED")
set(ENABLE_ARC OFF) set(ENABLE_ARC OFF)
set(DEPLOYMENT_TARGET "14.0") set(DEPLOYMENT_TARGET "14.0")

2
cmake/cmake-checks-cache

Submodule cmake/cmake-checks-cache updated: fa345a9dbd...c7f0636026