From ca10309b33be5a81096953d5323e61081228af65 Mon Sep 17 00:00:00 2001 From: Kristina Brooks Date: Thu, 3 Oct 2019 10:48:37 +0000 Subject: [PATCH] Revert 373555: libLLVM+modules failure with CMake 3.10.2 This reverts rL373555. I've sent an email out regarding the issue. Commit on GitHub: https://github.com/llvm/llvm-project/commit/45f682f47129c05414d4c5ae7be851772273978f git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@373579 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/TableGen/CMakeLists.txt | 3 ++- utils/TableGen/CMakeLists.txt | 2 +- utils/TableGen/GlobalISel/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/unittests/TableGen/CMakeLists.txt b/unittests/TableGen/CMakeLists.txt index 47bde04cad0..d90955786f8 100644 --- a/unittests/TableGen/CMakeLists.txt +++ b/unittests/TableGen/CMakeLists.txt @@ -5,6 +5,7 @@ set(LLVM_LINK_COMPONENTS add_llvm_unittest(TableGenTests CodeExpanderTest.cpp + $ ) + include_directories(${CMAKE_SOURCE_DIR}/utils/TableGen) -target_link_libraries(TableGenTests PRIVATE LLVMTableGenGlobalISel) diff --git a/utils/TableGen/CMakeLists.txt b/utils/TableGen/CMakeLists.txt index 77ef764d2f2..8a79d5757b2 100644 --- a/utils/TableGen/CMakeLists.txt +++ b/utils/TableGen/CMakeLists.txt @@ -51,6 +51,6 @@ add_tablegen(llvm-tblgen LLVM X86RecognizableInstr.cpp WebAssemblyDisassemblerEmitter.cpp CTagsEmitter.cpp + $ ) -target_link_libraries(llvm-tblgen PRIVATE LLVMTableGenGlobalISel) set_target_properties(llvm-tblgen PROPERTIES FOLDER "Tablegenning") diff --git a/utils/TableGen/GlobalISel/CMakeLists.txt b/utils/TableGen/GlobalISel/CMakeLists.txt index ea4713d8b29..cd645348240 100644 --- a/utils/TableGen/GlobalISel/CMakeLists.txt +++ b/utils/TableGen/GlobalISel/CMakeLists.txt @@ -2,6 +2,6 @@ set(LLVM_LINK_COMPONENTS Support ) -llvm_add_library(LLVMTableGenGlobalISel STATIC +llvm_add_library(LLVMTableGenGlobalISel OBJECT CodeExpander.cpp ) -- 2.40.0