Starling third party fix #65
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
RReichert
force-pushed
the
rodrigor/starling-third-party-fix
branch
from
f861c13 to
fc47377
Compare
woodfell
reviewed
Sep 16, 2020
GenericFindDependency.cmake
Outdated
| @@ -259,9 +263,11 @@ macro(create_source_search_paths) | |||
| list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/${x_SOURCE_DIR}") | |||
There was a problem hiding this comment.
I think the real issue here is that this line shouldn't be here, neither should the one 2 lines above. A long time ago we agreed that all submodules will live under third_party, these modules shouldn't be searching any part that doesn't have third_party in it
There was a problem hiding this comment.
Seems like a good idea to remove the old system. I've since rolled back the changes and used the suggested approach.
RReichert
force-pushed
the
rodrigor/starling-third-party-fix
branch
from
645b78f to
c9225eb
Compare
RReichert
commented
Sep 28, 2020
| @@ -2,7 +2,7 @@ include("GenericFindDependency") | |||
| option(nanopb_BUILD_GENERATOR "" OFF) | |||
| GenericFindDependency( | |||
| TARGET protobuf-nanopb | |||
| SOURCE_DIR "third_party/nanopb" | |||
| SOURCE_DIR "nanopb" | |||
There was a problem hiding this comment.
this was needed to be updated since one of the deleted paths was working with the original third_party/nanopd.
|
NOTE these changes are currently being used by the https://github.com/swift-nav/swiftlets/pull/880 PR. |
This was referenced Dec 13, 2022
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.
Background
There were two issues during the restructuring of our code base.
The first change that needed to be done was fix the
create_source_search_pathsfunction. After adding thestarlingfolder in the root directory,FindStarling.cmakescript's usage ofSOURCE_DIRmeant that the${CMAKE_CURRENT_SOURCE_DIR}/${x_SOURCE_DIR}folder was choose as the folder for which it would calladd_subdirectoryon to introduce the starling repo's cmake targets.The second issue was simply that some starling libraries weren't being flagged as exportable by the subdirectory, which meant that if we were to use
-DTHIRD_PARTY_INCLUDES_AS_SYSTEM=falsecmake cache variable, it would fail static analysis asclang-tidywould complain about eigen values.