-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Feature/add cmake support #161
base: master
Are you sure you want to change the base?
Conversation
First commit with CMakeLists.txt and tests CMakeLists.txt enabled
added tests to tests/CMakeLists.txt libtbb, benchmark, unittests and fuzztests
Adapt makefiles, cpp to match new include/concurrentqueue include path
typo in CMake file
change includes install of the headers and also generate .cmake to be used by other cmake projects. |
) | ||
target_link_libraries(concurrentqueue INTERFACE Threads::Threads rt) | ||
|
||
include(CMakePackageConfigHelpers) |
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.
line 21 to end of file is all about install and generate of .cmake for header only lib
@@ -31,15 +31,15 @@ benchmarks: bin/benchmarks$(EXT) | |||
|
|||
bin/unittests$(EXT): ../concurrentqueue.h ../blockingconcurrentqueue.h ../tests/unittests/unittests.cpp ../tests/unittests/mallocmacro.cpp ../tests/common/simplethread.h ../tests/common/simplethread.cpp ../tests/common/systemtime.h ../tests/common/systemtime.cpp ../tests/corealgos.h ../tests/unittests/minitest.h makefile | |||
test -d bin || mkdir bin | |||
g++ -std=c++11 -Wall -pedantic-errors -Wpedantic -Wconversion $(OPTS) -fno-elide-constructors ../tests/common/simplethread.cpp ../tests/common/systemtime.cpp ../tests/unittests/unittests.cpp -o bin/unittests$(EXT) $(LD_OPTS) |
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.
TODO - need to test gnu make with the new includes
@@ -29,7 +29,7 @@ | |||
#include <windows.h> | |||
#endif | |||
|
|||
#include "../../concurrentqueue.h" |
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.
these changes required to conform to the / syntax of other std libraries released for public and installed under //...
If you want to add cmake support for Linux that's fine, but:
|
Hi Thanks for your feedback I can move the cmake to the build dir. It's going to be a bit less conforming to how other cmake prjs behave but that's minor I think. |
I understand the layout is non-standard, but the intention was for it to be a header-only library in order to avoid mucking with build systems :-) That's why the two headers are in the root. Everything else is just gravy. But I appreciate the pull request, sorry for being a bit abrupt earlier. I'm just picky. |
no need to be sorry and all. This is the whole point of PR and feedback and
I totally understand.
I'm also picky ;)
I was just explaining the motivation behind the changes and I appreciate
your fast response.
take care
…On Wed, Jul 24, 2019 at 6:06 PM Cameron ***@***.***> wrote:
I understand the layout is non-standard, but the intention was for it to
be a header-only library in order to avoid mucking with build systems :-)
That's why the two headers are in the root. Everything else is just gravy.
But I appreciate the pull request, sorry for being a bit abrupt earlier.
I'm just picky.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#161?email_source=notifications&email_token=AAVGY26APIDLMPGDIG7HPJ3QBD377A5CNFSM4IGR7GCKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2YA27I#issuecomment-514854269>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAVGY2YDC47Y7ASPH7TGQ5TQBD377ANCNFSM4IGR7GCA>
.
|
Added cmake support.
Did not touch xcode/msvc since I dont have access to this.
gnu makefile - modified but did not try it out (will give it a shot - it should be good)
@mikeroe please review as well.