diff options
author | chriseth <chris@ethereum.org> | 2018-12-12 07:38:38 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-12 07:38:38 +0800 |
commit | 1476acb8045033a9a3d2e1a1d13c5aaa8ed6942c (patch) | |
tree | ad1b64a3b0480768b0d739b9c563a68756e410b9 /cmake/jsoncpp.cmake | |
parent | e74d9df20d1d1e8253cf51ef8d4191e9a0f51e14 (diff) | |
parent | 5b86e3ec50b757def69a9aed9bc70fac1a8ed652 (diff) | |
download | dexon-solidity-1476acb8045033a9a3d2e1a1d13c5aaa8ed6942c.tar dexon-solidity-1476acb8045033a9a3d2e1a1d13c5aaa8ed6942c.tar.gz dexon-solidity-1476acb8045033a9a3d2e1a1d13c5aaa8ed6942c.tar.bz2 dexon-solidity-1476acb8045033a9a3d2e1a1d13c5aaa8ed6942c.tar.lz dexon-solidity-1476acb8045033a9a3d2e1a1d13c5aaa8ed6942c.tar.xz dexon-solidity-1476acb8045033a9a3d2e1a1d13c5aaa8ed6942c.tar.zst dexon-solidity-1476acb8045033a9a3d2e1a1d13c5aaa8ed6942c.zip |
Merge pull request #5502 from ethereum/cpp14
Enables C++14 standard (was C++11) within the Solidity compiler project.
Diffstat (limited to 'cmake/jsoncpp.cmake')
-rw-r--r-- | cmake/jsoncpp.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake index ea3218ef..318a526e 100644 --- a/cmake/jsoncpp.cmake +++ b/cmake/jsoncpp.cmake @@ -15,9 +15,9 @@ set(JSONCPP_INCLUDE_DIR "${prefix}/include") # versions used in the CI runs. if(EMSCRIPTEN) # Do not include all flags in CMAKE_CXX_FLAGS for emscripten, - # but only use -std=c++11. Using all flags causes build failures + # but only use -std=c++14. Using all flags causes build failures # at the moment. - set(JSONCPP_CXX_FLAGS -std=c++11) + set(JSONCPP_CXX_FLAGS -std=c++14) else() set(JSONCPP_CXX_FLAGS ${CMAKE_CXX_FLAGS}) endif() |