commit 76e06c89e419db196cda20e0e43171f9461139ae
author Dean Moldovan <dean0x7d@gmail.com> Sun Aug 13 15:48:08 2017 +0200
committer Dean Moldovan <dean0x7d@gmail.com> Thu Aug 17 03:04:44 2017 +0200
tree 72e1e4dc06be848568a3ddb36e96188417254286
parent 97aa54fefa9401329a292bb0a425097f5fd0e730

Avoid duplicate C++ standard flags if CMAKE_CXX_STANDARD is set

CMAKE_CXX_STANDARD is only available on CMake >= 3.1. If the flag is
set, we avoid initializing PYBIND11_CPP_STANDARD.

tools/pybind11Tools.cmake

diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake
index 63752ea..a7c471a 100644
--- a/tools/pybind11Tools.cmake
+++ b/tools/pybind11Tools.cmake
@@ -18,7 +18,7 @@
 include(CheckCXXCompilerFlag)
 include(CMakeParseArguments)
 
-if(NOT PYBIND11_CPP_STANDARD)
+if(NOT PYBIND11_CPP_STANDARD AND NOT CMAKE_CXX_STANDARD)
   if(NOT MSVC)
     check_cxx_compiler_flag("-std=c++14" HAS_CPP14_FLAG)