-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
third_party dependencies #523
Merged
Merged
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
66c0ad0
use system gtest if possible
pca006132 4579ede
optional tracy support
pca006132 a80c57c
fix meshid not found situation
pca006132 a7b9a05
try fix CI
pca006132 f859d41
fix ubuntu build
pca006132 4577775
disable windows tbb build first
pca006132 51155bc
update tbb config
pca006132 c9dda15
format
pca006132 00e403b
fix cmake BUILD_SHARED_LIBS
pca006132 58ec421
revert public.h changes
pca006132 cc25dbf
remove version requirement for gtest
pca006132 95374d9
update tracy instructions
pca006132 4a4e81d
Merge branch 'master' into googletest
pca006132 c749750
fix js build
pca006132 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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 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 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 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 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 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 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 |
---|---|---|
|
@@ -15,7 +15,7 @@ | |
project(utilities) | ||
|
||
file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp) | ||
add_library(${PROJECT_NAME} OBJECT ${SOURCE_FILES}) | ||
add_library(${PROJECT_NAME} ${SOURCE_FILES}) | ||
|
||
message("CUDA Support: ${MANIFOLD_USE_CUDA}") | ||
message("Parallel Backend: ${MANIFOLD_PAR}") | ||
|
@@ -29,11 +29,32 @@ if(MANIFOLD_PAR STREQUAL "OMP") | |
target_compile_options(${PROJECT_NAME} PUBLIC -DMANIFOLD_PAR='O' -fopenmp) | ||
target_link_options(${PROJECT_NAME} PUBLIC -fopenmp) | ||
elseif(MANIFOLD_PAR STREQUAL "TBB") | ||
find_package(PkgConfig REQUIRED) | ||
pkg_check_modules(TBB REQUIRED tbb) | ||
target_include_directories(${PROJECT_NAME} PUBLIC ${TBB_INCLUDE_DIRS}) | ||
find_package(PkgConfig) | ||
if (PKG_CONFIG_FOUND) | ||
pkg_check_modules(TBB tbb) | ||
endif() | ||
if(NOT TBB_FOUND) | ||
message(STATUS "tbb not found, downloading from source") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💯 |
||
include(FetchContent) | ||
set(TBB_TEST OFF CACHE INTERNAL "" FORCE) | ||
set(TBB_STRICT OFF CACHE INTERNAL "" FORCE) | ||
FetchContent_Declare(TBB | ||
GIT_REPOSITORY https://github.com/oneapi-src/oneTBB.git | ||
# versions afterward forces -D_FORTIFY_SOURCE=2 | ||
# which conflicts with defaults with nixos... | ||
GIT_TAG v2021.10.0 | ||
GIT_SHALLOW TRUE | ||
GIT_PROGRESS TRUE | ||
) | ||
FetchContent_MakeAvailable(TBB) | ||
endif() | ||
target_compile_options(${PROJECT_NAME} PUBLIC -DMANIFOLD_PAR='T') | ||
target_link_libraries(${PROJECT_NAME} PUBLIC ${TBB_LINK_LIBRARIES}) | ||
if(TARGET TBB::tbb) | ||
target_link_libraries(${PROJECT_NAME} PUBLIC TBB::tbb) | ||
else() | ||
target_include_directories(${PROJECT_NAME} PUBLIC ${TBB_INCLUDE_DIRS}) | ||
target_link_libraries(${PROJECT_NAME} PUBLIC ${TBB_LINK_LIBRARIES}) | ||
endif() | ||
elseif(MANIFOLD_PAR STREQUAL "NONE") | ||
set(MANIFOLD_PAR "CPP") | ||
else() | ||
|
@@ -63,4 +84,4 @@ if(MANIFOLD_DEBUG) | |
PUBLIC -DMANIFOLD_DEBUG) | ||
endif() | ||
|
||
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17) | ||
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17) |
This file contains 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
Oops, something went wrong.
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.
Is there a case where this is expected, or should this be an assert?
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.
I am not entirely sure, it seems that the our python test cases would somehow trigger this.
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.
That seems worth investigating. I think it implies we have marked some faces as coming from an ID for which there is no transform. Those things should be 1:1. We definitely don't have much testing of this in the Python bindings, so we could have a bug there.
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.
indeed, I think I saw this happening previously as well
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.
maybe we can make an issue for this and merge this first?
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.
Sounds good.