MacOS #488
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,7 +69,7 @@ | |
| url = https://github.com/Devsh-Graphics-Programming/oneTBB.git | ||
| [submodule "3rdparty/pstl/oneDPL/oneDPL"] | ||
| path = 3rdparty/pstl/oneDPL/oneDPL | ||
| url = git@github.com:Devsh-Graphics-Programming/oneDPL.git | ||
| [submodule "3rdparty/Vulkan-Headers"] | ||
| path = 3rdparty/Vulkan-Headers | ||
| url = [email protected]:KhronosGroup/Vulkan-Headers.git | ||
|
|
@@ -84,3 +84,6 @@ | |
| [submodule "3rdparty/tcpp"] | ||
| path = 3rdparty/tcpp | ||
| url = [email protected]:Erfan-Ahmadi/tcpp.git | ||
| [submodule "3rdparty/boost/standalone/math"] | ||
| path = 3rdparty/boost/standalone/math | ||
| url = [email protected]:boostorg/math.git | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,67 @@ | ||
| get_filename_component(CCBD_ABSOLUTE "${CMAKE_CURRENT_BINARY_DIR}" ABSOLUTE) | ||
|
|
||
| set(_NBL_BUILD_DPL_ ON CACHE BOOL "") | ||
|
|
||
| set(TBB_INSTALL_VARS ON CACHE BOOL "" FORCE) | ||
| set(TBB_TEST OFF CACHE BOOL "" FORCE) | ||
| set(TBB_STRICT ON CACHE BOOL "" FORCE) | ||
| set(PREVIOUS_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) | ||
| set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE) | ||
| set(TBB_SANITIZE "" CACHE STRING "" FORCE) | ||
|
|
||
| add_subdirectory(oneTBB oneTBB EXCLUDE_FROM_ALL) | ||
| target_compile_options(tbb PUBLIC | ||
| -Wno-conversion | ||
| ) | ||
|
|
||
| if(PREVIOUS_BUILD_SHARED_LIBS) | ||
| set(BUILD_SHARED_LIBS ${PREVIOUS_BUILD_SHARED_LIBS} CACHE BOOL "" FORCE) | ||
| else() | ||
| unset(BUILD_SHARED_LIBS CACHE) | ||
| endif() | ||
|
|
||
| set(ONETBB_BUILD ${CCBD_ABSOLUTE}/oneTBB) | ||
| set(ONETBB_INSTALL_DIR ${ONETBB_BUILD}/install CACHE STRING "oneTBB install directory" FORCE) | ||
|
|
||
| add_custom_target(onetbb_build | ||
| COMMAND ${CMAKE_COMMAND} --install ${ONETBB_BUILD} --component devel -v --config $<CONFIG> --prefix ${ONETBB_INSTALL_DIR} | ||
| COMMAND ${CMAKE_COMMAND} --install ${ONETBB_BUILD} --component runtime -v --config $<CONFIG> --prefix ${ONETBB_INSTALL_DIR} | ||
| COMMENT "Building oneTBB..." | ||
| ) | ||
| add_dependencies(onetbb_build tbb tbbmalloc) | ||
|
|
||
| if(NOT (APPLE AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")) | ||
| add_dependencies(onetbb_build tbbmalloc_proxy) | ||
| endif() | ||
|
|
||
| set(ONEDPL_BUILD ${CCBD_ABSOLUTE}/oneDPL/build) | ||
| set(ONEDPL_INSTALL_DIR ${ONEDPL_BUILD}/install CACHE STRING "oneDPL install directory" FORCE) | ||
|
|
||
| set(CMAKE_ARGS_ONEDPL | ||
| -DCMAKE_BUILD_TYPE:STRING=$<CONFIG> | ||
| -DONETBB_INSTALL_DIR:PATH=${ONETBB_INSTALL_DIR} | ||
| ) | ||
|
|
||
| if(ANDROID) | ||
| list(APPEND CMAKE_ARGS_ONEDPL | ||
| -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} | ||
| -DANDROID_ABI:STRING=${ANDROID_ABI} | ||
| -DANDROID_PLATFORM:STRING=${ANDROID_PLATFORM} | ||
| ) | ||
| elseif(APPLE) | ||
| list(APPEND CMAKE_ARGS_ONEDPL | ||
| "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}" | ||
| ) | ||
| endif() | ||
|
|
||
| ExternalProject_Add(oneDPL | ||
| SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/oneDPL | ||
| BINARY_DIR ${ONEDPL_BUILD} | ||
| CMAKE_ARGS ${CMAKE_ARGS_ONEDPL} | ||
| BUILD_COMMAND cmake --build ${ONEDPL_BUILD} --config $<CONFIG> | ||
| INSTALL_COMMAND cmake --install ${ONEDPL_BUILD} --config $<CONFIG> -v --prefix ${ONEDPL_INSTALL_DIR} | ||
| USES_TERMINAL_BUILD 1 | ||
| COMMENT "Building oneDPL..." | ||
| ) | ||
|
|
||
| add_dependencies(oneDPL onetbb_build) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,35 @@ | ||
| cmake_minimum_required(VERSION 3.26) | ||
|
|
||
| set(CMAKE_CXX_STANDARD 20) | ||
| set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
|
|
||
| # assume built-in pthreads on MacOS | ||
| if(APPLE) | ||
| set(CMAKE_THREAD_LIBS_INIT "-lpthread") | ||
| set(CMAKE_HAVE_THREADS_LIBRARY 1) | ||
| set(CMAKE_USE_WIN32_THREADS_INIT 0) | ||
| set(CMAKE_USE_PTHREADS_INIT 1) | ||
| set(THREADS_PREFER_PTHREAD_FLAG ON CACHE BOOL "") | ||
| endif() | ||
|
|
||
| if(ANDROID) | ||
| include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/toolchains/android/build.cmake) | ||
| endif() | ||
|
|
||
| if(NOT DEFINED ONETBB_INSTALL_DIR) | ||
| message(FATAL_ERROR "oneDPL submodule requires valid ONETBB_INSTALL_DIR!") | ||
| endif() | ||
|
|
||
| set(TBB_DIR ${ONETBB_INSTALL_DIR}/lib/cmake/TBB CACHE INTERNAL "" FORCE) | ||
| set(ONEDPL_BACKEND tbb CACHE STRING "" FORCE) | ||
| set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH ON CACHE BOOL "") | ||
| set(ONE_DPL_INSTALL_OVERRIDE "${CMAKE_CURRENT_BINARY_DIR}/output" CACHE STRING "" FORCE) | ||
| find_package(Threads REQUIRED) | ||
|
|
||
| add_subdirectory(oneDPL oneDPL) | ||
|
Comment on lines
+19
to
+29
There was a problem hiding this comment. so you need to compile OneDPL for AppleClang to support parallel execution policies? |
||
|
|
||
| if(ANDROID) | ||
| add_compile_options( | ||
| $<$<CONFIG:DEBUG>:-glldb> | ||
| ) | ||
| endif() | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
both ARM and x86 are little-endian
we're not going to support PowerPC cause its freaking ancient
what dependency even needs this?