Skip to content
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

Overhaul C/CPP cmake configuration #14

Merged
merged 19 commits into from
Oct 30, 2020

Conversation

jrhemstad
Copy link
Contributor

@jrhemstad jrhemstad commented Oct 14, 2020

  • Add a CMakeLists.txt to the c/ directoyr and create a nvtx3-c target for the NVTX C library
  • Encapsulate the libdl dependency as a property of the nvtx3-c target
  • Create a nvtx3-cpp target for the NVTX C++ library that depends on the nvtx3-c target
  • Use CPM for Gbench/Gtest
  • Clean up tests/benchmarks to depend on the nvtx3-cpp target
  • Added the c/ directory as a symlink to cpp/nvtx-c to make it cleaner to depend on the nvtx-c cmake target
  • Update to require C++14.

cpp/cmake/CPM.cmake Outdated Show resolved Hide resolved
cpp/CMakeLists.txt Outdated Show resolved Hide resolved
@jcohen-nvidia
Copy link
Collaborator

Looks good to me Jake. Feel free to merge unless you have some clever ideas for my comment above about preferring C++14 over C++11 if there's no explicit requirement for C++11.

@jcohen-nvidia
Copy link
Collaborator

OK, reviewed the new changes for requiring C++14. This looks good to merge.

@jrhemstad
Copy link
Contributor Author

OK, reviewed the new changes for requiring C++14. This looks good to merge.

Great. Can you merge it? I don't have permissions to merge to the repo.

cpp/cmake/CPM.cmake Outdated Show resolved Hide resolved
cpp/CMakeLists.txt Outdated Show resolved Hide resolved
cpp/benchmarks/CMakeLists.txt Outdated Show resolved Hide resolved
cpp/tests/CMakeLists.txt Outdated Show resolved Hide resolved
@jcohen-nvidia
Copy link
Collaborator

Is the git hash stuff ok now? If so I can merge this.

@kkraus14
Copy link

Is the git hash stuff ok now? If so I can merge this.

LGTM now, thanks!

@jcohen-nvidia jcohen-nvidia merged commit 266f0e1 into NVIDIA:dev Oct 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants