diff --git a/.github/workflows/cmake-integration.yml b/.github/workflows/cmake-integration.yml index 1933f8c..ca3970e 100644 --- a/.github/workflows/cmake-integration.yml +++ b/.github/workflows/cmake-integration.yml @@ -41,6 +41,21 @@ jobs: cmake .. -DCMAKE_BUILD_TYPE=Debug make ./main + test-linux-add_subdirectory: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v2 + - name: build + run: | + cd .. + cp -rv cpptrace/test/add_subdirectory-integration . + cp -rv cpptrace add_subdirectory-integration + mkdir add_subdirectory-integration/build + cd add_subdirectory-integration/build + cmake .. -DCMAKE_BUILD_TYPE=Debug + make + ./main + test-macos-fetchcontent: runs-on: macos-13 steps: @@ -73,6 +88,21 @@ jobs: cmake .. -DCMAKE_BUILD_TYPE=Debug make ./main + test-macos-add_subdirectory: + runs-on: macos-13 + steps: + - uses: actions/checkout@v2 + - name: test + run: | + cd .. + cp -rv cpptrace/test/add_subdirectory-integration . + cp -rv cpptrace add_subdirectory-integration + mkdir add_subdirectory-integration/build + cd add_subdirectory-integration/build + cmake .. -DCMAKE_BUILD_TYPE=Debug + make + ./main + test-mingw-fetchcontent: runs-on: windows-2019 steps: @@ -87,6 +117,20 @@ jobs: cmake .. -DCMAKE_BUILD_TYPE=Debug -DCPPTRACE_TAG="$tag" -DCMAKE_BUILD_TYPE=g++ "-GUnix Makefiles" make .\main.exe + test-mingw-add_subdirectory: + runs-on: windows-2019 + steps: + - uses: actions/checkout@v2 + - name: test + run: | + cd .. + cp -Recurse cpptrace/test/add_subdirectory-integration . + cp -Recurse cpptrace add_subdirectory-integration + mkdir add_subdirectory-integration/build + cd add_subdirectory-integration/build + cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=g++ "-GUnix Makefiles" + make + .\main.exe test-windows-fetchcontent: runs-on: windows-2019 steps: @@ -103,3 +147,19 @@ jobs: cmake .. -DCMAKE_BUILD_TYPE=Debug -DCPPTRACE_TAG="$tag" msbuild demo_project.sln .\Debug\main.exe + test-windows-add_subdirectory: + runs-on: windows-2019 + steps: + - uses: actions/checkout@v2 + - name: Enable Developer Command Prompt + uses: ilammy/msvc-dev-cmd@v1.10.0 + - name: test + run: | + cd .. + cp -Recurse cpptrace/test/add_subdirectory-integration . + cp -Recurse cpptrace add_subdirectory-integration + mkdir add_subdirectory-integration/build + cd add_subdirectory-integration/build + cmake .. -DCMAKE_BUILD_TYPE=Debug + msbuild demo_project.sln + .\Debug\main.exe diff --git a/test/add_subdirectory-integration/CMakeLists.txt b/test/add_subdirectory-integration/CMakeLists.txt new file mode 100644 index 0000000..77b1e86 --- /dev/null +++ b/test/add_subdirectory-integration/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.8) + +project(demo_project VERSION 0.0.1 LANGUAGES CXX) + +add_executable(main main.cpp) + +add_subdirectory(cpptrace) +target_link_libraries(main cpptrace) diff --git a/test/add_subdirectory-integration/main.cpp b/test/add_subdirectory-integration/main.cpp new file mode 100644 index 0000000..cd935bb --- /dev/null +++ b/test/add_subdirectory-integration/main.cpp @@ -0,0 +1,13 @@ +#include + +void trace() { + cpptrace::print_trace(); +} + +void foo(int) { + trace(); +} + +int main() { + foo(0); +} diff --git a/test/fetchcontent-integration/main.cpp b/test/fetchcontent-integration/main.cpp index 899d4a0..cd935bb 100644 --- a/test/fetchcontent-integration/main.cpp +++ b/test/fetchcontent-integration/main.cpp @@ -11,4 +11,3 @@ void foo(int) { int main() { foo(0); } - diff --git a/test/findpackage-integration/main.cpp b/test/findpackage-integration/main.cpp index 899d4a0..cd935bb 100644 --- a/test/findpackage-integration/main.cpp +++ b/test/findpackage-integration/main.cpp @@ -11,4 +11,3 @@ void foo(int) { int main() { foo(0); } -