Changeset 20068


Ignore:
Timestamp:
04/12/21 14:45:56 (2 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/CMakeLists.txt

    r20060 r20068  
    732732   TARGET_LINK_LIBRARIES(fitsdump ${HELP++LIBS} ${ROOT_LIBRARIES} ZLIB::ZLIB)
    733733   MANPAGE(fitsdump "FACT++ - fitsdump - Read and dump contents of a FITStable")
     734   # This is a hack to suppress warnings from root headers (-isystem)
     735   TARGET_INCLUDE_DIRECTORIES(fitsdump SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
    734736
    735737   ADD_EXECUTABLE(rootifysql src/rootifysql.cc)
    736738   TARGET_LINK_LIBRARIES(rootifysql ${HELP++LIBS} OpenSSL::SSL ${ROOT_LIBRARIES})
    737739   MANPAGE(rootifysql "FACT++ - rootifysql - Write result of a SQL query into a root-file")
     740   # This is a hack to suppress warnings from root headers (-isystem)
     741   TARGET_INCLUDE_DIRECTORIES(rootifysql SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
     742
    738743   ADD_EXECUTABLE(root2sql src/root2sql.cc)
    739744   TARGET_LINK_LIBRARIES(root2sql ${HELP++LIBS} OpenSSL::SSL ${MYSQLPP_LIBRARY} ${ROOT_LIBRARIES})
    740745   MANPAGE(root2sql "FACT++ - root2sql - Fill contents of a root-tree into a MySQL database")
     746   # This is a hack to suppress warnings from root headers (-isystem)
     747   TARGET_INCLUDE_DIRECTORIES(root2sql SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
    741748
    742749   ADD_EXECUTABLE(root2csv src/root2csv.cc)
    743750   TARGET_LINK_LIBRARIES(root2csv ${HELP++LIBS} ${ROOT_LIBRARIES})
    744751   MANPAGE(root2csv "FACT++ - root2csv - Convert a root-tree to a csv file")
     752   # This is a hack to suppress warnings from root headers (-isystem)
     753   TARGET_INCLUDE_DIRECTORIES(root2csv SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
    745754
    746755   ADD_EXECUTABLE(csv2root src/csv2root.cc)
    747756   TARGET_LINK_LIBRARIES(csv2root ${HELP++LIBS} ${ROOT_LIBRARIES})
    748757   MANPAGE(csv2root "FACT++ - csv2root - Convert a csv file to a root-tree")
     758   # This is a hack to suppress warnings from root headers (-isystem)
     759   TARGET_INCLUDE_DIRECTORIES(csv2root SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
    749760ENDIF()
    750761
     
    773784   TARGET_LINK_LIBRARIES(calcsource ${HELP++LIBS} ${ROOT_LIBRARIES})
    774785   MANPAGE(calcsource "")
     786   # This is a hack to suppress warnings from root headers (-isystem)
     787   TARGET_INCLUDE_DIRECTORIES(calcsource SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
    775788
    776789   ADD_EXECUTABLE(calcsourcemc src/calcsourcemc.cc)
    777790   TARGET_LINK_LIBRARIES(calcsourcemc ${HELP++LIBS} ${ROOT_LIBRARIES})
    778791   MANPAGE(calcsourcemc "")
     792   # This is a hack to suppress warnings from root headers (-isystem)
     793   TARGET_INCLUDE_DIRECTORIES(calcsourcemc SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
    779794ENDIF()
    780795
     
    783798ADD_RESOURCES(spectrum/analysis.sql spectrum/data.sql spectrum/simulation.sql spectrum/spectrum.sql spectrum/summary-est.sql spectrum/summary-sim.sql)
    784799MANPAGE(spectrum "")
     800# This is a hack to suppress warnings from root headers (-isystem)
     801TARGET_INCLUDE_DIRECTORIES(spectrum SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
    785802
    786803ADD_EXECUTABLE(getevent src/getevent.cc)
    787 TARGET_LINK_LIBRARIES(getevent ${HELP++LIBS} ZLIB::ZLIB)
     804TARGET_LINK_LIBRARIES(getevent ${HELP++LIBS} ZLIB::ZLIB Threads::Threads)
    788805MANPAGE(getevent "")
    789806
     
    795812   ADD_EXECUTABLE(makeplots src/makeplots.cc)
    796813   TARGET_LINK_LIBRARIES(makeplots  ${HELP++LIBS} ${ROOT_LIBRARIES})
     814   # This is a hack to suppress warnings from root headers (-isystem)
     815   TARGET_INCLUDE_DIRECTORIES(makeplots SYSTEM PUBLIC ${ROOT_INCLUDE_DIRS})
    797816   MANPAGE(makeplots "")
    798817ENDIF()
Note: See TracChangeset for help on using the changeset viewer.