Skip to content

[net,sql] add headers to private file_sets #23981

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

Merged
guitargeek merged 2 commits into from
Nov 9, 2026
Merged

[net,sql] add headers to private file_sets #23981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33f1cb3
[net] add headers to private file_sets
ferdymercury Nov 4, 2026
ce9a456
[sql] add headers to private file_sets
ferdymercury Nov 4, 2026
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
22 changes: 19 additions & 3 deletions net/curl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@
# @author Jakob Blomer, CERN
############################################################################

set(RCURLHTTP_HEADERS
ROOT/RCurlConnection.hxx
ROOT/RRawFileCurl.hxx
TCurlFile.h
)

ROOT_STANDARD_LIBRARY_PACKAGE(RCurlHttp
HEADERS
ROOT/RCurlConnection.hxx
ROOT/RRawFileCurl.hxx
TCurlFile.h
${RCURLHTTP_HEADERS}
SOURCES
src/RCurlConnection.cxx
src/RRawFileCurl.cxx
Expand All @@ -21,6 +25,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RCurlHttp
RIO
)

set(RELATIVE_INC_HEADERS ${RCURLHTTP_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(RCurlHttp
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
)

if(NOT MSVC)
target_compile_options(RCurlHttp PRIVATE -Wno-deprecated-declarations)
endif()
Expand Down
24 changes: 21 additions & 3 deletions net/davix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@
# @author Pere Mato, CERN
############################################################################

set(RDAVIX_HEADERS
ROOT/RRawFileDavix.hxx
TDavixFile.h
TDavixSystem.h
)

ROOT_STANDARD_LIBRARY_PACKAGE(RDAVIX
HEADERS
ROOT/RRawFileDavix.hxx
TDavixFile.h
TDavixSystem.h
${RDAVIX_HEADERS}
SOURCES
src/RRawFileDavix.cxx
src/TDavixFile.cxx
Expand All @@ -26,6 +30,20 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RDAVIX
RIO
)

set(RELATIVE_INC_HEADERS ${RDAVIX_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(RDAVIX
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/ src/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
src/TDavixFileInternal.h
src/utils.h
)

target_compile_options(RDAVIX PRIVATE -Wno-deprecated-declarations)

ROOT_ADD_TEST_SUBDIRECTORY(test)
32 changes: 26 additions & 6 deletions net/http/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,18 @@ if(NOT FASTCGI_FOUND)
set(FASTCGI_LIBRARY "")
endif()

set(RHTTP_HEADERS
THttpCallArg.h
THttpEngine.h
THttpServer.h
THttpWSHandler.h
TRootSniffer.h
TRootSnifferStore.h
)

ROOT_STANDARD_LIBRARY_PACKAGE(RHTTP
HEADERS
THttpCallArg.h
THttpEngine.h
THttpServer.h
THttpWSHandler.h
TRootSniffer.h
TRootSnifferStore.h
${RHTTP_HEADERS}
SOURCES
src/TCivetweb.cxx
src/TCivetweb.h
Expand All @@ -44,6 +48,22 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RHTTP
RIO
)

set(RELATIVE_INC_HEADERS ${RHTTP_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(RHTTP
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/ src/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
src/TCivetweb.h
src/TFastCgi.h
src/THttpLongPollEngine.h
src/THttpWSEngine.h
)

if(TARGET FastCGI::FastCGI)
target_link_libraries(RHTTP PRIVATE FastCGI::FastCGI)
else()
Expand Down
19 changes: 18 additions & 1 deletion net/httpsniff/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@
# @author Sergey Linev, GSI
############################################################################

set(RHTTPSNIFF_HEADERS
TRootSnifferFull.h
)

ROOT_STANDARD_LIBRARY_PACKAGE(RHTTPSniff
HEADERS
TRootSnifferFull.h
${RHTTPSNIFF_HEADERS}
SOURCES
src/TRootSnifferFull.cxx
DEPENDENCIES
Expand All @@ -25,4 +29,17 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RHTTPSniff
XMLIO
)

set(RELATIVE_INC_HEADERS ${RHTTPSNIFF_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(RHTTPSniff
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
)


ROOT_ADD_TEST_SUBDIRECTORY(test)
71 changes: 44 additions & 27 deletions net/net/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,39 @@
# CMakeLists.txt file for building ROOT net/net package
############################################################################

set(NET_HEADERS
NetErrors.h
RRemoteProtocol.h
TApplicationRemote.h
TApplicationServer.h
TFileStager.h
TGrid.h
TGridCollection.h
TGridJDL.h
TGridJob.h
TGridJobStatus.h
TGridJobStatusList.h
TGridResult.h
TMessage.h
TMonitor.h
TParallelMergingFile.h
TPServerSocket.h
TPSocket.h
TServerSocket.h
TSocket.h
TSQLColumnInfo.h
TSQLMonitoring.h
TSQLResult.h
TSQLRow.h
TSQLServer.h
TSQLStatement.h
TSQLTableInfo.h
TUDPSocket.h
)

ROOT_STANDARD_LIBRARY_PACKAGE(Net
HEADERS
NetErrors.h
RRemoteProtocol.h
TApplicationRemote.h
TApplicationServer.h
TFileStager.h
TGrid.h
TGridCollection.h
TGridJDL.h
TGridJob.h
TGridJobStatus.h
TGridJobStatusList.h
TGridResult.h
TMessage.h
TMonitor.h
TParallelMergingFile.h
TPServerSocket.h
TPSocket.h
TServerSocket.h
TSocket.h
TSQLColumnInfo.h
TSQLMonitoring.h
TSQLResult.h
TSQLRow.h
TSQLServer.h
TSQLStatement.h
TSQLTableInfo.h
TUDPSocket.h
${NET_HEADERS}
SOURCES
src/NetErrors.cxx
src/TApplicationRemote.cxx
Expand Down Expand Up @@ -73,4 +77,17 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Net
# Suppress deprecation warnings across compilation units and during dictionary generation, remove with NetErrors.h
target_compile_definitions(Net PRIVATE ROOT_NetErrors_cxx)

set(RELATIVE_INC_HEADERS ${NET_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(Net
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
)


ROOT_ADD_TEST_SUBDIRECTORY(test)
24 changes: 20 additions & 4 deletions net/netxng/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@
# @author Lukasz Janyst <ljanyst@cern.ch>
############################################################################

set(NETXNG_HEADERS
TNetXNGFile.h
TNetXNGFileStager.h
TNetXNGSystem.h
ROOT/RRawFileNetXNG.hxx
)

ROOT_STANDARD_LIBRARY_PACKAGE(NetxNG
HEADERS
TNetXNGFile.h
TNetXNGFileStager.h
TNetXNGSystem.h
ROOT/RRawFileNetXNG.hxx
${NETXNG_HEADERS}
SOURCES
src/TNetXNGFile.cxx
src/TNetXNGFileStager.cxx
Expand All @@ -26,6 +30,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(NetxNG
Thread
)

set(RELATIVE_INC_HEADERS ${NETXNG_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(NetxNG
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
)

target_link_libraries(NetxNG PRIVATE XRootD::XrdCl XRootD::XrdUtils)
target_compile_options(NetxNG PRIVATE -Wno-shadow)

Expand Down
24 changes: 20 additions & 4 deletions sql/sqlite/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@
# CMakeLists.txt file for building ROOT sql/sqlite package
############################################################################

set(RSQLITE_HEADERS
TSQLiteResult.h
TSQLiteRow.h
TSQLiteServer.h
TSQLiteStatement.h
)

ROOT_STANDARD_LIBRARY_PACKAGE(RSQLite
HEADERS
TSQLiteResult.h
TSQLiteRow.h
TSQLiteServer.h
TSQLiteStatement.h
${RSQLITE_HEADERS}
SOURCES
src/TSQLiteResult.cxx
src/TSQLiteRow.cxx
Expand All @@ -25,6 +29,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RSQLite
RIO
)

set(RELATIVE_INC_HEADERS ${RSQLITE_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(RSQLite
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
)

target_include_directories(RSQLite SYSTEM PUBLIC ${SQLITE_INCLUDE_DIR})
target_link_libraries(RSQLite PUBLIC ${SQLITE_LIBRARIES})
ROOT_ADD_TEST_SUBDIRECTORY(test)
Loading