Skip to content

Commit

Permalink
Merge pull request #2365 from NAThompson/simplify_cmake_2
Browse files Browse the repository at this point in the history
Remove superfluous check on CMake version.
  • Loading branch information
pnorbert authored Jul 9, 2020
2 parents b57e977 + 2286d7d commit 1a727f6
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,12 @@ mark_as_advanced(ADIOS2_LIBRARY_SUFFIX ADIOS2_EXECUTABLE_SUFFIX)

# Use meta-compile features if available, otherwise use specific language
# features
if(CMAKE_VERSION VERSION_LESS 3.9 OR
CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel|Clang|AppleClang|MSVC)$")
if(CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel|Clang|AppleClang|MSVC)$")
set(ADIOS2_CXX11_FEATURES cxx_auto_type cxx_nullptr)
else()
set(ADIOS2_CXX11_FEATURES cxx_std_11)
endif()
if(CMAKE_VERSION VERSION_LESS 3.9 OR
CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel|Clang|AppleClang|MSVC)$")
if(CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel|Clang|AppleClang|MSVC)$")
set(ADIOS2_C99_FEATURES c_restrict)
else()
set(ADIOS2_C99_FEATURES c_std_99)
Expand Down

0 comments on commit 1a727f6

Please sign in to comment.