fix: build for any kind of arm combination #657
Merged
Conversation
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
|
|
ayounes-nviso
force-pushed
the
cmake
branch
2 times, most recently
from
996aadf
to
08b30f9
Compare
|
Hello, |
nihui
requested changes
Nov 16, 2018
nihui
requested changes
Nov 17, 2018
| @@ -155,6 +149,11 @@ ncnn_add_layer(PSROIPooling) | |||
|
|
|||
| add_library(ncnn STATIC ${ncnn_SRCS}) | |||
|
|
|||
| find_package(OpenMP) | |||
| if(OpenMP_CXX_FOUND) | |||
| target_link_libraries(ncnn PUBLIC OpenMP::OpenMP_CXX) | |||
There was a problem hiding this comment.
only a static library is generated for the ncnn target
linking openmp library is required when building shared library/module or executable, but makes nonsense here
* Those changes allows to use src/CMakeLists.txt directly within a project that has its own toolchain and options. * factorize arm and x86 cmake code, * allow unix and android build for any kind of arm combination * Introduce NCNN_CMAKE_VERBOSE option to reduce cmake verbosity * use modern cmake for OpenMP detection and usage
|
Thanks for your contribution ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
within a project that has its own toolchain.