Update path searching
Some checks failed
Build OpenVulkano / Build desktop (mac_arm) (push) Has been cancelled
Build OpenVulkano / Build desktop (ubuntu-act_cpp-24.04) (push) Has been cancelled
Build OpenVulkano / Build desktop (windows_x64) (push) Has been cancelled
Build OpenVulkano / Build iOS (push) Has been cancelled
Some checks failed
Build OpenVulkano / Build desktop (mac_arm) (push) Has been cancelled
Build OpenVulkano / Build desktop (ubuntu-act_cpp-24.04) (push) Has been cancelled
Build OpenVulkano / Build desktop (windows_x64) (push) Has been cancelled
Build OpenVulkano / Build iOS (push) Has been cancelled
This commit is contained in:
@@ -8,6 +8,10 @@ if ("${PLATFORM}" STREQUAL "OS64" OR "${PLATFORM}" STREQUAL "OS64COMBINED")
|
||||
set(ENABLE_ARC OFF)
|
||||
set(DEPLOYMENT_TARGET "14.0")
|
||||
set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchain/ios.toolchain.cmake")
|
||||
|
||||
if(NOT DEFINED CMAKE_IGNORE_PREFIX_PATH OR CMAKE_IGNORE_PREFIX_PATH STREQUAL "")
|
||||
set(CMAKE_IGNORE_PREFIX_PATH "/opt/homebrew") # CACHE STRING "Prefixes to ignore during find_* calls" FORCE
|
||||
endif()
|
||||
endif ()
|
||||
|
||||
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
|
||||
|
||||
@@ -6,8 +6,9 @@ if(NOT COMMAND _original_find_program)
|
||||
|
||||
# Now override find_program
|
||||
function(find_program)
|
||||
set(_saved_CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH ${CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH})
|
||||
message("running find_program with CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=ON, CMAKE_FIND_USE_CMAKE_SYSTEM_PATH=ON")
|
||||
set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH ON)
|
||||
set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH ON)
|
||||
|
||||
cmake_parse_arguments(PARSE_ARGV 0 FWD "" "" "")
|
||||
set(quotedArgs "")
|
||||
@@ -15,7 +16,5 @@ if(NOT COMMAND _original_find_program)
|
||||
string(APPEND quotedArgs " [===[${arg}]===]")
|
||||
endforeach()
|
||||
cmake_language(EVAL CODE "_find_program(${quotedArgs})")
|
||||
|
||||
set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH ${_saved_CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH})
|
||||
endfunction()
|
||||
endif()
|
||||
Reference in New Issue
Block a user