[llvm] r373579 - Revert 373555: libLLVM+modules failure with CMake 3.10.2

[Kristina Brooks via llvm-commits]

Author: kristina
Date: Thu Oct  3 03:48:37 2019
New Revision: 373579

URL: http://llvm.org/viewvc/llvm-project?rev=373579&view=rev
Log:
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


Modified:
    llvm/trunk/unittests/TableGen/CMakeLists.txt
    llvm/trunk/utils/TableGen/CMakeLists.txt
    llvm/trunk/utils/TableGen/GlobalISel/CMakeLists.txt

Modified: llvm/trunk/unittests/TableGen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TableGen/CMakeLists.txt?rev=373579&r1=373578&r2=373579&view=diff
==============================================================================
--- llvm/trunk/unittests/TableGen/CMakeLists.txt (original)
+++ llvm/trunk/unittests/TableGen/CMakeLists.txt Thu Oct  3 03:48:37 2019
@@ -5,6 +5,7 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_unittest(TableGenTests
   CodeExpanderTest.cpp
+  $<TARGET_OBJECTS:obj.LLVMTableGenGlobalISel>
   )
+
 include_directories(${CMAKE_SOURCE_DIR}/utils/TableGen)
-target_link_libraries(TableGenTests PRIVATE LLVMTableGenGlobalISel)

Modified: llvm/trunk/utils/TableGen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CMakeLists.txt?rev=373579&r1=373578&r2=373579&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/CMakeLists.txt (original)
+++ llvm/trunk/utils/TableGen/CMakeLists.txt Thu Oct  3 03:48:37 2019
@@ -51,6 +51,6 @@ add_tablegen(llvm-tblgen LLVM
   X86RecognizableInstr.cpp
   WebAssemblyDisassemblerEmitter.cpp
   CTagsEmitter.cpp
+  $<TARGET_OBJECTS:obj.LLVMTableGenGlobalISel>
   )
-target_link_libraries(llvm-tblgen PRIVATE LLVMTableGenGlobalISel)
 set_target_properties(llvm-tblgen PROPERTIES FOLDER "Tablegenning")

Modified: llvm/trunk/utils/TableGen/GlobalISel/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/GlobalISel/CMakeLists.txt?rev=373579&r1=373578&r2=373579&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/GlobalISel/CMakeLists.txt (original)
+++ llvm/trunk/utils/TableGen/GlobalISel/CMakeLists.txt Thu Oct  3 03:48:37 2019
@@ -2,6 +2,6 @@ set(LLVM_LINK_COMPONENTS
   Support
   )
 
-llvm_add_library(LLVMTableGenGlobalISel STATIC
+llvm_add_library(LLVMTableGenGlobalISel OBJECT
                  CodeExpander.cpp
                 )