Skip to content

Commit

Permalink
ARROW-8008: [C++/Python] Set Python3_FIND_FRAMEWORK=LAST
Browse files Browse the repository at this point in the history
Closes #6542 from xhochy/ARROW-8008 and squashes the following commits:

da3b123 <Uwe L. Korn> Also set for python
6fd55b4 <Uwe L. Korn> ARROW-8008:  Set Python3_FIND_FRAMEWORK=LAST

Authored-by: Uwe L. Korn <uwe.korn@quantco.com>
Signed-off-by: Antoine Pitrou <antoine@python.org>
  • Loading branch information
xhochy authored and pitrou committed Mar 5, 2020
1 parent 245091c commit d923201
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cpp/CMakeLists.txt
Expand Up @@ -144,6 +144,8 @@ else()
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
set(Python3_FIND_REGISTRY "LAST")
# On macOS, use framework last, not first
set(Python3_FIND_FRAMEWORK "LAST")

find_package(Python3)
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
Expand Down
2 changes: 2 additions & 0 deletions python/CMakeLists.txt
Expand Up @@ -45,6 +45,8 @@ endif()
set(Python3_FIND_STRATEGY "LOCATION")
# On Windows, use registry last, not first
set(Python3_FIND_REGISTRY "LAST")
# On macOS, use framework last, not first
set(Python3_FIND_FRAMEWORK "LAST")

# Allow "make install" to not depend on all targets.
#
Expand Down

0 comments on commit d923201

Please sign in to comment.