Changeset 20068 for trunk

Timestamp:

04/12/21 14:45:56 (4 years ago)

Author:

tbretz

Message:

With some compilers Threads need to be specified explicitly in getevent, added some hack to suppress compiler warnings in root-header -- they do not help the compilation at all.

File:

• trunk/FACT++/CMakeLists.txt (modified) (4 diffs)

trunk/FACT++/CMakeLists.txt

@@ -732 +732 @@
    TARGET_LINK_LIBRARIES(fitsdump ${HELP++LIBS} ${ROOT_LIBRARIES} ZLIB::ZLIB)
    MANPAGE(fitsdump "FACT++ - fitsdump - Read and dump contents of a FITStable")
+   # This is a hack to suppress warnings from root headers (-isystem)
+   TARGET_INCLUDE_DIRECTORIES(fitsdump SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
 
    ADD_EXECUTABLE(rootifysql src/rootifysql.cc)
    TARGET_LINK_LIBRARIES(rootifysql ${HELP++LIBS} OpenSSL::SSL ${ROOT_LIBRARIES})
    MANPAGE(rootifysql "FACT++ - rootifysql - Write result of a SQL query into a root-file")
+   # This is a hack to suppress warnings from root headers (-isystem)
+   TARGET_INCLUDE_DIRECTORIES(rootifysql SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
+
    ADD_EXECUTABLE(root2sql src/root2sql.cc)
    TARGET_LINK_LIBRARIES(root2sql ${HELP++LIBS} OpenSSL::SSL ${MYSQLPP_LIBRARY} ${ROOT_LIBRARIES})
    MANPAGE(root2sql "FACT++ - root2sql - Fill contents of a root-tree into a MySQL database")
+   # This is a hack to suppress warnings from root headers (-isystem)
+   TARGET_INCLUDE_DIRECTORIES(root2sql SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
 
    ADD_EXECUTABLE(root2csv src/root2csv.cc)
    TARGET_LINK_LIBRARIES(root2csv ${HELP++LIBS} ${ROOT_LIBRARIES})
    MANPAGE(root2csv "FACT++ - root2csv - Convert a root-tree to a csv file")
+   # This is a hack to suppress warnings from root headers (-isystem)
+   TARGET_INCLUDE_DIRECTORIES(root2csv SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
 
    ADD_EXECUTABLE(csv2root src/csv2root.cc)
    TARGET_LINK_LIBRARIES(csv2root ${HELP++LIBS} ${ROOT_LIBRARIES})
    MANPAGE(csv2root "FACT++ - csv2root - Convert a csv file to a root-tree")
+   # This is a hack to suppress warnings from root headers (-isystem)
+   TARGET_INCLUDE_DIRECTORIES(csv2root SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
 ENDIF()
 
@@ -773 +784 @@
    TARGET_LINK_LIBRARIES(calcsource ${HELP++LIBS} ${ROOT_LIBRARIES})
    MANPAGE(calcsource "")
+   # This is a hack to suppress warnings from root headers (-isystem)
+   TARGET_INCLUDE_DIRECTORIES(calcsource SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
 
    ADD_EXECUTABLE(calcsourcemc src/calcsourcemc.cc)
    TARGET_LINK_LIBRARIES(calcsourcemc ${HELP++LIBS} ${ROOT_LIBRARIES})
    MANPAGE(calcsourcemc "")
+   # This is a hack to suppress warnings from root headers (-isystem)
+   TARGET_INCLUDE_DIRECTORIES(calcsourcemc SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
 ENDIF()
 
@@ -783 +798 @@
 ADD_RESOURCES(spectrum/analysis.sql spectrum/data.sql spectrum/simulation.sql spectrum/spectrum.sql spectrum/summary-est.sql spectrum/summary-sim.sql)
 MANPAGE(spectrum "")
+# This is a hack to suppress warnings from root headers (-isystem)
+TARGET_INCLUDE_DIRECTORIES(spectrum SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
 
 ADD_EXECUTABLE(getevent src/getevent.cc)
-TARGET_LINK_LIBRARIES(getevent ${HELP++LIBS} ZLIB::ZLIB)
+TARGET_LINK_LIBRARIES(getevent ${HELP++LIBS} ZLIB::ZLIB Threads::Threads)
 MANPAGE(getevent "")
 
@@ -795 +812 @@
    ADD_EXECUTABLE(makeplots src/makeplots.cc)
    TARGET_LINK_LIBRARIES(makeplots  ${HELP++LIBS} ${ROOT_LIBRARIES})
+   # This is a hack to suppress warnings from root headers (-isystem)
+   TARGET_INCLUDE_DIRECTORIES(makeplots SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
    MANPAGE(makeplots "")
 ENDIF()