Remove Tracy from link interface, change it to a submodule, install selected headers to new aligator/third-party include dir#186
Merged
ManifoldFR merged 16 commits intodevelfrom Sep 6, 2024
Conversation
ManifoldFR
changed the title
ManifoldFR
force-pushed
the
topic/tracy-submodule-install-headers
branch
from
0b2ef3a to
b050d33
Compare
ManifoldFR
changed the title
ManifoldFR
changed the title
ManifoldFR
force-pushed
the
topic/tracy-submodule-install-headers
branch
from
a37e897 to
4e1d555
Compare
[gar] change include for boost make_span.hpp (explicitly point to third-party dir)
+ move tracy logic to tracy.cmake + install select Tracy headers in include/aligator/third-party + add cmake var THIRD_PARTY_HEADERS_INSTALL_DIR, add to target interface dirs + [gar/cmake] remove useless include of project_source_dir/include/aligator
[bindings/python/cmake] remove proxsuite-nlp::pyproxsuite-nlp from link interface (it's going to be a MODULE)
jorisv
reviewed
Sep 5, 2024
ManifoldFR
force-pushed
the
topic/tracy-submodule-install-headers
branch
from
4e1d555 to
99f7162
Compare
+ make TRACY_PUBLIC_DIR an absolute path
ManifoldFR
force-pushed
the
topic/tracy-submodule-install-headers
branch
from
03b30d7 to
85a5bef
Compare
ManifoldFR
force-pushed
the
topic/tracy-submodule-install-headers
branch
from
63cb9bc to
ac86cd3
Compare
ManifoldFR
force-pushed
the
topic/tracy-submodule-install-headers
branch
from
ac86cd3 to
d2a553d
Compare
Member
Author
|
pre-commit.ci autofix |
for more information, see https://pre-commit.ci
jorisv
requested changes
Sep 6, 2024
jorisv
reviewed
Sep 6, 2024
… time + change all #include <tracy/Tracy.hpp> to "aligator/third-party/tracy/Tracy.hpp"
ManifoldFR
force-pushed
the
topic/tracy-submodule-install-headers
branch
from
1b0c9b6 to
41e5f1b
Compare
+ add ${PROJECT_BINARY_DIR}/include to interface
ManifoldFR
force-pushed
the
topic/tracy-submodule-install-headers
branch
from
41e5f1b to
813aaf6
Compare
jorisv
approved these changes
Sep 6, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR:
FetchContentinclude/aligator/third-partyheader directory in both source and install treesboost/core/span.hppand related headers (ingar/includesource tree) to this new dir for third-party stuffinstall()for the TracyClient target, change link to TracyClient toPRIVATEpyaligatorbindings toproxsuite-nlp::pyproxsuite-nlpanymore#included in some of our template implementation headers) to the install-treealigator/third-party. I think tracy's 3-clause BSD license should allow it (is that right @nim65s ?)The last change ensures client libraries no longer their own copy of Tracy (installed through CMake or as submodule/FetchContent) to use aligator as a CMake dependency.
The following is the output of running
tree third-partyin the<install-prefix>/include/aligatordirectory:third-party ├── boost │ └── core │ ├── data.hpp │ ├── make_span.hpp │ └── span.hpp ├── client │ ├── TracyArmCpuTable.hpp │ ├── TracyCallstack.h │ ├── TracyCallstack.hpp │ ├── tracy_concurrentqueue.h │ ├── TracyCpuid.hpp │ ├── TracyDebug.hpp │ ├── TracyDxt1.hpp │ ├── TracyFastVector.hpp │ ├── TracyKCore.hpp │ ├── TracyLock.hpp │ ├── TracyProfiler.hpp │ ├── TracyRingBuffer.hpp │ ├── tracy_rpmalloc.hpp │ ├── TracyScoped.hpp │ ├── tracy_SPSCQueue.h │ ├── TracyStringHelpers.hpp │ ├── TracySysPower.hpp │ ├── TracySysTime.hpp │ ├── TracySysTrace.hpp │ └── TracyThread.hpp ├── common │ ├── TracyAlign.hpp │ ├── TracyAlloc.hpp │ ├── TracyApi.h │ ├── TracyColor.hpp │ ├── TracyForceInline.hpp │ ├── tracy_lz4hc.hpp │ ├── tracy_lz4.hpp │ ├── TracyMutex.hpp │ ├── TracyProtocol.hpp │ ├── TracyQueue.hpp │ ├── TracySocket.hpp │ ├── TracyStackFrames.hpp │ ├── TracySystem.hpp │ ├── TracyUwp.hpp │ └── TracyYield.hpp └── tracy └── Tracy.hpp 6 directories, 39 files