Skip to content
Snippets Groups Projects
Unverified Commit 378f961f authored by Sergey Linev's avatar Sergey Linev Committed by GitHub
Browse files

More use of target_include_directories in cmake (#5269) 

In many places incldues are not required for the dictionary generation, 
therefore target_include_directories can be used
parent 9a5dca21
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 57 additions and 34 deletions
graf2d/graf/CMakeLists.txt
+ 2
− 2
View file @ 378f961f
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
# @author Pere Mato, CERN # @author Pere Mato, CERN
############################################################################ ############################################################################
include_directories(${FREETYPE_INCLUDE_DIRS})
ROOT_STANDARD_LIBRARY_PACKAGE(Graf ROOT_STANDARD_LIBRARY_PACKAGE(Graf
HEADERS HEADERS
TArc.h TArc.h
...@@ -101,3 +99,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf ...@@ -101,3 +99,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf
BUILTINS BUILTINS
FREETYPE FREETYPE
) )
target_include_directories(Graf PRIVATE ${FREETYPE_INCLUDE_DIRS})
graf2d/gviz/CMakeLists.txt
+ 2
− 2
View file @ 378f961f
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
# @author Pere Mato, CERN # @author Pere Mato, CERN
############################################################################ ############################################################################
include_directories(${GRAPHVIZ_INCLUDE_DIR}/graphviz)
ROOT_STANDARD_LIBRARY_PACKAGE(Gviz ROOT_STANDARD_LIBRARY_PACKAGE(Gviz
HEADERS HEADERS
TGraphEdge.h TGraphEdge.h
...@@ -28,3 +26,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Gviz ...@@ -28,3 +26,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Gviz
Hist Hist
Graf Graf
) )
target_include_directories(Gviz PRIVATE ${GRAPHVIZ_INCLUDE_DIR}/graphviz)
graf2d/x11ttf/CMakeLists.txt
+ 2
− 2
View file @ 378f961f
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
# @author Pere Mato, CERN # @author Pere Mato, CERN
############################################################################ ############################################################################
include_directories(${FREETYPE_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
ROOT_STANDARD_LIBRARY_PACKAGE(GX11TTF ROOT_STANDARD_LIBRARY_PACKAGE(GX11TTF
HEADERS HEADERS
TGX11TTF.h TGX11TTF.h
...@@ -29,3 +27,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GX11TTF ...@@ -29,3 +27,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GX11TTF
GX11 GX11
Graf Graf
) )
target_include_directories(GX11TTF PRIVATE ${FREETYPE_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
graf3d/ftgl/CMakeLists.txt
+ 5
− 2
View file @ 378f961f
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
# CMakeLists.txt file for building ROOT graf3d/ftgl package # CMakeLists.txt file for building ROOT graf3d/ftgl package
############################################################################ ############################################################################
include_directories(${FREETYPE_INCLUDE_DIRS})
if(MACOSX_GLU_DEPRECATED) if(MACOSX_GLU_DEPRECATED)
add_definitions(-Wno-deprecated-declarations) add_definitions(-Wno-deprecated-declarations)
endif() endif()
...@@ -46,4 +44,9 @@ ROOT_LINKER_LIBRARY(FTGL ...@@ -46,4 +44,9 @@ ROOT_LINKER_LIBRARY(FTGL
FREETYPE FREETYPE
) )
target_include_directories(FTGL PRIVATE
${FREETYPE_INCLUDE_DIRS}
${OPENGL_INCLUDE_DIR}
)
ROOT_INSTALL_HEADERS() ROOT_INSTALL_HEADERS()
graf3d/gl/CMakeLists.txt
+ 14
− 5
View file @ 378f961f
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
# CMakeLists.txt file for building ROOT graf3d/gl package # CMakeLists.txt file for building ROOT graf3d/gl package
############################################################################ ############################################################################
include_directories(${OPENGL_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
if(WIN32 OR cocoa) if(WIN32 OR cocoa)
set(installoptions FILTER "TX11GL") set(installoptions FILTER "TX11GL")
endif() endif()
...@@ -19,11 +17,9 @@ if(x11) ...@@ -19,11 +17,9 @@ if(x11)
set(RGL_EXTRA_SOURCES TX11GL.cxx) set(RGL_EXTRA_SOURCES TX11GL.cxx)
endif() endif()
if(builtin_gl2ps) if(builtin_gl2ps)
include_directories(src/gl2ps)
set(RGL_EXTRA_SOURCES ${RGL_EXTRA_SOURCES} src/gl2ps.cxx) set(RGL_EXTRA_SOURCES ${RGL_EXTRA_SOURCES} src/gl2ps.cxx)
else()
include_directories(${GL2PS_INCLUDE_DIRS})
endif() endif()
set_source_files_properties(src/TGLFontManager.cxx PROPERTIES COMPILE_FLAGS "${FTGL_CFLAGS}") set_source_files_properties(src/TGLFontManager.cxx PROPERTIES COMPILE_FLAGS "${FTGL_CFLAGS}")
...@@ -221,6 +217,19 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL ...@@ -221,6 +217,19 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL
${installoptions} ${installoptions}
) )
target_include_directories(RGL PRIVATE
${OPENGL_INCLUDE_DIR}
${FTGL_INCLUDE_DIR}
${FREETYPE_INCLUDE_DIRS}
)
if(builtin_gl2ps)
target_include_directories(RGL PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/gl2ps)
else()
target_include_directories(RGL PRIVATE ${GL2PS_INCLUDE_DIRS})
endif()
if(MACOSX_GLU_DEPRECATED) if(MACOSX_GLU_DEPRECATED)
target_compile_options(RGL PRIVATE -Wno-deprecated-declarations) target_compile_options(RGL PRIVATE -Wno-deprecated-declarations)
endif() endif()
graf3d/x3d/CMakeLists.txt
+ 2
− 2
View file @ 378f961f
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
# CMakeLists.txt file for building ROOT graf3d/x3d package # CMakeLists.txt file for building ROOT graf3d/x3d package
############################################################################ ############################################################################
include_directories(${X11_INCLUDE_DIR})
ROOT_STANDARD_LIBRARY_PACKAGE(X3d ROOT_STANDARD_LIBRARY_PACKAGE(X3d
HEADERS HEADERS
TViewerX3D.h TViewerX3D.h
...@@ -24,3 +22,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(X3d ...@@ -24,3 +22,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(X3d
Graf3d Graf3d
Gui Gui
) )
target_include_directories(X3d PRIVATE ${X11_INCLUDE_DIR})
gui/gui/CMakeLists.txt
+ 2
− 2
View file @ 378f961f
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
# CMakeLists.txt file for building ROOT gui/gui package # CMakeLists.txt file for building ROOT gui/gui package
############################################################################ ############################################################################
include_directories(${CMAKE_SOURCE_DIR}/gui/ged/inc)
ROOT_STANDARD_LIBRARY_PACKAGE(Gui ROOT_STANDARD_LIBRARY_PACKAGE(Gui
HEADERS HEADERS
HelpText.h HelpText.h
...@@ -207,3 +205,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Gui ...@@ -207,3 +205,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Gui
Graf Graf
MathCore MathCore
) )
target_include_directories(Gui PRIVATE ${CMAKE_SOURCE_DIR}/gui/ged/inc)
io/gfal/CMakeLists.txt
+ 2
− 2
View file @ 378f961f
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
# CMakeLists.txt file for building ROOT io/gfal package # CMakeLists.txt file for building ROOT io/gfal package
############################################################################ ############################################################################
include_directories(${GFAL_INCLUDE_DIRS})
add_definitions(-D_FILE_OFFSET_BITS=64) add_definitions(-D_FILE_OFFSET_BITS=64)
ROOT_STANDARD_LIBRARY_PACKAGE(GFAL ROOT_STANDARD_LIBRARY_PACKAGE(GFAL
...@@ -17,3 +15,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GFAL ...@@ -17,3 +15,5 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GFAL
SOURCES src/TGFALFile.cxx SOURCES src/TGFALFile.cxx
LIBRARIES ${GFAL_LIBRARIES} LIBRARIES ${GFAL_LIBRARIES}
DEPENDENCIES Core Net RIO) DEPENDENCIES Core Net RIO)
target_include_directories(GFAL PRIVATE ${GFAL_INCLUDE_DIRS})
io/xmlparser/CMakeLists.txt
+ 6
− 3
View file @ 378f961f
...@@ -9,9 +9,6 @@ ...@@ -9,9 +9,6 @@
# @author Pere Mato, CERN # @author Pere Mato, CERN
############################################################################ ############################################################################
# needed to propagate includes to rootling
include_directories(${LIBXML2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIRS})
ROOT_STANDARD_LIBRARY_PACKAGE(XMLParser ROOT_STANDARD_LIBRARY_PACKAGE(XMLParser
HEADERS HEADERS
TDOMParser.h TDOMParser.h
...@@ -31,6 +28,12 @@ ROOT_STANDARD_LIBRARY_PACKAGE(XMLParser ...@@ -31,6 +28,12 @@ ROOT_STANDARD_LIBRARY_PACKAGE(XMLParser
Core Core
) )
# not needed to propagate includes to rootcling
target_include_directories(XMLParser PRIVATE
${LIBXML2_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIRS}
)
target_link_libraries(XMLParser target_link_libraries(XMLParser
PRIVATE PRIVATE
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
......
math/rtools/CMakeLists.txt
+ 2
− 0
View file @ 378f961f
...@@ -21,5 +21,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Rtools ...@@ -21,5 +21,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Rtools
NO_CXXMODULE NO_CXXMODULE
) )
target_include_directories(Rtools PRIVATE ${R_INCLUDE_DIRS})
file(COPY "${CMAKE_SOURCE_DIR}/etc/plugins/ROOT@@Math@@Minimizer/P090_RMinimizer.C" file(COPY "${CMAKE_SOURCE_DIR}/etc/plugins/ROOT@@Math@@Minimizer/P090_RMinimizer.C"
DESTINATION "${CMAKE_BINARY_DIR}/etc/plugins/ROOT@@Math@@Minimizer/") DESTINATION "${CMAKE_BINARY_DIR}/etc/plugins/ROOT@@Math@@Minimizer/")
math/vecops/CMakeLists.txt
+ 4
− 2
View file @ 378f961f
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
if(builtin_vdt) if(builtin_vdt)
link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
include_directories(${HEADER_OUTPUT_PATH})
endif() endif()
ROOT_STANDARD_LIBRARY_PACKAGE(ROOTVecOps ROOT_STANDARD_LIBRARY_PACKAGE(ROOTVecOps
...@@ -26,11 +25,14 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTVecOps ...@@ -26,11 +25,14 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTVecOps
Core Core
) )
if(builtin_vdt OR vdt)
target_include_directories(ROOTVecOps PRIVATE ${VDT_INCLUDE_DIRS} INTERFACE $<BUILD_INTERFACE:${VDT_INCLUDE_DIRS}>)
endif()
if(builtin_vdt) if(builtin_vdt)
target_link_libraries(ROOTVecOps PRIVATE ${VDT_LIBRARIES}) target_link_libraries(ROOTVecOps PRIVATE ${VDT_LIBRARIES})
elseif(vdt) elseif(vdt)
target_link_libraries(ROOTVecOps PUBLIC ${VDT_LIBRARIES}) target_link_libraries(ROOTVecOps PUBLIC ${VDT_LIBRARIES})
target_include_directories(ROOTVecOps PUBLIC ${VDT_INCLUDE_DIRS})
endif() endif()
if(MSVC) if(MSVC)
......
montecarlo/pythia8/CMakeLists.txt
+ 3
− 1
View file @ 378f961f
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
# @author Pere Mato, CERN # @author Pere Mato, CERN
############################################################################ ############################################################################
# required also for cling
include_directories(${PYTHIA8_INCLUDE_DIR})
ROOT_STANDARD_LIBRARY_PACKAGE(EGPythia8 ROOT_STANDARD_LIBRARY_PACKAGE(EGPythia8
HEADERS HEADERS
TPythia8.h TPythia8.h
...@@ -30,5 +33,4 @@ ROOT_ADD_CXX_FLAG(_EGPythia8_FLAGS -Wno-overloaded-virtual) ...@@ -30,5 +33,4 @@ ROOT_ADD_CXX_FLAG(_EGPythia8_FLAGS -Wno-overloaded-virtual)
separate_arguments(_EGPythia8_FLAGS) separate_arguments(_EGPythia8_FLAGS)
target_compile_options(EGPythia8 PRIVATE ${_EGPythia8_FLAGS}) target_compile_options(EGPythia8 PRIVATE ${_EGPythia8_FLAGS})
target_include_directories(EGPythia8 PUBLIC ${PYTHIA8_INCLUDE_DIR})
target_link_libraries(EGPythia8 PUBLIC ${PYTHIA8_LIBRARIES}) target_link_libraries(EGPythia8 PUBLIC ${PYTHIA8_LIBRARIES})
net/http/CMakeLists.txt
+ 9
− 7
View file @ 378f961f
...@@ -9,16 +9,10 @@ ...@@ -9,16 +9,10 @@
# @author Pere Mato, CERN # @author Pere Mato, CERN
############################################################################ ############################################################################
if(FASTCGI_FOUND) if(NOT FASTCGI_FOUND)
include_directories(${FASTCGI_INCLUDE_DIR})
else()
set(FASTCGI_LIBRARY "") set(FASTCGI_LIBRARY "")
endif() endif()
if(ssl)
include_directories(${OPENSSL_INCLUDE_DIR})
endif()
# look for the realtime extensions library and use it if it exists # look for the realtime extensions library and use it if it exists
find_library(RT_LIBRARY rt) find_library(RT_LIBRARY rt)
if(RT_LIBRARY) if(RT_LIBRARY)
...@@ -60,6 +54,14 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RHTTP ...@@ -60,6 +54,14 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RHTTP
Graf Graf
) )
if(ssl)
target_include_directories(RHTTP PRIVATE ${OPENSSL_INCLUDE_DIR})
endif()
if(FASTCGI_FOUND)
target_include_directories(RHTTP PRIVATE ${FASTCGI_INCLUDE_DIR})
endif()
target_compile_definitions(RHTTP PUBLIC -DUSE_WEBSOCKET) target_compile_definitions(RHTTP PUBLIC -DUSE_WEBSOCKET)
if(ssl) if(ssl)
......
net/netxng/CMakeLists.txt
+ 2
− 2
View file @ 378f961f
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
# @author Lukasz Janyst <ljanyst@cern.ch> # @author Lukasz Janyst <ljanyst@cern.ch>
############################################################################ ############################################################################
include_directories(${XROOTD_INCLUDE_DIRS})
ROOT_STANDARD_LIBRARY_PACKAGE(NetxNG ROOT_STANDARD_LIBRARY_PACKAGE(NetxNG
HEADERS HEADERS
TNetXNGFile.h TNetXNGFile.h
...@@ -30,4 +28,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(NetxNG ...@@ -30,4 +28,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(NetxNG
XROOTD XROOTD
) )
target_include_directories(NetxNG PRIVATE ${XROOTD_INCLUDE_DIRS})
target_compile_options(NetxNG PRIVATE -Wno-shadow) target_compile_options(NetxNG PRIVATE -Wno-shadow)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment