From a70fa5b52f0420c3b5daea03c5c7b6b4c21ffef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 12 May 2020 08:20:34 +0300 Subject: [PATCH] Partially revert "[CMake] Fix building with -DBUILD_SHARED_LIBS=ON on mingw" This reverts parts of commit 609ef948387ba40e3693c2bd693d82ca34dcdc02, as it caused build failures on windows if LLVM_BUILD_EXAMPLES was enabled, due to Bye being added as a dependency of the lit tests. --- examples/Bye/CMakeLists.txt | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/examples/Bye/CMakeLists.txt b/examples/Bye/CMakeLists.txt index 362086eb1b3..3206f90d091 100644 --- a/examples/Bye/CMakeLists.txt +++ b/examples/Bye/CMakeLists.txt @@ -2,18 +2,12 @@ if(LLVM_BYE_LINK_INTO_TOOLS) message(WARNING "Setting LLVM_BYE_LINK_INTO_TOOLS=ON only makes sense for testing purpose") endif() -# The plugin expects to not link against the Support and Core libraries, -# but expects them to exist in the process loading the plugin. This doesn't -# work with DLLs on Windows (where a shared library can't have undefined -# references), so just skip this testcase on Windows. -if (NOT WIN32) - add_llvm_pass_plugin(Bye - Bye.cpp - DEPENDS - intrinsics_gen - BUILDTREE_ONLY - ) +add_llvm_pass_plugin(Bye + Bye.cpp + DEPENDS + intrinsics_gen + BUILDTREE_ONLY + ) - install(TARGETS ${name} RUNTIME DESTINATION examples) - set_target_properties(${name} PROPERTIES FOLDER "Examples") -endif() +install(TARGETS ${name} RUNTIME DESTINATION examples) +set_target_properties(${name} PROPERTIES FOLDER "Examples")