Mostly about Jupyter support.
This commit is contained in:
@@ -1,62 +1,25 @@
|
||||
set (Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.6 3.4 )
|
||||
|
||||
find_package(PythonInterp)
|
||||
# find_package(PythonLibs)
|
||||
find_package(PythonLibs)
|
||||
|
||||
|
||||
# PYTHONLIBS_FOUND - have the Python libs been found
|
||||
# PYTHONLIBS_FOUND - have the Python libs been found
|
||||
# PYTHON_LIBRARIES - path to the python library
|
||||
# PYTHON_INCLUDE_PATH - path to where Python.h is found (deprecated)
|
||||
# PYTHON_INCLUDE_DIRS - path to where Python.h is found
|
||||
# PYTHON_DEBUG_LIBRARIES - path to the debug library (deprecated)
|
||||
# PYTHONLIBS_VERSION_STRING - version of the Python libs found (since CMake 2.8.8)
|
||||
#
|
||||
##
|
||||
#
|
||||
|
||||
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print(
|
||||
sysconfig.get_path( 'include' ) )"
|
||||
OUTPUT_VARIABLE _ABS_PYTHON_INCLUDE_PATH
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE )
|
||||
|
||||
get_filename_component ( ABS_PYTHON_INCLUDE_PATH ${_ABS_PYTHON_INCLUDE_PATH} ABSOLUTE )
|
||||
|
||||
set ( PYTHON_INCLUDE_DIR
|
||||
${ABS_PYTHON_INCLUDE_PATH}
|
||||
CACHE "PATH" "Directory with Python.h "
|
||||
)
|
||||
|
||||
set ( PYTHON_INCLUDE_DIRS
|
||||
${ABS_PYTHON_INCLUDE_PATH}
|
||||
CACHE "PATH" "Python.h Dir (Deprecated)"
|
||||
)
|
||||
|
||||
execute_process ( COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/cmake/libfind.py"
|
||||
OUTPUT_VARIABLE ABS_PYTHON_SYSLIB
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE )
|
||||
|
||||
set ( PYTHON_LIBRARY
|
||||
${ABS_PYTHON_SYSLIB}
|
||||
CACHE "FILEPATH" "Python Library"
|
||||
)
|
||||
|
||||
set ( PYTHON_LIBRARIES
|
||||
${PYTHON_LIBRARY}
|
||||
CACHE "FILEPATH" "Python Library (Deprecated)"
|
||||
)
|
||||
|
||||
if ( (EXISTS ${PYTHON_LIBRARY}) AND ( EXISTS ${PYTHON_INCLUDE_DIR}) )
|
||||
set ( PYTHONLIBS_FOUND ON
|
||||
CACHE "BOOLEAN" "Python installed")
|
||||
# else()
|
||||
|
||||
#find_package(PythonLibs)
|
||||
endif()
|
||||
|
||||
|
||||
include_directories( BEFORE ${PYTHON_INCLUDE_DIR} )
|
||||
|
||||
|
||||
include_directories( BEFORE ${PYTHON_INCLUDE_DIRS} )
|
||||
|
||||
LIST( APPEND
|
||||
CMAKE_REQUIRED_INCLUDES ${PYTHON_INCLUDE_DIR} ${CMAKE_REQUIRED_INCLUDES})
|
||||
CMAKE_REQUIRED_INCLUDES ${PYTHON_INCLUDE_DIRS} ${CMAKE_REQUIRED_INCLUDES})
|
||||
|
||||
check_include_file(Python.h HAVE_PYTHON_H)
|
||||
|
||||
@@ -74,4 +37,3 @@ if (PYTHONLIBS_FOUND AND SWIG_FOUND)
|
||||
add_subdirectory(packages/python/yap_kernel)
|
||||
ENDIF()
|
||||
endif()
|
||||
|
||||
|
Reference in New Issue
Block a user