From 1605accfed10e64a684362ba5d7d0c3b53689b38 Mon Sep 17 00:00:00 2001
From: Rodrigo Reichert <rodrigo.reichert@swift-nav.com>
Date: Tue, 1 Sep 2020 11:52:32 +1000
Subject: [PATCH 1/3] rodrigor/fix-inclusion of starling source directory over
 third party

---
 FindStarling.cmake          | 1 -
 GenericFindDependency.cmake | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/FindStarling.cmake b/FindStarling.cmake
index 9b07e99..a515497 100644
--- a/FindStarling.cmake
+++ b/FindStarling.cmake
@@ -12,6 +12,5 @@ GenericFindDependency(
     pvt-engine
     pvt-common
     starling-util
-  SOURCE_DIR starling
   SYSTEM_HEADER_FILE "pvt_driver/runner/pvt_runner.h"
 )
diff --git a/GenericFindDependency.cmake b/GenericFindDependency.cmake
index f03f2f2..9945d7b 100644
--- a/GenericFindDependency.cmake
+++ b/GenericFindDependency.cmake
@@ -244,13 +244,17 @@ endmacro()
 # - x_SOURCE_SEARCH_PATHS - A list of paths to be searched for source code
 #
 macro(create_source_search_paths)
+  string(TOLOWER ${CMAKE_FIND_PACKAGE_NAME} lowercase_package_name)
+
   # set defaults
   set(x_SOURCE_SEARCH_PATHS "")
   if(NOT x_SOURCE_DIR)
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${CMAKE_FIND_PACKAGE_NAME}")
+    list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${lowercase_package_name}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${x_TARGET}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/lib${x_TARGET}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${CMAKE_FIND_PACKAGE_NAME}")
+    list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${lowercase_package_name}")
     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()
@@ -259,9 +263,11 @@ macro(create_source_search_paths)
     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/${lowercase_package_name}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${x_TARGET}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/lib${x_TARGET}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${CMAKE_FIND_PACKAGE_NAME}/${x_SOURCE_DIR}")
+    list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${lowercase_package_name}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${x_TARGET}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/lib${x_TARGET}/${x_SOURCE_DIR}")
   endif()

From fc47377f08af61969f3b844d5857269c5cfe03b8 Mon Sep 17 00:00:00 2001
From: Rodrigo Reichert <rodrigo.reichert@swift-nav.com>
Date: Thu, 10 Sep 2020 13:39:50 +1000
Subject: [PATCH 2/3] included missing starling find_package libraries

---
 FindStarling.cmake | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/FindStarling.cmake b/FindStarling.cmake
index a515497..be1df37 100644
--- a/FindStarling.cmake
+++ b/FindStarling.cmake
@@ -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
   SYSTEM_HEADER_FILE "pvt_driver/runner/pvt_runner.h"
 )

From c9225eb3275f99984c43aa1839f34464ce095af0 Mon Sep 17 00:00:00 2001
From: Rodrigo Reichert <rodrigo.reichert@swift-nav.com>
Date: Mon, 28 Sep 2020 09:37:40 +1000
Subject: [PATCH 3/3] PR changes made

---
 FindNanopb.cmake            |  4 ++--
 FindStarling.cmake          |  1 +
 GenericFindDependency.cmake | 12 +++---------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/FindNanopb.cmake b/FindNanopb.cmake
index d036384..2125dad 100644
--- a/FindNanopb.cmake
+++ b/FindNanopb.cmake
@@ -2,7 +2,7 @@ include("GenericFindDependency")
 option(nanopb_BUILD_GENERATOR "" OFF)
 GenericFindDependency(
   TARGET protobuf-nanopb
-  SOURCE_DIR "third_party/nanopb"
+  SOURCE_DIR "nanopb"
   SYSTEM_INCLUDES
-  )
+)
 
diff --git a/FindStarling.cmake b/FindStarling.cmake
index be1df37..a8649fb 100644
--- a/FindStarling.cmake
+++ b/FindStarling.cmake
@@ -18,5 +18,6 @@ GenericFindDependency(
     pvt-version
     starling-build-config
     starling-util
+  SOURCE_DIR starling
   SYSTEM_HEADER_FILE "pvt_driver/runner/pvt_runner.h"
 )
diff --git a/GenericFindDependency.cmake b/GenericFindDependency.cmake
index 9945d7b..7361aba 100644
--- a/GenericFindDependency.cmake
+++ b/GenericFindDependency.cmake
@@ -244,30 +244,22 @@ endmacro()
 # - x_SOURCE_SEARCH_PATHS - A list of paths to be searched for source code
 #
 macro(create_source_search_paths)
-  string(TOLOWER ${CMAKE_FIND_PACKAGE_NAME} lowercase_package_name)
-
   # set defaults
   set(x_SOURCE_SEARCH_PATHS "")
   if(NOT x_SOURCE_DIR)
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${CMAKE_FIND_PACKAGE_NAME}")
-    list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${lowercase_package_name}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${x_TARGET}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/lib${x_TARGET}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${CMAKE_FIND_PACKAGE_NAME}")
-    list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${lowercase_package_name}")
     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/${lowercase_package_name}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/${x_TARGET}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/lib${x_TARGET}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${CMAKE_FIND_PACKAGE_NAME}/${x_SOURCE_DIR}")
-    list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${lowercase_package_name}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/${x_TARGET}/${x_SOURCE_DIR}")
     list(APPEND x_SOURCE_SEARCH_PATHS "${PROJECT_SOURCE_DIR}/third_party/lib${x_TARGET}/${x_SOURCE_DIR}")
   endif()
@@ -398,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()