Skip to content

Commit

Permalink
Merge pull request ComputationalRadiationPhysics#1325 from ax3l/fix-c…
Browse files Browse the repository at this point in the history
…pp11boost160

Fix ComputationalRadiationPhysics#1324 CUDA<7.5 + Boost 1.60.0 + C++11
  • Loading branch information
erikzenker committed Jan 12, 2016
2 parents 16b85fe + 6b1d050 commit 645a83c
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/picongpu/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,16 @@ if( (Boost_VERSION EQUAL 106000) AND
"`-std=c++11` when compiling with Boost 1.60.0")
endif()

# Boost 1.60.0 and CUDA releases prior to 7.5 fail on variadic templates
# when used with C++11
if( (Boost_VERSION EQUAL 106000) AND
(CUDA_VERSION VERSION_LESS 7.5) AND
(NOT CMAKE_CXX_STANDARD EQUAL 98) )
# Boost Bug https://svn.boost.org/trac/boost/ticket/11897
message(STATUS "Boost: Disable variadic templates")
add_definitions(-DBOOST_NO_CXX11_VARIADIC_TEMPLATES)
endif()


################################################################################
# Find OpenMP
Expand Down

0 comments on commit 645a83c

Please sign in to comment.