Do not force frameworks on Mac OS X - never worked well.
This commit is contained in:
parent
27dac9fa86
commit
8d87d12ce6
|
@ -89,22 +89,6 @@ MARK_AS_ADVANCED(
|
||||||
PYTHON_INCLUDE_DIR
|
PYTHON_INCLUDE_DIR
|
||||||
)
|
)
|
||||||
|
|
||||||
# Python Should be built and installed as a Framework on OSX
|
|
||||||
IF(Python_FRAMEWORKS)
|
|
||||||
# If a framework has been selected for the include path,
|
|
||||||
# make sure "-framework" is used to link it.
|
|
||||||
IF("${PYTHON_INCLUDE_DIR}" MATCHES "Python\\.framework")
|
|
||||||
SET(PYTHON_LIBRARY "")
|
|
||||||
SET(PYTHON_DEBUG_LIBRARY "")
|
|
||||||
ENDIF("${PYTHON_INCLUDE_DIR}" MATCHES "Python\\.framework")
|
|
||||||
IF(NOT PYTHON_LIBRARY)
|
|
||||||
SET (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
|
|
||||||
ENDIF(NOT PYTHON_LIBRARY)
|
|
||||||
IF(NOT PYTHON_DEBUG_LIBRARY)
|
|
||||||
SET (PYTHON_DEBUG_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
|
|
||||||
ENDIF(NOT PYTHON_DEBUG_LIBRARY)
|
|
||||||
ENDIF(Python_FRAMEWORKS)
|
|
||||||
|
|
||||||
# We use PYTHON_INCLUDE_DIR, PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the
|
# We use PYTHON_INCLUDE_DIR, PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the
|
||||||
# cache entries because they are meant to specify the location of a single
|
# cache entries because they are meant to specify the location of a single
|
||||||
# library. We now set the variables listed by the documentation for this
|
# library. We now set the variables listed by the documentation for this
|
||||||
|
|
Loading…
Reference in New Issue