[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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@373555 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/TableGen/CMakeLists.txt b/unittests/TableGen/CMakeLists.txt
index d90955786f86ba3c055577ec610b2d4ad56502a3..47bde04cad0dbf01c5c97208dea4699dbef453df 100644 (file)
--- a/unittests/TableGen/CMakeLists.txt
+++ b/unittests/TableGen/CMakeLists.txt
@@ -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)

diff --git a/utils/TableGen/CMakeLists.txt b/utils/TableGen/CMakeLists.txt
index 8a79d5757b2a0ab688390f6a98b58c25ca0d460d..77ef764d2f22a80c2f42b0229a67afd6f25b358d 100644 (file)
--- 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_OBJECTS:obj.LLVMTableGenGlobalISel>
   )
+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 cd6453482403d7996c275aa76f4d0291c7d43509..ea4713d8b29ab60a48c3cc1618c1c3c0c726611c 100644 (file)
--- 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 OBJECT
+llvm_add_library(LLVMTableGenGlobalISel STATIC
                  CodeExpander.cpp
                 )