diff --git a/.gitmodules b/.gitmodules index 2656049..7047ef8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = git@git.madvoxel.net:OpenVulkano/OpenVulkano.wiki.git [submodule "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 diff --git a/3rdParty/assimp/CMakeLists.txt b/3rdParty/assimp/CMakeLists.txt index 782c75b..bad2bad 100644 --- a/3rdParty/assimp/CMakeLists.txt +++ b/3rdParty/assimp/CMakeLists.txt @@ -7,7 +7,7 @@ if (NOT IOS) endif () if (assimp_FOUND OR ASSIMP_FOUND) message("Using system assimp") -elseif (ENABLE_ASSIMP) +elseif (ENABLE_ASSIMP AND NOT assimp_BUILT) message("Building assimp from sources") if(NOT DEFINED ASSIMP_REPO) set(ASSIMP_REPO https://github.com/assimp/assimp.git) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a82edd..ef70745 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ 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") set(ENABLE_ARC OFF) set(DEPLOYMENT_TARGET "14.0") diff --git a/cmake/cmake-checks-cache b/cmake/cmake-checks-cache index fa345a9..c7f0636 160000 --- a/cmake/cmake-checks-cache +++ b/cmake/cmake-checks-cache @@ -1 +1 @@ -Subproject commit fa345a9dbdf7dc4a6b27d6b6e5113ab38d0b9db9 +Subproject commit c7f06360268dbaa047bf4beaaf967e18b1022789