From 19e61aa1aa6effb5cd57b713a33f1669d9502941 Mon Sep 17 00:00:00 2001 From: Anthony Printup <92564080+anthonyprintup@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:41:37 +0200 Subject: [PATCH] test(relative-paths): Attempt to fix the tests workflow --- tests/CMakeLists.txt | 12 +++++++++++- tests/cmake.toml | 8 +++++++- tests/relative-paths/cmake.toml | 3 --- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 161abca..39b4fcf 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -110,6 +110,16 @@ add_test( build ) +add_test( + NAME + relative-paths-setup + WORKING_DIRECTORY + "${CMAKE_CURRENT_LIST_DIR}/relative-paths" + COMMAND + "$" + "build --target test-library" +) + add_test( NAME relative-paths @@ -117,5 +127,5 @@ add_test( "${CMAKE_CURRENT_LIST_DIR}/relative-paths" COMMAND "$" - build + "build --target example" ) diff --git a/tests/cmake.toml b/tests/cmake.toml index 994f5b8..109ba8c 100644 --- a/tests/cmake.toml +++ b/tests/cmake.toml @@ -59,8 +59,14 @@ working-directory = "compile-options" command = "$" arguments = ["build"] +[[test]] +name = "relative-paths-setup" +working-directory = "relative-paths" +command = "$" +arguments = ["build --target test-library"] + [[test]] name = "relative-paths" working-directory = "relative-paths" command = "$" -arguments = ["build"] +arguments = ["build --target example"] diff --git a/tests/relative-paths/cmake.toml b/tests/relative-paths/cmake.toml index d88d23d..c308e7d 100644 --- a/tests/relative-paths/cmake.toml +++ b/tests/relative-paths/cmake.toml @@ -19,6 +19,3 @@ add_custom_command( type = "executable" sources = ["src/main.cpp"] link-libraries = ["libs/test-library-file.lib"] -cmake-after = """ -add_dependencies(${CMKR_TARGET} ${TEST_LIBRARY_TARGET_NAME}) -"""