Skip to content
Snippets Groups Projects
Commit 09716b81 authored by Hadrien Benjamin Grasland's avatar Hadrien Benjamin Grasland
Browse files

Support boost 1.67

parent d7b4ebe0
No related branches found
No related tags found
1 merge request!743Support Boost 1.67+
...@@ -2,7 +2,7 @@ gaudi_subdir(GaudiCoreSvc) ...@@ -2,7 +2,7 @@ gaudi_subdir(GaudiCoreSvc)
gaudi_depends_on_subdirs(GaudiKernel) gaudi_depends_on_subdirs(GaudiKernel)
find_package(Boost COMPONENTS system filesystem regex thread python REQUIRED) find_package(Boost COMPONENTS system filesystem regex thread python27 REQUIRED)
find_package(TBB REQUIRED) find_package(TBB REQUIRED)
find_package(PythonLibs REQUIRED) find_package(PythonLibs REQUIRED)
find_package(ROOT REQUIRED) find_package(ROOT REQUIRED)
......
...@@ -5,7 +5,7 @@ gaudi_depends_on_subdirs(GaudiKernel GaudiUtils GaudiGSL GaudiAlg RootCnv) ...@@ -5,7 +5,7 @@ gaudi_depends_on_subdirs(GaudiKernel GaudiUtils GaudiGSL GaudiAlg RootCnv)
find_package(AIDA) find_package(AIDA)
find_package(HepPDT) find_package(HepPDT)
find_package(ROOT COMPONENTS Tree RIO Hist Net REQUIRED) find_package(ROOT COMPONENTS Tree RIO Hist Net REQUIRED)
find_package(Boost COMPONENTS python REQUIRED) find_package(Boost COMPONENTS python27 REQUIRED)
find_package(CLHEP) find_package(CLHEP)
find_package(GSL) find_package(GSL)
find_package(PythonLibs REQUIRED) find_package(PythonLibs REQUIRED)
...@@ -142,9 +142,9 @@ if(NOT StatusCodeHeaderData_previous STREQUAL StatusCodeHeaderData) ...@@ -142,9 +142,9 @@ if(NOT StatusCodeHeaderData_previous STREQUAL StatusCodeHeaderData)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/HackedStatusCode.h" "${StatusCodeHeaderData}") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/HackedStatusCode.h" "${StatusCodeHeaderData}")
endif() endif()
if(Boost_PYTHON_FOUND) if(Boost_PYTHON27_FOUND)
gaudi_add_python_module(PyExample src/PythonModule/*.cpp gaudi_add_python_module(PyExample src/PythonModule/*.cpp
LINK_LIBRARIES ${Boost_PYTHON_LIBRARY} LINK_LIBRARIES ${Boost_PYTHON27_LIBRARY}
INCLUDE_DIRS Boost PythonLibs) INCLUDE_DIRS Boost PythonLibs)
endif() endif()
......
...@@ -4,7 +4,7 @@ gaudi_depends_on_subdirs(GaudiKernel GaudiAlg) ...@@ -4,7 +4,7 @@ gaudi_depends_on_subdirs(GaudiKernel GaudiAlg)
if (CMAKE_SYSTEM_NAME MATCHES Linux) if (CMAKE_SYSTEM_NAME MATCHES Linux)
find_package(Boost COMPONENTS python REQUIRED) find_package(Boost COMPONENTS python27 REQUIRED)
find_package(PythonLibs REQUIRED) find_package(PythonLibs REQUIRED)
find_package(unwind) find_package(unwind)
find_package(gperftools) find_package(gperftools)
...@@ -29,8 +29,8 @@ if(UNWIND_FOUND AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") ...@@ -29,8 +29,8 @@ if(UNWIND_FOUND AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
INCLUDE_DIRS unwind ZLIB) INCLUDE_DIRS unwind ZLIB)
gaudi_add_python_module(PyCPUFamily src/python/CPUFamily.cpp gaudi_add_python_module(PyCPUFamily src/python/CPUFamily.cpp
LINK_LIBRARIES ${Boost_PYTHON_LIBRARY} LINK_LIBRARIES ${Boost_PYTHON27_LIBRARY}
INCLUDE_DIRS PythonLibs) INCLUDE_DIRS Boost PythonLibs)
gaudi_add_executable(GaudiGenProfilingHtml src/app/pfm_gen_analysis.cpp gaudi_add_executable(GaudiGenProfilingHtml src/app/pfm_gen_analysis.cpp
LINK_LIBRARIES GaudiKernel ZLIB LINK_LIBRARIES GaudiKernel ZLIB
......
...@@ -89,7 +89,7 @@ StatusCode StalledEventMonitor::initialize() ...@@ -89,7 +89,7 @@ StatusCode StalledEventMonitor::initialize()
if ( m_eventTimeout ) { if ( m_eventTimeout ) {
// create the watchdog thread // create the watchdog thread
m_watchdog = std::make_unique<EventWatchdog>( m_watchdog = std::make_unique<EventWatchdog>(
msgSvc(), "EventWatchdog", boost::posix_time::seconds( m_eventTimeout ), m_stackTrace, m_maxTimeoutCount ); msgSvc(), "EventWatchdog", boost::posix_time::seconds( m_eventTimeout.value() ), m_stackTrace, m_maxTimeoutCount );
// register to the incident service // register to the incident service
static const std::string serviceName = "IncidentSvc"; static const std::string serviceName = "IncidentSvc";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment