Smaller updates:

constant use of longjmp
conflict with python headers
win32 support
dll support
This commit is contained in:
Vitor Santos Costa
2017-02-20 15:28:46 +00:00
parent 55879dbd6c
commit 65ff3ed471
131 changed files with 8125 additions and 5154 deletions

View File

@@ -1,32 +1,27 @@
#CHECK: PythonLibs
#CHECK: PythonLibs, changed to work in WIN32
if (PYTHONLIBS_FOUND)
include(FindPythonModule)
include(FindPythonModule)
set (PYTHON_SOURCES
python.c pl2py.c pybips.c py2pl.c pl2pl.c pypreds.c)
include("${CMAKE_SOURCE_DIR}/packages/python/Sources.cmake")
set (PYTHON_HEADERS
python.h)
set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
add_library (YAPPython SHARED ${PYTHON_SOURCES})
target_link_libraries(YAPPython libYap ${PYTHON_LIBRARIES}
${WINDLLS}
${GMP_LIBRARIES})
target_link_libraries(YAPPython libYap ${PYTHON_LIBRARIES})
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
set_property( SOURCE ${PYTHON_SOURCES} APPEND PROPERTY COMPILE_DEFINITIONS YAP_KERNEL=1)
add_custom_target ( YAPex ALL
COMMAND ${PYTHON_EXECUTABLE} setup.py build -f
DEPENDS yapex.py )
# set_target_properties (YAPPython PROPERTIES PREFIX "")
include_directories (${PYTHON_INCLUDE_DIRS})
install(TARGETS YAPPython
LIBRARY DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls}
)
install(FILES python.pl
DESTINATION ${libpl}
@@ -34,8 +29,10 @@ add_custom_target ( YAPex ALL
configure_file ("setup.py.cmake" "setup.py" )
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install -f
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
#set_target_properties (YAPPython PROPERTIES PREFIX "")
find_python_module( jupyter )
@@ -43,6 +40,11 @@ if (PY_JUPYTER)
add_subdirectory(yap_kernel)
endif()
ENDIF()
install(TARGETS YAPPython
LIBRARY DESTINATION ${dlls}
RUNTIME DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} )
endif (PYTHONLIBS_FOUND)