Skip to content

Starling third party fix #65

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 28, 2020
Merged

Starling third party fix #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1605acc
rodrigor/fix-inclusion of starling source directory over third party
RReichert Sep 1, 2020
fc47377
included missing starling find_package libraries
RReichert Sep 10, 2020
c9225eb
PR changes made
RReichert Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FindNanopb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include("GenericFindDependency")
option(nanopb_BUILD_GENERATOR "" OFF)
GenericFindDependency(
TARGET protobuf-nanopb
SOURCE_DIR "third_party/nanopb"
SOURCE_DIR "nanopb"
Copy link
Contributor Author

@RReichert RReichert Sep 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was needed to be updated since one of the deleted paths was working with the original third_party/nanopd.

SYSTEM_INCLUDES
)
)

8 changes: 7 additions & 1 deletion FindStarling.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@ option(starling_ENABLE_EXAMPLES "" OFF)
GenericFindDependency(
TARGET pvt-runner-lib
ADDITIONAL_TARGETS
math_routines
sensorfusion
pvt_driver
pvt-engine
pvt-common
pvt-engine
pvt-runner
pvt-sbp-logging
pvt-sizes
pvt-version
starling-build-config
starling-util
SOURCE_DIR starling
SYSTEM_HEADER_FILE "pvt_driver/runner/pvt_runner.h"
Expand Down
6 changes: 3 additions & 3 deletions GenericFindDependency.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,7 @@ macro(create_source_search_paths)
list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${x_TARGET}")
list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/lib${x_TARGET}")
else()
list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/${x_SOURCE_DIR}")
list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${x_SOURCE_DIR}")
list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/${x_SOURCE_DIR}")
list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${x_SOURCE_DIR}")
list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${CMAKE_FIND_PACKAGE_NAME}/${x_SOURCE_DIR}")
list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${x_TARGET}/${x_SOURCE_DIR}")
Expand Down Expand Up @@ -392,7 +390,9 @@ function(GenericFindDependency)
# If the primary target exposes additional targets, mark them as system
# targets in accordance to how the primary target was marked
foreach(additional_target IN LISTS x_ADDITIONAL_TARGETS)
mark_target_as_system_includes(${additional_target})
if(TARGET ${additional_target})
mark_target_as_system_includes(${additional_target})
endif()
endforeach()
endfunction()