Skip to content

Commit cea8b88

Browse files
committed
[cmake] encapsulate builtin dependencies behind CMake target
1 parent 2653dad commit cea8b88

File tree

8 files changed

+5
-13
lines changed

8 files changed

+5
-13
lines changed

builtins/lzma/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ set(LIBLZMA_INCLUDE_DIR ${ROOT_LZMA_PREFIX}/include)
7070
file(MAKE_DIRECTORY ${LIBLZMA_INCLUDE_DIR})
7171

7272
add_library(LibLZMA STATIC IMPORTED GLOBAL)
73+
add_dependencies(LibLZMA::LibLZMA LZMA)
7374
add_library(LibLZMA::LibLZMA ALIAS LibLZMA)
7475
target_include_directories(LibLZMA INTERFACE ${LIBLZMA_INCLUDE_DIR})
7576
set_target_properties(LibLZMA PROPERTIES IMPORTED_LOCATION ${LIBLZMA_LIBRARIES})

core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/include/RConfigure.h
2424

2525
add_custom_target(rconfigure ALL DEPENDS ${CMAKE_BINARY_DIR}/include/RConfigure.h)
2626

27-
ROOT_LINKER_LIBRARY(Core BUILTINS LZMA)
27+
ROOT_LINKER_LIBRARY(Core)
2828

2929
# This sets RUNPATH for libCore, which enables it to dlopen any ROOT library in its directory.
3030
# If omitted, Core might try to load libraries from a ROOT that's installed in the system.

graf2d/graf/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf
9696
Matrix
9797
MathCore
9898
RIO
99-
BUILTINS
100-
FREETYPE
10199
)

graf2d/win32gdk/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Win32gdk
124124
DEPENDENCIES
125125
Core
126126
Graf
127-
BUILTINS
128-
FREETYPE
129127
)
130128

131129
add_dependencies(Win32gdk GDKLIB glib)

graf3d/ftgl/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ ROOT_LINKER_LIBRARY(FTGL
4040
OpenGL::GLU
4141
Freetype::Freetype
4242
ZLIB::ZLIB
43-
BUILTINS
44-
FREETYPE
4543
)
4644

4745
target_include_directories(FTGL PRIVATE

net/http/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ if(builtin_civetweb)
9797
endif()
9898
if(link_ssl)
9999
target_compile_definitions(RHTTP PUBLIC -DNO_SSL_DL)
100-
target_link_libraries(RHTTP PRIVATE ${OPENSSL_LIBRARIES})
100+
target_link_libraries(RHTTP PRIVATE OpenSSL::SSL)
101101
endif()
102102
else()
103103
target_compile_definitions(RHTTP PUBLIC -DNO_SSL)

net/net/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
105105
)
106106

107107
if(ssl)
108-
target_include_directories(Net PRIVATE ${OPENSSL_INCLUDE_DIR})
109-
target_link_libraries(Net PRIVATE ${OPENSSL_LIBRARIES})
108+
target_link_libraries(Net PRIVATE OpenSSL::SSL)
110109
endif()
111110

112111
ROOT_ADD_TEST_SUBDIRECTORY(test)

net/rpdutils/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@ add_dependencies(rpdutil move_headers)
4747

4848
ROOT_LINKER_LIBRARY(SrvAuth rpdutils.cxx DaemonUtils.h DaemonUtils.cxx
4949
LIBRARIES
50-
${OPENSSL_LIBRARIES}
50+
OpenSSL::SSL
5151
rpdutil
5252
rsa
5353
DEPENDENCIES
5454
Net
55-
BUILTINS
56-
OPENSSL
5755
)
5856

5957
target_include_directories(SrvAuth PRIVATE

0 commit comments

Comments
 (0)