diff --git a/net/curl/CMakeLists.txt b/net/curl/CMakeLists.txt index c0771cfcd23d8..630a08a93ff9f 100644 --- a/net/curl/CMakeLists.txt +++ b/net/curl/CMakeLists.txt @@ -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 @@ -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() diff --git a/net/davix/CMakeLists.txt b/net/davix/CMakeLists.txt index bb58ce39ced79..59d9c22a470f9 100644 --- a/net/davix/CMakeLists.txt +++ b/net/davix/CMakeLists.txt @@ -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 @@ -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) diff --git a/net/http/CMakeLists.txt b/net/http/CMakeLists.txt index 593b100830c7a..d523142ab995d 100644 --- a/net/http/CMakeLists.txt +++ b/net/http/CMakeLists.txt @@ -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 @@ -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() diff --git a/net/httpsniff/CMakeLists.txt b/net/httpsniff/CMakeLists.txt index 7541839a8b50e..b968b4ef940b7 100644 --- a/net/httpsniff/CMakeLists.txt +++ b/net/httpsniff/CMakeLists.txt @@ -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 @@ -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) diff --git a/net/net/CMakeLists.txt b/net/net/CMakeLists.txt index 224ae918cf7e0..0fd7ef19105be 100644 --- a/net/net/CMakeLists.txt +++ b/net/net/CMakeLists.txt @@ -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 @@ -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) diff --git a/net/netxng/CMakeLists.txt b/net/netxng/CMakeLists.txt index 5950eb9419636..81e74591b8760 100644 --- a/net/netxng/CMakeLists.txt +++ b/net/netxng/CMakeLists.txt @@ -9,12 +9,16 @@ # @author Lukasz Janyst ############################################################################ +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 @@ -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) diff --git a/sql/sqlite/CMakeLists.txt b/sql/sqlite/CMakeLists.txt index 4de4765e4c569..c07e1a947e152 100644 --- a/sql/sqlite/CMakeLists.txt +++ b/sql/sqlite/CMakeLists.txt @@ -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 @@ -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)