Skip to content

Commit

Permalink
CMake: remove duplicate find_package(pybind11 ...)
Browse files Browse the repository at this point in the history
This duplicate seems to come from the PR AcademySoftwareFoundation#1371.
This PR spanned April 15 - August 24 (2021).

Meanwhile, PR AcademySoftwareFoundation#1410 (June 13 - June 21),
changed the CMake logic around `find_package(pybind11 ...)`.

It looks like former PR mishandled the merge of the latter.
  • Loading branch information
Sarcasm committed Oct 22, 2021
1 parent 4a6745a commit b2ff61c
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions share/cmake/modules/FindExtPackages.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,6 @@ if(OCIO_BUILD_OPENFX)
find_package(openfx 1.4 REQUIRED)
endif()

if(OCIO_BUILD_PYTHON)

# NOTE: Depending of the compiler version pybind11 2.4.3 does not compile
# with C++17 so, if you change the pybind11 version update the code to
# compile pybind11 and dependencies with C++17 or higher i.e. remove the
# cap of C++ version in FindPybind11.cmake and
# src/bindings/python/CMakeLists.txt.

# pybind11
# https://github.com/pybind/pybind11
find_package(pybind11 2.6.1 REQUIRED)
endif()

if (OCIO_PYTHON_VERSION AND NOT OCIO_BUILD_PYTHON)
message (WARNING "OCIO_PYTHON_VERSION=${OCIO_PYTHON_VERSION} but OCIO_BUILD_PYTHON is off.")
endif ()
Expand Down

0 comments on commit b2ff61c

Please sign in to comment.