[Lldb-commits] [PATCH] D63544: Use object library if cmake supports it
Tatyana Krasnukha via Phabricator via lldb-commits
lldb-commits at lists.llvm.org
Thu Jun 20 07:04:20 PDT 2019
tatyana-krasnukha updated this revision to Diff 205800.
tatyana-krasnukha added a comment.
Finally updated versions - `target_sources` supports using `$<TARGET_OBJECTS:...>` since CMake 3.5.0.
Repository:
rLLDB LLDB
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D63544/new/
https://reviews.llvm.org/D63544
Files:
tools/lldb/unittests/tools/lldb-mi/utils/CMakeLists.txt
Index: tools/lldb/unittests/tools/lldb-mi/utils/CMakeLists.txt
===================================================================
--- tools/lldb/unittests/tools/lldb-mi/utils/CMakeLists.txt
+++ tools/lldb/unittests/tools/lldb-mi/utils/CMakeLists.txt
@@ -1,13 +1,30 @@
-add_library(lldb-mi-utils OBJECT
+# Create object library to avoid unnecessary linking. If CMake version
+# doesn't support it, just create an ordinary library.
+if(NOT (${CMAKE_VERSION} VERSION_LESS "3.5.0"))
+ set (LIBRARY_TYPE "OBJECT")
+endif()
+
+add_library(lldb-mi-utils ${LIBRARY_TYPE}
${LLDB_SOURCE_DIR}/tools/lldb-mi/MIUtilString.cpp
)
add_lldb_unittest(LLDBMiUtilTests
StringTest.cpp
-
+
LINK_COMPONENTS
Support
)
-target_sources(LLDBMiUtilTests PRIVATE $<TARGET_OBJECTS:lldb-mi-utils>)
+if((${CMAKE_VERSION} VERSION_LESS "3.5.0") OR
+ NOT (${CMAKE_VERSION} VERSION_LESS "3.12.0"))
+ # Link to either usual (cmake version < 3.5) or
+ # object (cmake version >= 3.12) library with lldm-mi sources.
+ target_link_libraries(LLDBMiUtilTests PRIVATE lldb-mi-utils)
+else()
+ # Object libraries still cannot be on the right-hand side of
+ # `target_link_libraries` but `$<TARGET_OBJECTS:objlib>` expression is
+ # already supported in `target_sources`.
+ target_sources(LLDBMiUtilTests PRIVATE $<TARGET_OBJECTS:lldb-mi-utils>)
+endif()
+
set_target_properties(lldb-mi-utils PROPERTIES FOLDER "lldb libraries")
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63544.205800.patch
Type: text/x-patch
Size: 1426 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20190620/21e1a624/attachment.bin>
More information about the lldb-commits
mailing list