use cmake-checks clone project with fix
This commit is contained in:
2
.gitmodules
vendored
2
.gitmodules
vendored
@@ -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
|
||||||
|
|||||||
@@ -4,12 +4,6 @@ if (EXISTS "${CMAKE_CURRENT_BINARY_DIR}/cmake_checks_cache.txt")
|
|||||||
FILE(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/cmake_checks_cache.txt")
|
FILE(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/cmake_checks_cache.txt")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT ONCE)
|
|
||||||
set(PATCH_CMD git apply --ignore-space-change --ignore-whitespace ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake-checks-cache-patch.patch)
|
|
||||||
execute_process(COMMAND ${PATCH_CMD} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake-checks-cache")
|
|
||||||
set(ONCE ON CACHE INTERNAL "")
|
|
||||||
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")
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
CMakeChecksCache/CheckTypeSize.cmake | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeChecksCache/CheckTypeSize.cmake b/CMakeChecksCache/CheckTypeSize.cmake
|
|
||||||
index ee56b64..49bf66a 100644
|
|
||||||
--- a/CMakeChecksCache/CheckTypeSize.cmake
|
|
||||||
+++ b/CMakeChecksCache/CheckTypeSize.cmake
|
|
||||||
@@ -20,12 +20,11 @@
|
|
||||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
# SOFTWARE.
|
|
||||||
|
|
||||||
+include(${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
|
|
||||||
include_guard(GLOBAL)
|
|
||||||
-
|
|
||||||
cmake_minimum_required(VERSION 3.11)
|
|
||||||
|
|
||||||
include(DumpCMakeVariables)
|
|
||||||
-include(${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
|
|
||||||
|
|
||||||
macro(check_type_size type variable)
|
|
||||||
_check_type_size(${type} ${variable})
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user