From b24a0a2fdca70288789d764a20c45693e0cfe97f Mon Sep 17 00:00:00 2001 From: Anthony Printup <92564080+anthonyprintup@users.noreply.github.com> Date: Mon, 18 Sep 2023 17:48:17 +0200 Subject: [PATCH] test(relative-paths): Make `link-libraries` conditional to the Windows platform --- tests/CMakeLists.txt | 29 +++++++++++------------------ tests/cmake.toml | 9 ++------- tests/relative-paths/cmake.toml | 2 +- tests/relative-paths/src/main.cpp | 4 ++++ 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 39b4fcf..22aa4b4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -110,22 +110,15 @@ add_test( build ) -add_test( - NAME - relative-paths-setup - WORKING_DIRECTORY - "${CMAKE_CURRENT_LIST_DIR}/relative-paths" - COMMAND - "$" - "build --target test-library" -) +if(WIN32) # windows + add_test( + NAME + relative-paths + WORKING_DIRECTORY + "${CMAKE_CURRENT_LIST_DIR}/relative-paths" + COMMAND + "$" + build + ) -add_test( - NAME - relative-paths - WORKING_DIRECTORY - "${CMAKE_CURRENT_LIST_DIR}/relative-paths" - COMMAND - "$" - "build --target example" -) +endif() diff --git a/tests/cmake.toml b/tests/cmake.toml index 109ba8c..338b37d 100644 --- a/tests/cmake.toml +++ b/tests/cmake.toml @@ -60,13 +60,8 @@ command = "$" arguments = ["build"] [[test]] -name = "relative-paths-setup" -working-directory = "relative-paths" -command = "$" -arguments = ["build --target test-library"] - -[[test]] +condition = "windows" name = "relative-paths" working-directory = "relative-paths" command = "$" -arguments = ["build --target example"] +arguments = ["build"] diff --git a/tests/relative-paths/cmake.toml b/tests/relative-paths/cmake.toml index ac0bd4d..d029bbe 100644 --- a/tests/relative-paths/cmake.toml +++ b/tests/relative-paths/cmake.toml @@ -8,4 +8,4 @@ sources = ["src/library-code.cpp"] [target.example] type = "executable" sources = ["src/main.cpp"] -link-libraries = ["libs/test-library-file.lib"] +windows.link-libraries = ["libs/test-library-x64-Release.lib"] diff --git a/tests/relative-paths/src/main.cpp b/tests/relative-paths/src/main.cpp index 0779a21..3bef1f9 100644 --- a/tests/relative-paths/src/main.cpp +++ b/tests/relative-paths/src/main.cpp @@ -1,8 +1,12 @@ // Created by Anthony Printup on 9/18/2023. #include +#ifdef WIN32 extern "C" void library_function(); +#endif int main() { puts("Hello from cmkr(relative-paths)!"); +#ifdef WIN32 library_function(); +#endif }