PR changes made

swift-nav · Sep 28, 2020 · c9225eb · c9225eb
1 parent fc47377
commit c9225eb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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()