Make vendored libraries optional #4544
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
nilsnolde
force-pushed
the
nn-optional-vendored
branch
from
8daf123
to
9b36b25
Compare
nilsnolde
commented
Feb 2, 2024
nilsnolde
commented
Feb 2, 2024
nilsnolde
commented
Feb 2, 2024
| @@ -118,16 +123,57 @@ add_definitions(-DBOOST_NO_CXX11_SCOPED_ENUMS) | |||
| add_definitions(-DBOOST_ALLOW_DEPRECATED_HEADERS) | |||
| add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) | |||
|
|
|||
| # resolve vendored libraries | |||
| set(date_include_dir ${VALHALLA_SOURCE_DIR}/third_party/date/include) | |||
There was a problem hiding this comment.
this is the main changes, defaulting to vendored paths but trying to change them to system paths if opted in with PREFER_SYSTEM_DEPS
nilsnolde
commented
Feb 2, 2024
| @@ -52,34 +72,9 @@ sudo make -C build install | |||
|
|
|||
| ### Building from Source - macOS | |||
|
|
|||
| #### Configuring Rosetta for ARM64 MacBook | |||
|
|
|||
| Check your architecture typing `arch` in the terminal. In case the result is `arm64` set up Rosetta terminal to emulate x86_64 behavior. Otherwise, skip this step. | |||
There was a problem hiding this comment.
rosetta should be a thing of the past I think
nilsnolde
commented
Feb 2, 2024
Comment on lines
-46
to
-48
| if(APPLE) | ||
| list(APPEND system_includes ${VALHALLA_SOURCE_DIR}/third_party/date/include/date) | ||
| endif() |
There was a problem hiding this comment.
I removed this in all CMakeLists.txt, ${VALHALLA_SOURCE_DIR}/third_party/date/include/date is not even a valid path
…h are NOT usually found in package managers
nilsnolde
force-pushed
the
nn-optional-vendored
branch
from
c841036
to
da0d0d5
Compare
nilsnolde
commented
Feb 3, 2024
| @@ -37,7 +37,7 @@ defaults: | |||
| env: | |||
| BUILD_TYPE: Release | |||
| MSVC_VERSION: '2022' | |||
| VCPKG_VERSION: '2024.01.12' | |||
| VCPKG_VERSION: '8040303' | |||
There was a problem hiding this comment.
newest commit on vcpkg, the "old" release failed to resolve libspatialite with pkg-config for some reason (worked until this PR and I didn't change anything regarding pkg-config or spatialite..)
kevinkreiser
approved these changes
Feb 5, 2024
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.
based on #4541
fixes #4529
Let users decide whether to use our vendored libraries or their own for all major ones which we need for compile-/ or run-time (e.g. not
just_gtfs, not found in any package manager).I tried a full/default vcpkg build turning all vendored libraries off, worked smoothly. To be fair, quite a few libraries wouldn't be found with other package managers, e.g.
dateordirent.h. But it doesn't really matter, bcs we fallback to our submodules.What this PR does:
PREFER_SYSTEM_DEPSwhich, if turnedON(defaultOFF), will usefind_package()to resolvedate,rapidjson,cxxopts,robin-hood-hashing,pybind11,dirent.h(Win only). If turnedONand CMake doesn't find the library, we fall back to our vendored version of those libs and emit aWARNING. This way nothing changes for anyone who doesn't want to use this featurelz4submodule and depend on external package viapkg-config, it's available everywhere and stablePREFER_SYSTEM_DEPS=ONfor the Windows CI build which already usesvcpkgbuilding.mdforvcpkg