Skip to content

Commit

Permalink
[gicombiner] Make rL373551 compatible with older cmakes
Browse files Browse the repository at this point in the history
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

llvm-svn: 373555
  • Loading branch information
dsandersllvm committed Oct 3, 2019
1 parent f79f689 commit 45f682f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions llvm/unittests/TableGen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion llvm/utils/TableGen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion llvm/utils/TableGen/GlobalISel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ set(LLVM_LINK_COMPONENTS
Support
)

llvm_add_library(LLVMTableGenGlobalISel OBJECT
llvm_add_library(LLVMTableGenGlobalISel STATIC
CodeExpander.cpp
)

0 comments on commit 45f682f

Please sign in to comment.