From 6d6baffb85ab4e02848fa7a3752f967d6ecb9518 Mon Sep 17 00:00:00 2001 From: Alois Klink <alois@aloisklink.com> Date: Thu, 3 Nov 2022 22:44:53 +0000 Subject: Tests: Fix ExternalLibraryWithSubstitution test The ExternalLibraryWithSubstitution test should test whether BUILD_BYPRODUCTS supports <BUILD_DIR> and other ExternalProject placeholder tokens. However, it's not hooked up correctly, and therefore isn't properly tested. This commit links it to an executable, to confirm whether it's possible to use the BUILD_BYPRODUCT in the Ninja generator. Fixes: commit 86032ae0eb (ExternalProject: Replace placeholder tokens in BYPRODUCTS, 2015-03-06) --- Tests/CustomCommandByproducts/CMakeLists.txt | 6 ++++++ Tests/CustomCommandByproducts/ExternalLibraryByproducts.c | 5 +++++ 2 files changed, 11 insertions(+) create mode 100644 Tests/CustomCommandByproducts/ExternalLibraryByproducts.c diff --git a/Tests/CustomCommandByproducts/CMakeLists.txt b/Tests/CustomCommandByproducts/CMakeLists.txt index 08c897c..638e165 100644 --- a/Tests/CustomCommandByproducts/CMakeLists.txt +++ b/Tests/CustomCommandByproducts/CMakeLists.txt @@ -169,6 +169,12 @@ add_dependencies(CustomCommandByproducts Producer2) target_link_libraries(CustomCommandByproducts ExternalLibrary) +add_executable(ExternalLibraryByproducts ExternalLibraryByproducts.c) +target_link_libraries(ExternalLibraryByproducts ExternalLibrary) + +add_executable(ExternalLibraryByproducts_WithSubstitution ExternalLibraryByproducts.c) +target_link_libraries(ExternalLibraryByproducts_WithSubstitution ExternalLibraryWithSubstitution) + if(CMAKE_GENERATOR STREQUAL "Ninja") add_custom_target(CheckNinja ALL COMMENT "Checking build.ninja" diff --git a/Tests/CustomCommandByproducts/ExternalLibraryByproducts.c b/Tests/CustomCommandByproducts/ExternalLibraryByproducts.c new file mode 100644 index 0000000..3588e53 --- /dev/null +++ b/Tests/CustomCommandByproducts/ExternalLibraryByproducts.c @@ -0,0 +1,5 @@ +extern int ExternalLibrary(void); +int main(void) +{ + return (ExternalLibrary() + 1); +} -- cgit v0.12