Skip to content

[CMake] Link only what is used: drop unused explicit library deps #22669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guitargeek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[CMake] Link only what is used: drop unused explicit library deps #22669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions graf3d/csg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RCsg
CsgOps.h
SOURCES
CsgOps.cxx
DEPENDENCIES
MathCore
LIBRARIES
MathCore
)
1 change: 0 additions & 1 deletion hist/hbook/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Hbook
minicern
DEPENDENCIES
Hist
Matrix
Tree
Graf
TreePlayer
Expand Down
1 change: 1 addition & 0 deletions hist/histpainter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(HistPainter
Graf
Hist
MathCore
LIBRARIES
Matrix
)
1 change: 0 additions & 1 deletion hist/spectrum/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Spectrum
-writeEmptyRootPCM
DEPENDENCIES
Hist
Matrix
)
2 changes: 1 addition & 1 deletion io/io/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ ROOT_LINKER_LIBRARY(RIO
$<TARGET_OBJECTS:RootPcmObjs>
LIBRARIES
${CMAKE_DL_LIBS}
Thread
DEPENDENCIES
Core
Thread
)

target_include_directories(RIO PRIVATE ${CMAKE_SOURCE_DIR}/core/clib/res)
Expand Down
2 changes: 1 addition & 1 deletion net/http/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RHTTP
${_civetweb_libs}
${FASTCGI_LIBRARY}
${CMAKE_DL_LIBS}
Thread
DEPENDENCIES
RIO
Thread
)

if(builtin_civetweb)
Expand Down
1 change: 0 additions & 1 deletion roofit/histfactory/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(HistFactory
Tree
RIO
Hist
Matrix
MathCore
Graf
Gpad
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if (roofit_multiprocess)
endif()

if(mathmore)
list(APPEND ROOFITMORE_LIBRARIES RooFitMore)
list(APPEND ROOFITMORE_LIBRARIES RooFitMore MathMore)
endif()

#--stressRooFit----------------------------------------------------------------------------------
Expand Down
5 changes: 2 additions & 3 deletions roofit/roofitmore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitMore
LINKDEF
LinkDef.h
DEPENDENCIES
${ROOT_MATHMORE_LIBRARY}
Core
RooFitCore
RooFit
Hist
Matrix
Tree
RIO
LIBRARIES
${ROOT_MATHMORE_LIBRARY}
MathCore
Foam
${EXTRA_DICT_OPTS}
)

Expand Down
5 changes: 3 additions & 2 deletions roofit/roostats/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,11 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooStats
Hist
Matrix
MathCore
Minuit
Foam
Graf
Gpad
LIBRARIES
Minuit
Foam
${EXTRA_DICT_OPTS}
)

Expand Down
2 changes: 1 addition & 1 deletion tree/ntuple/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ endif()
ROOT_ADD_GTEST(ntuple_field_name ntuple_field_name.cxx LIBRARIES ROOTNTuple)
ROOT_ADD_GTEST(ntuple_join_table ntuple_join_table.cxx LIBRARIES ROOTNTuple)
ROOT_ADD_GTEST(ntuple_merger ntuple_merger.cxx ntuple_test.cxx
LIBRARIES ROOTNTuple CustomStruct ZLIB::ZLIB Tree xxHash::xxHash
LIBRARIES ROOTNTuple CustomStruct ZLIB::ZLIB Tree MathCore xxHash::xxHash
INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/tree/tree/inc)
ROOT_ADD_GTEST(ntuple_metrics ntuple_metrics.cxx LIBRARIES ROOTNTuple)
ROOT_ADD_GTEST(ntuple_model ntuple_model.cxx LIBRARIES ROOTNTuple CustomStruct)
Expand Down
9 changes: 5 additions & 4 deletions tree/tree/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
############################################################################

if (imt)
list(APPEND TREE_EXTRA_DEPENDENCIES Imt)
list(APPEND TREE_EXTRA_LIBRARIES Imt)
endif(imt)

ROOT_STANDARD_LIBRARY_PACKAGE(Tree
Expand Down Expand Up @@ -124,12 +124,13 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Tree
DICTIONARY_OPTIONS
-writeEmptyRootPCM
DEPENDENCIES
${TREE_EXTRA_DEPENDENCIES}
Net
RIO
MathCore
LIBRARIES
${ROOT_ATOMIC_LIBS}
${TREE_EXTRA_LIBRARIES}
Net
Thread
MathCore
)

ROOT_ADD_TEST_SUBDIRECTORY(test)
Loading