More tweaks

Author: kunitoki

cmake/yup_modules.cmake

@@ -720,14 +720,16 @@ function (yup_add_module module_path modules_definitions module_group)
     endif()
 
     foreach (searchpath IN LISTS module_searchpaths)
-        if (EXISTS "${searchpath}")
-            list (APPEND module_include_paths "${searchpath}")
-        elseif (EXISTS "${module_path}/${searchpath}")
-            list (APPEND module_include_paths "${module_path}/${searchpath}")
-        elseif (module_upstream_path AND EXISTS "${module_upstream_path}/${searchpath}")
+        if (module_upstream_path AND EXISTS "${module_upstream_path}/${searchpath}")
             list (APPEND module_include_paths "${module_upstream_path}/${searchpath}")
         elseif (module_upstream OR module_repository)
-            list (APPEND module_include_paths "${CMAKE_BINARY_DIR}/externals/${module_name}/${searchpath}")
+            if (EXISTS "${CMAKE_BINARY_DIR}/externals/${module_name}/${searchpath}")
+                list (APPEND module_include_paths "${CMAKE_BINARY_DIR}/externals/${module_name}/${searchpath}")
+            endif()
+        elseif (EXISTS "${module_path}/${searchpath}")
+            list (APPEND module_include_paths "${module_path}/${searchpath}")
+        elseif (EXISTS "${searchpath}")
+            list (APPEND module_include_paths "${searchpath}")
         endif()
     endforeach()
 

cmake/yup_utilities.cmake

@@ -208,8 +208,10 @@ endfunction()
 function (_yup_collect_upstream_candidate_paths module_name module_path output_variable)
     set (candidate_paths
         "${module_path}/upstream"
-        "${CMAKE_SOURCE_DIR}/build/externals/${module_name}"
-        "${CMAKE_SOURCE_DIR}/../build/externals/${module_name}")
+        "${CMAKE_SOURCE_DIR}/build/externals/${module_name}")
+
+    get_filename_component (parent_candidate_path "${CMAKE_SOURCE_DIR}/../build/externals/${module_name}" REALPATH)
+    list (APPEND candidate_paths "${parent_candidate_path}")
 
     set (candidate_root "${CMAKE_BINARY_DIR}")
     set (max_depth 10)