Use proper full install dirs for system config #1580
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
dominiklohmann
force-pushed
the
topic/thread-safe-getenv
branch
from
609e213
to
5cec03e
Compare
dominiklohmann
force-pushed
the
topic/install-paths
branch
2 times, most recently
from
c6b7c93
to
8e4a415
Compare
dominiklohmann
force-pushed
the
topic/thread-safe-getenv
branch
from
5cec03e
to
d1310e6
Compare
dominiklohmann
force-pushed
the
topic/install-paths
branch
from
8e4a415
to
9e55815
Compare
dominiklohmann
force-pushed
the
topic/thread-safe-getenv
branch
from
d1310e6
to
a32df56
Compare
dominiklohmann
force-pushed
the
topic/install-paths
branch
2 times, most recently
from
5cbd246
to
ae4f720
Compare
dominiklohmann
force-pushed
the
topic/thread-safe-getenv
branch
from
a32df56
to
8e337d7
Compare
dominiklohmann
force-pushed
the
topic/install-paths
branch
from
ae4f720
to
62a67d5
Compare
dominiklohmann
force-pushed
the
topic/thread-safe-getenv
branch
from
8e337d7
to
6156e4c
Compare
dominiklohmann
force-pushed
the
topic/install-paths
branch
from
62a67d5
to
aa8b1cf
Compare
dominiklohmann
force-pushed
the
topic/thread-safe-getenv
branch
from
6156e4c
to
98aa2f8
Compare
dominiklohmann
force-pushed
the
topic/install-paths
branch
from
aa8b1cf
to
bed0916
Compare
dominiklohmann
force-pushed
the
topic/thread-safe-getenv
branch
from
98aa2f8
to
3ecf0a4
Compare
dominiklohmann
force-pushed
the
topic/install-paths
branch
2 times, most recently
from
89325f1
to
e58210a
Compare
dominiklohmann
force-pushed
the
topic/install-paths
branch
from
e58210a
to
2ea6022
Compare
dominiklohmann
force-pushed
the
topic/thread-safe-getenv
branch
from
2fa4be7
to
55e0940
Compare
Before this change, the default build configuration would try to load schemas from `etc/vast/schema` instead of `/usr/local/etc/vast/schema` on macOS, and instead of `/etc/vast/schema` on Linux systems if `VAST_INSTALL_DATADIR` was unset or `CMAKE_INSTALL_DATADIR` set to a relative path instead of an absolute one (it should be relative). The solution here is to use the full paths instead. Additionally, there's no need to make the paths configurable, since that ever only affected where VAST looked for the config/schemas/plugins but not where we installed them.
dominiklohmann
force-pushed
the
topic/install-paths
branch
from
2ea6022
to
8bc7344
Compare
tobim
approved these changes
Apr 26, 2021
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.
馃摂 Description
Before this change, the default build configuration would try to load schemas from
etc/vast/schemainstead of/usr/local/etc/vast/schemaon macOS, and instead of/etc/vast/schemaon Linux systems ifVAST_INSTALL_DATADIRwas unset orCMAKE_INSTALL_DATADIRset to a relative path instead of an absolute one (it should be relative).The solution here is to use the full paths instead.
Additionally, there's no need to make the paths configurable, since that ever only affected where VAST looked for the config/schemas/plugins but not where we installed them.
馃摑 Checklist
馃幆 Review Instructions
File-by-file.
Note that this is based on #1579 to avoid the merge conflict. Other than that the PRs are independent of each other.