Fix builds

Author: kunitoki

cmake/yup_modules.cmake

@@ -57,10 +57,8 @@ endfunction()
 #==============================================================================
 
 function (_yup_module_upstream_has_content module_name module_path output_variable)
-    set (source_upstream_path "${module_path}/upstream")
-    set (build_upstream_path "${CMAKE_BINARY_DIR}/externals/${module_name}/upstream")
-
-    foreach (candidate_path IN ITEMS "${source_upstream_path}" "${build_upstream_path}")
+    _yup_collect_upstream_candidate_paths ("${module_name}" "${module_path}" candidate_paths)
+    foreach (candidate_path IN LISTS candidate_paths)
         if (EXISTS "${candidate_path}")
             file (GLOB upstream_items "${candidate_path}/*")
             list (LENGTH upstream_items upstream_items_len)
@@ -77,17 +75,13 @@ endfunction()
 #==============================================================================
 
 function (_yup_module_get_upstream_path module_name module_path output_variable)
-    set (source_upstream_path "${module_path}/upstream")
-    if (EXISTS "${source_upstream_path}")
-        set (${output_variable} "${source_upstream_path}" PARENT_SCOPE)
-        return()
-    endif()
-
-    set (build_upstream_path "${CMAKE_BINARY_DIR}/externals/${module_name}/upstream")
-    if (EXISTS "${build_upstream_path}")
-        set (${output_variable} "${build_upstream_path}" PARENT_SCOPE)
-        return()
-    endif()
+    _yup_collect_upstream_candidate_paths ("${module_name}" "${module_path}" candidate_paths)
+    foreach (candidate_path IN LISTS candidate_paths)
+        if (EXISTS "${candidate_path}")
+            set (${output_variable} "${candidate_path}" PARENT_SCOPE)
+            return()
+        endif()
+    endforeach()
 
     set (${output_variable} "" PARENT_SCOPE)
 endfunction()

cmake/yup_utilities.cmake

@@ -203,6 +203,28 @@ function (_yup_resolve_variable_path input_path output_variable)
     set (${output_variable} "${input_path}" PARENT_SCOPE)
 endfunction()
 
+#==============================================================================
+
+function (_yup_collect_upstream_candidate_paths module_name module_path output_variable)
+    set (candidate_paths "${module_path}/upstream")
+
+    set (candidate_root "${CMAKE_BINARY_DIR}")
+    set (max_depth 6)
+    while (max_depth GREATER 0)
+        list (APPEND candidate_paths "${candidate_root}/externals/${module_name}/upstream")
+
+        get_filename_component (candidate_parent "${candidate_root}" DIRECTORY)
+        if ("${candidate_parent}" STREQUAL "${candidate_root}")
+            break()
+        endif()
+
+        set (candidate_root "${candidate_parent}")
+        math (EXPR max_depth "${max_depth} - 1")
+    endwhile()
+
+    set (${output_variable} "${candidate_paths}" PARENT_SCOPE)
+endfunction()
+
 function (_yup_resolve_variable_paths input_list output_list)
     set (resolved_list "")
 

tests/yup_audio_formats/yup_OpusAudioFormat.cpp

@@ -245,24 +245,24 @@ TEST_F (OpusAudioFormatFileTests, TestWriteAndReadRoundTrip)
         tempFile.deleteFile();
     } };
 
-    std::unique_ptr<FileOutputStream> outputStream = std::make_unique<FileOutputStream> (tempFile);
-    auto writer = format->createWriterFor (outputStream.get(), 48000, 1, 32, {}, 0);
-    ASSERT_NE (nullptr, writer);
-
     const int numSamples = 960 * 3;
     AudioBuffer<float> buffer (1, numSamples);
     auto* channelData = buffer.getWritePointer (0);
     for (int sample = 0; sample < numSamples; ++sample)
         channelData[sample] = std::sin (2.0 * 3.14159 * 440.0 * sample / 48000.0);
 
-    const float* const* bufferData = buffer.getArrayOfReadPointers();
-    EXPECT_TRUE (writer->write (bufferData, numSamples));
-    writer->flush();
+    {
+        auto outputStream = std::make_unique<FileOutputStream> (tempFile);
+        auto writer = format->createWriterFor (outputStream.release(), 48000, 1, 32, {}, 0);
+        ASSERT_NE (nullptr, writer);
 
-    outputStream.release();
+        const float* const* bufferData = buffer.getArrayOfReadPointers();
+        EXPECT_TRUE (writer->write (bufferData, numSamples));
+        writer->flush();
+    }
 
-    std::unique_ptr<FileInputStream> inputStream = std::make_unique<FileInputStream> (tempFile);
-    auto reader = format->createReaderFor (inputStream.get());
+    auto inputStream = std::make_unique<FileInputStream> (tempFile);
+    auto reader = format->createReaderFor (inputStream.release());
     ASSERT_NE (nullptr, reader);
 
     EXPECT_DOUBLE_EQ (48000.0, reader->sampleRate);
@@ -318,7 +318,5 @@ TEST_F (OpusAudioFormatFileTests, TestWriteAndReadRoundTrip)
     EXPECT_LT (rmsRatio, 1.6);
     EXPECT_GT (peakRatio, 0.4);
     EXPECT_LT (peakRatio, 1.6);
-
-    inputStream.release();
 }
 #endif