[llvm] r373555 - [gicombiner] Make rL373551 compatible with older cmakes

[Daniel Sanders via llvm-commits]

Author: dsanders
Date: Wed Oct  2 18:49:04 2019
New Revision: 373555

URL: http://llvm.org/viewvc/llvm-project?rev=373555&view=rev
Log:
[gicombiner] Make rL373551 compatible with older cmakes

Newer cmakes appear to be more flexible w.r.t object libraries. Convert to
a static library so that it works with older cmakes too

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=373555&r1=373554&r2=373555&view=diff
==============================================================================
--- llvm/trunk/unittests/TableGen/CMakeLists.txt (original)
+++ llvm/trunk/unittests/TableGen/CMakeLists.txt Wed Oct  2 18:49:04 2019
@@ -5,7 +5,6 @@ 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=373555&r1=373554&r2=373555&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/CMakeLists.txt (original)
+++ llvm/trunk/utils/TableGen/CMakeLists.txt Wed Oct  2 18:49:04 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=373555&r1=373554&r2=373555&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/GlobalISel/CMakeLists.txt (original)
+++ llvm/trunk/utils/TableGen/GlobalISel/CMakeLists.txt Wed Oct  2 18:49:04 2019
@@ -2,6 +2,6 @@ set(LLVM_LINK_COMPONENTS
   Support
   )
 
-llvm_add_library(LLVMTableGenGlobalISel OBJECT
+llvm_add_library(LLVMTableGenGlobalISel STATIC
                  CodeExpander.cpp
                 )