Skip to content

Commit

Permalink
CMake: Simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
chfast committed Mar 11, 2019
1 parent 9ea43a8 commit 0b0d10a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 2 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# EVMC: Ethereum Client-VM Connector API.
# Copyright 2018 The EVMC Authors.
# Copyright 2019 The EVMC Authors.
# Licensed under the Apache License, Version 2.0. See the LICENSE file.

hunter_add_package(GTest)
Expand All @@ -8,6 +8,7 @@ find_package(GTest CONFIG REQUIRED)
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_C_EXTENSIONS OFF)
endif()

add_subdirectory(integration)
Expand Down
4 changes: 0 additions & 4 deletions test/integration/compilation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ endif()
list(APPEND all_features ${CMAKE_CXX_COMPILE_FEATURES})
list(APPEND all_features ${CMAKE_C_COMPILE_FEATURES})

# Disable standard extensions globally for test targets.
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_C_EXTENSIONS OFF)

macro(create_compilation_test STANDARD)
if (${STANDARD} MATCHES "^(c|cxx)_std_([0-9]+)$")
set(lang ${CMAKE_MATCH_1})
Expand Down

0 comments on commit 0b0d10a

Please sign in to comment.