Skip to content

Commit

Permalink
Merge pull request #14158 from tamiko/remove_find_package_override
Browse files Browse the repository at this point in the history
CMake: remove find_package override
  • Loading branch information
tjhei committed Jul 25, 2022
2 parents 1d9d558 + 40076ac commit d1475a1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 35 deletions.
33 changes: 0 additions & 33 deletions cmake/macros/macro_find_package.cmake

This file was deleted.

4 changes: 2 additions & 2 deletions contrib/python-bindings/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ IF(DEAL_II_COMPONENT_PYTHON_BINDINGS)
# Make sure FindBoost.cmake from CMake installation is found.
LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
IF(${BOOST_VERSION} VERSION_LESS 1.67)
_FIND_PACKAGE(Boost 1.59 COMPONENTS python REQUIRED)
FIND_PACKAGE(Boost 1.59 COMPONENTS python REQUIRED)
ELSE()
_FIND_PACKAGE(Boost 1.67 COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} REQUIRED)
FIND_PACKAGE(Boost 1.67 COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} REQUIRED)
ENDIF()
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)

Expand Down

0 comments on commit d1475a1

Please sign in to comment.