Merge pull request #623 from conan-io/test/subdir

new test for subdir

tests/resources/subdir2/CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.24)
+project(MyApp CXX)
+
+add_subdirectory(subdir)
+

tests/resources/subdir2/conanfile.txt

@@ -0,0 +1,2 @@
+[requires]
+hello/0.1

tests/resources/subdir2/subdir/CMakeLists.txt

@@ -0,0 +1,3 @@
+find_package(hello REQUIRED)
+add_executable(appSubdir main.cpp)
+target_link_libraries(appSubdir hello::hello)

tests/resources/subdir2/subdir/main.cpp

@@ -0,0 +1,2 @@
+#include "hello.h"
+int main(){hello();}

tests/test_smoke.py

@@ -419,6 +419,27 @@ def test_add_subdirectory(self, capfd):
         out, _ = capfd.readouterr()
         assert "subdir/0.1: Hello World Release!" in out
 
+
+class TestSubdir2:
+
+    def test_add_subdirectory(self, tmp_path_factory, capfd):
+        "The CMAKE_PREFIX_PATH is set for CMakeLists.txt included with add_subdirectory BEFORE the first find_package."
+        workdir = tmp_path_factory.mktemp("test_subdir")
+        source_dir, binary_dir = setup_cmake_workdir(workdir, ["subdir2"])
+
+        run(f"cmake -S {source_dir} -B {binary_dir} -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES={conan_provider} -DCMAKE_BUILD_TYPE=Release")
+        out, _ = capfd.readouterr()
+        assert "first find_package() found. Installing dependencies with Conan" in out
+        run(f"cmake --build {binary_dir} --config Release")
+        if platform.system() == "Windows":
+            app_executable = binary_dir / "subdir" / "Release" / "appSubdir.exe"
+        else:
+            app_executable = binary_dir / "subdir" / "appSubdir"
+        run(app_executable.as_posix())
+        out, _ = capfd.readouterr()
+        assert "hello/0.1: Hello World Release!" in out
+
+
 class TestLibcxx:
     @darwin
     def test_libcxx_macos(self, capfd, basic_cmake_project):