diff --git a/MNN b/MNN index e6995a57..3dd9ac0f 160000 --- a/MNN +++ b/MNN @@ -1 +1 @@ -Subproject commit e6995a571287926150cbf29c3f0a926cbbe89be8 +Subproject commit 3dd9ac0f8f65617c28c78f28c33108bdf62ac3cb diff --git a/Vulkan-Headers b/Vulkan-Headers index 65ad768d..9dff1f57 160000 --- a/Vulkan-Headers +++ b/Vulkan-Headers @@ -1 +1 @@ -Subproject commit 65ad768d8603671fc1085fe115019e72a595ced8 +Subproject commit 9dff1f571ce25b92639854b89b28539602b6b97b diff --git a/Vulkan-Loader b/Vulkan-Loader index 22407d78..2534c1e2 160000 --- a/Vulkan-Loader +++ b/Vulkan-Loader @@ -1 +1 @@ -Subproject commit 22407d7804f111fbc0e31fa0db592d658e19ae8b +Subproject commit 2534c1e2327990e55f51b8a1f8328085e8e3ff31 diff --git a/build/CommonTargets.CMake b/build/CommonTargets.CMake index f27f0eb1..ad97861a 100644 --- a/build/CommonTargets.CMake +++ b/build/CommonTargets.CMake @@ -344,7 +344,15 @@ set(_FINDPACKAGE_libp2p_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/libp2p/lib/cmake set(_FINDPACKAGE_libp2p_LIBRARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/libp2p/lib") set(_FINDPACKAGE_LIBP2P_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/libp2p/include") -if(NOT ANDROID AND NOT IOS) +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(IS_APPLE_PLATFORM ON) + if(IOS) + set(IS_IOS_PLATFORM ON) + else() + set(IS_MACOS_PLATFORM ON) + endif() +endif() +if(NOT ANDROID AND NOT IS_APPLE_PLATFORM) # Vulkan-Headers ExternalProject_Add( Vulkan-Headers @@ -375,14 +383,12 @@ if(NOT ANDROID AND NOT IOS) set(ENV{VULKAN_SDK} "${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader") set(vulkanTarget Vulkan-Loader) endif() +message(WARNING "MNN EXTRA ${_MNN_EXTRA_PARAM}") -# MNN ExternalProject_Add(MNN PREFIX MNN SOURCE_DIR "${THIRDPARTY_DIR}/MNN" - CMAKE_GENERATOR ${CMAKE_GENERATOR} - CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env VULKAN_SDK=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader - ${CMAKE_COMMAND} + CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= -DMNN_BUILD_SHARED_LIBS:BOOL=OFF -DMNN_BUILD_TESTS:BOOL=OFF @@ -392,11 +398,30 @@ ExternalProject_Add(MNN -DMNN_WIN_RUNTIME_MT:BOOL=ON ${_CMAKE_COMMON_CACHE_ARGS} ${_MNN_EXTRA_PARAM} - BUILD_COMMAND ${CMAKE_COMMAND} --build . - INSTALL_COMMAND ${CMAKE_COMMAND} --install . DEPENDS ${_MNN_DEPENDS} ${vulkanTarget} ) +# MNN +# ExternalProject_Add(MNN +# PREFIX MNN +# SOURCE_DIR "${THIRDPARTY_DIR}/MNN" +# CMAKE_GENERATOR ${CMAKE_GENERATOR} +# CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env VULKAN_SDK=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader +# ${CMAKE_COMMAND} +# -DCMAKE_INSTALL_PREFIX:PATH= +# -DMNN_BUILD_SHARED_LIBS:BOOL=OFF +# -DMNN_BUILD_TESTS:BOOL=OFF +# -DMNN_BUILD_TOOLS:BOOL=OFF +# -DMNN_BUILD_PROTOBUFFER:BOOL=OFF +# -DMNN_VULKAN:BOOL=ON +# -DMNN_WIN_RUNTIME_MT:BOOL=ON +# ${_CMAKE_COMMON_CACHE_ARGS} +# ${_MNN_EXTRA_PARAM} +# BUILD_COMMAND ${CMAKE_COMMAND} --build . +# INSTALL_COMMAND ${CMAKE_COMMAND} --install . +# DEPENDS ${_MNN_DEPENDS} ${vulkanTarget} +# ) + set(_FINDPACKAGE_MNN_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/MNN/lib/cmake/MNN") set(_FINDPACKAGE_MNN_LIBRARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/MNN/lib") set(_FINDPACKAGE_MNN_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/MNN/include") diff --git a/build/Linux/CMakeLists.txt b/build/Linux/CMakeLists.txt index 583d8699..c64d1345 100644 --- a/build/Linux/CMakeLists.txt +++ b/build/Linux/CMakeLists.txt @@ -57,6 +57,8 @@ set(_ED25519_RANDOM dev_urandom) set(_MNN_EXTRA_PARAM -DMNN_USE_SYSTEM_LIB:BOOL=ON -DMNN_SEP_BUILD:BOOL=OFF + -DVulkan_INCLUDE_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader/include + -DVulkan_LIBRARY:PATH=${CMAKE_CURRENT_BINARY_DIR}/Vulkan-Loader/lib/libvulkan.so ) diff --git a/libp2p b/libp2p index 9da6a89f..66d55f92 160000 --- a/libp2p +++ b/libp2p @@ -1 +1 @@ -Subproject commit 9da6a89f7a596a047c695fb8f42f5d37812a4726 +Subproject commit 66d55f920a92f7e3148778a7ed2aa407d07e39d2