CMake: link object libraries as targets

Signed-off-by: Stephan Lachnit <[email protected]>

Author: stephanlachnit

core/clib/CMakeLists.txt

@@ -44,13 +44,15 @@ target_include_directories(Clib
 # alternative for strlcpy on linux, see https://github.com/root-project/root/issues/12152
 if(libbsd)
   target_link_libraries(Clib PUBLIC LIBBSD::libbsd)
+  target_link_libraries(Core PUBLIC LIBBSD::libbsd)
 endif()
 
 target_include_directories(Core
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
 )
 
-target_sources(Core PRIVATE $<TARGET_OBJECTS:Clib>)
+# link object libraries
+target_link_libraries(Core PRIVATE Clib)
 
 ROOT_INSTALL_HEADERS()

core/dictgen/CMakeLists.txt

@@ -48,6 +48,9 @@ target_include_directories(Dictgen PRIVATE
   ${CLING_INCLUDE_DIRS}
 )
 
+# link object libraries
+target_link_libraries(Dictgen PRIVATE Clib)
+
 # Register the llvm include directories after clangs. This instructs the compiler to resolve
 # headers from our builtin clang. That's an issue when we are building with bultin_llvm=Off
 # and we have installed clang headers, too.

core/metacling/src/CMakeLists.txt

@@ -106,11 +106,11 @@ if (clad)
 endif()
 
 ROOT_LINKER_LIBRARY(Cling
-        $<TARGET_OBJECTS:ClingUtils>
-        $<TARGET_OBJECTS:Dictgen>
-        $<TARGET_OBJECTS:MetaCling>
         LIBRARIES ${CLING_LIBRARIES} ${LINK_LIBS} ${CLING_PLUGIN_LINK_LIBS})
 
+# link object libraries
+target_link_libraries(Cling PRIVATE ClingUtils Dictgen MetaCling)
+
 string(TOUPPER "${LLVM_BUILD_TYPE}" THE_BUILD_TYPE)
 if("${THE_BUILD_TYPE}" STREQUAL DEBUG OR "${THE_BUILD_TYPE}" STREQUAL RELWITHDEBINFO)
   # When these two link at the same time, they can exhaust the RAM on many machines, since they both link against llvm.

core/rootcling_stage1/CMakeLists.txt

@@ -23,13 +23,12 @@ if(NOT builtin_clang)
 endif()
 
 ROOT_EXECUTABLE(rootcling_stage1 src/rootcling_stage1.cxx
-                              $<TARGET_OBJECTS:Clib>
-                              $<TARGET_OBJECTS:ClingUtils>
-                              $<TARGET_OBJECTS:Dictgen>
-                              $<TARGET_OBJECTS:Foundation_Stage1>
                               LIBRARIES ${CLING_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${ROOT_ATOMIC_LIBS}
                               NOINSTALL)
 
+# link object libraries
+target_link_libraries(rootcling_stage1 Clib ClingUtils Dictgen Foundation_Stage1)
+
 target_include_directories(rootcling_stage1 PRIVATE
    ${CMAKE_SOURCE_DIR}/core/foundation/inc    # for RConfig.hxx
    ${CMAKE_SOURCE_DIR}/core/dictgen/res # for rootcling_impl.h

rootx/CMakeLists.txt

@@ -13,7 +13,6 @@ if(x11)
   ROOT_EXECUTABLE(root
     src/rootx.cxx
     src/rootxx.cxx
-    ../core/clib/src/strlcpy.c
   )
   target_include_directories(root
     PRIVATE
@@ -24,6 +23,7 @@ if(x11)
       ${X11_Xft_LIB}
       ${X11_Xpm_LIB}
       ${X11_LIBRARIES}
+      Clib # for strlcpy/strlcat
   )
 
 if (CMAKE_SYSTEM_NAME MATCHES FreeBSD)