pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-26 08:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing merge conflict.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-07-15 06:23:06 -07:00
parent 279c93654e c4b0dc7cdd
commit 88546fff7d
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CMakeLists.txt
View File

@@ -333,7 +333,7 @@ function(pybind11_enable_warnings target_name)
endif()
endif()
# Needs to be readded since the ordering requires these to be after the ones above
# Needs to be re-added since the ordering requires these to be after the ones above
if(CMAKE_CXX_STANDARD
AND CMAKE_CXX_COMPILER_ID MATCHES "Clang"
AND PYTHON_VERSION VERSION_LESS 3.0)