Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CLHEP
CLHEP
Commits
a621d8dd
Commit
a621d8dd
authored
Apr 18, 2016
by
Lynn Garren
Browse files
get rid of obsolete _clhep_verify_cxx0x macro
parent
0d30731b
Changes
1
Hide whitespace changes
Inline
Side-by-side
cmake/Modules/ClhepVariables.cmake
View file @
a621d8dd
...
...
@@ -86,25 +86,6 @@ macro( clhep_autoconf_variables )
endmacro
(
clhep_autoconf_variables
)
macro
(
_clhep_verify_cxx0x
)
message
(
FATAL_ERROR
"The c++0x extension is no longer supported. Please use c++11 or later."
)
if
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"Clang"
)
if
(
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9
)
message
(
FATAL_ERROR
"c++0x extension is not available for
${
CMAKE_CXX_COMPILER_ID
}${
CMAKE_CXX_COMPILER_VERSION
}
"
)
else
()
set
(
HAVE_STDCXX true
)
endif
()
elseif
(
CMAKE_COMPILER_IS_GNUCXX
)
if
(
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3
)
message
(
FATAL_ERROR
"c++0x extension is not available for
${
CMAKE_CXX_COMPILER
}
"
)
else
()
set
(
HAVE_STDCXX true
)
endif
()
else
()
message
(
STATUS
"clhep_set_compiler_flags: Do not know how to set c++11 extensions for
${
CMAKE_CXX_COMPILER_ID
}
"
)
endif
()
endmacro
(
_clhep_verify_cxx0x
)
macro
(
_clhep_verify_cxx11
)
if
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"Clang"
)
if
(
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.3
)
...
...
@@ -162,7 +143,7 @@ macro( _clhep_verify_cxx14 )
endif
()
elseif
(
${
CMAKE_CXX_COMPILER_ID
}
STREQUAL
"Intel"
)
if
(
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0
)
message
(
FATAL_ERROR
"c++1
1
extension is not available for
${
CMAKE_CXX_COMPILER_ID
}
${
CMAKE_CXX_COMPILER_VERSION
}
"
)
message
(
FATAL_ERROR
"c++1
4
extension is not available for
${
CMAKE_CXX_COMPILER_ID
}
${
CMAKE_CXX_COMPILER_VERSION
}
"
)
else
()
set
(
HAVE_STDCXX true
)
endif
()
...
...
@@ -224,7 +205,7 @@ macro( _clhep_check_for_pthread )
FOREACH
(
flag
${
flag_list
}
)
#message(STATUS "_clhep_check_for_pthread debug: found flag ${flag}" )
if
(
${
flag
}
STREQUAL
"-std=c++0x"
)
_clhep_verify_cxx0x
(
)
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"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment