Skip to content

Commit 46b3471

Browse files
committed
Merge pull request #596 from mbernasocchi/master
make cmake honor PYTHON_LIBRARY
2 parents 6370aa4 + f7f3e41 commit 46b3471

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cmake/FindPythonLibrary.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
INCLUDE(CMakeFindFrameworks)
2828

29-
if(EXISTS PYTHON_LIBRARY)
29+
if(EXISTS ${PYTHON_LIBRARY})
3030
# Already in cache, be silent
3131
set(PYTHONLIBRARY_FOUND TRUE)
32-
else(EXISTS PYTHON_LIBRARY)
32+
else(EXISTS ${PYTHON_LIBRARY})
3333

3434
set(_custom_python_fw FALSE)
3535
if(APPLE AND PYTHON_CUSTOM_FRAMEWORK)
@@ -69,6 +69,7 @@ else(EXISTS PYTHON_LIBRARY)
6969
STRING(REPLACE "\\" "/" PYTHON_SITE_PACKAGES_DIR ${PYTHON_SITE_PACKAGES_DIR})
7070
endif(WIN32)
7171
FIND_LIBRARY(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES} PATHS ${PYTHON_PREFIX}/lib ${PYTHON_PREFIX}/libs NO_DEFAULT_PATH)
72+
set(PYTHON_INCLUDE_PATH ${PYTHON_INCLUDE_PATH} CACHE FILEPATH "Directory holding the python.h include file")
7273
set(PYTHONLIBRARY_FOUND TRUE)
7374
endif(python_config)
7475

@@ -109,4 +110,4 @@ else(EXISTS PYTHON_LIBRARY)
109110
endif(PYTHONLIBRARY_FIND_REQUIRED)
110111
endif(PYTHONLIBRARY_FOUND)
111112

112-
endif (EXISTS PYTHON_LIBRARY)
113+
endif (EXISTS ${PYTHON_LIBRARY})

0 commit comments

Comments
 (0)