Skip to content

Commit 76e06c8

Browse files
committed
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.
1 parent 97aa54f commit 76e06c8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/pybind11Tools.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} REQUIRED)
1818
include(CheckCXXCompilerFlag)
1919
include(CMakeParseArguments)
2020

21-
if(NOT PYBIND11_CPP_STANDARD)
21+
if(NOT PYBIND11_CPP_STANDARD AND NOT CMAKE_CXX_STANDARD)
2222
if(NOT MSVC)
2323
check_cxx_compiler_flag("-std=c++14" HAS_CPP14_FLAG)
2424

0 commit comments

Comments
 (0)