Commit 2c6e7ad8 authored by Lynn Garren's avatar Lynn Garren
Browse files

remove obsolete _clhep_check_for_pthread macro

parent 933e889e
......@@ -196,33 +196,6 @@ macro( _clhep_check_cxxstd )
endif()
endmacro( _clhep_check_cxxstd )
macro( _clhep_check_for_pthread )
message( FATAL_ERROR "_clhep_check_for_pthread should no longer be used. CLHEP now requires gcc 4.8 or later with c++11 or later.")
##message(STATUS "_clhep_check_for_pthread debug: CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
set( HAVE_STDCXX )
if( NOT "${CMAKE_CXX_FLAGS}" STREQUAL "" )
string(REGEX REPLACE " " ";" flag_list ${CMAKE_CXX_FLAGS})
FOREACH(flag ${flag_list})
#message(STATUS "_clhep_check_for_pthread debug: found flag ${flag}" )
if( ${flag} STREQUAL "-std=c++0x" )
message( FATAL_ERROR "CLHEP must be built with c++11 or later enabled")
elseif( ${flag} STREQUAL "-std=c++11" )
_clhep_verify_cxx11()
elseif( ${flag} STREQUAL "-std=c++1y" )
_clhep_verify_cxx1y()
elseif( ${flag} STREQUAL "-std=c++14" )
_clhep_verify_cxx14()
endif()
message(STATUS "${flag} ${HAVE_STDCXX}")
ENDFOREACH(flag)
if( DEFINED HAVE_STDCXX )
set( CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}" )
endif()
#message(STATUS "_clhep_check_for_pthread debug: HAVE_STDCXX ${HAVE_STDCXX}")
message(STATUS "_clhep_check_for_pthread debug: CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
endif()
endmacro( _clhep_check_for_pthread )
macro( clhep_set_compiler_flags )
##message(STATUS "incoming cmake build type is ${CMAKE_BUILD_TYPE}")
if(NOT CMAKE_BUILD_TYPE)
......@@ -230,12 +203,8 @@ macro( clhep_set_compiler_flags )
endif()
##message(STATUS "clhep_set_compiler_flags debug: CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
message(STATUS "cmake build type is ${CMAKE_BUILD_TYPE}")
#if( CLHEP_BUILD_CXXSTD )
_clhep_check_cxxstd()
message(STATUS "enable c++11 extensions: ${CMAKE_CXX_FLAGS}")
#else()
# _clhep_check_for_pthread()
#endif()
if( CLHEP_DEBUG_MESSAGES )
message(STATUS "clhep_set_compiler_flags debug: CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
message(STATUS "clhep_set_compiler_flags debug: cmake compilers ${CMAKE_CXX_COMPILER} ${CMAKE_C_COMPILER}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment