aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaweł Bylica <chfast@gmail.com>2018-07-17 16:39:51 +0800
committerGitHub <noreply@github.com>2018-07-17 16:39:51 +0800
commit56096e9ce827b62dbb657138acb304f79be2278c (patch)
tree024d3b40a08e8acc60169e4162dbf4133121a890
parentf36cc98c0b3978d916ef22cc4eb2ed8bc19e25ac (diff)
parent730a444226f0997fd4f7edd798743369cc74e8e7 (diff)
downloaddexon-solidity-56096e9ce827b62dbb657138acb304f79be2278c.tar
dexon-solidity-56096e9ce827b62dbb657138acb304f79be2278c.tar.gz
dexon-solidity-56096e9ce827b62dbb657138acb304f79be2278c.tar.bz2
dexon-solidity-56096e9ce827b62dbb657138acb304f79be2278c.tar.lz
dexon-solidity-56096e9ce827b62dbb657138acb304f79be2278c.tar.xz
dexon-solidity-56096e9ce827b62dbb657138acb304f79be2278c.tar.zst
dexon-solidity-56096e9ce827b62dbb657138acb304f79be2278c.zip
Merge pull request #4516 from guidovranken/propagate_CMAKE_CXX_FLAGS
Do not ignore CMAKE_CXX_FLAGS defined on the command line
-rw-r--r--cmake/EthCompilerSettings.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 468a8593..ff3a5edb 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -26,7 +26,7 @@ eth_add_cxx_compiler_flag_if_supported(-Wimplicit-fallthrough)
if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
# Use ISO C++11 standard language.
- set(CMAKE_CXX_FLAGS -std=c++11)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
# Enables all the warnings about constructions that some users consider questionable,
# and that are easy to avoid. Also enable some extra warning flags that are not