[Lldb-commits] [lldb] r364035 - [unittests] Simplify CMakeLists with object library

Tatyana Krasnukha via lldb-commits lldb-commits at lists.llvm.org
Fri Jun 21 04:46:46 PDT 2019


Author: tkrasnukha
Date: Fri Jun 21 04:46:46 2019
New Revision: 364035

URL: http://llvm.org/viewvc/llvm-project?rev=364035&view=rev
Log:
[unittests] Simplify CMakeLists with object library

The solution suggested by Chris Bieneman works for all versions of CMake.

Differential Revision: https://reviews.llvm.org/D63544

Modified:
    lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt

Modified: lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt?rev=364035&r1=364034&r2=364035&view=diff
==============================================================================
--- lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt (original)
+++ lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt Fri Jun 21 04:46:46 2019
@@ -1,30 +1,13 @@
-# 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}
+add_library(lldb-mi-utils OBJECT
   ${LLDB_SOURCE_DIR}/tools/lldb-mi/MIUtilString.cpp
   )
 
 add_lldb_unittest(LLDBMiUtilTests
+  $<TARGET_OBJECTS:lldb-mi-utils>
   StringTest.cpp
 
   LINK_COMPONENTS
     Support
   )
 
-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")




More information about the lldb-commits mailing list