Use FindPython3 in addition to pkg-config

This commit is contained in:
Alexey Sokolov
2019-07-23 22:46:51 +01:00
parent 95369455fc
commit 960b76d2ea
4 changed files with 43 additions and 10 deletions

View File

@@ -17,9 +17,9 @@
# TODO: consider switching to swig_add_library() after bumping CMake
# requirements to 3.8, when that command started using IMPLICIT_DEPENDS
set(modinclude_modpython PUBLIC ${PYTHON_INCLUDE_DIRS}
set(modinclude_modpython PUBLIC ${Python3_INCLUDE_DIRS}
"${CMAKE_CURRENT_BINARY_DIR}/.." PARENT_SCOPE)
set(modlink_modpython PUBLIC ${PYTHON_LDFLAGS} PARENT_SCOPE)
set(modlink_modpython PUBLIC ${Python3_LDFLAGS} PARENT_SCOPE)
set(moddef_modpython PUBLIC "SWIG_TYPE_TABLE=znc" PARENT_SCOPE)
set(moddepend_modpython modpython_functions modpython_swigruntime PARENT_SCOPE)
@@ -75,8 +75,8 @@ target_include_directories(modpython_lib PRIVATE
"${PROJECT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_BINARY_DIR}/.."
"${CMAKE_CURRENT_SOURCE_DIR}/.."
${PYTHON_INCLUDE_DIRS})
target_link_libraries(modpython_lib ${znc_link} ${PYTHON_LDFLAGS})
${Python3_INCLUDE_DIRS})
target_link_libraries(modpython_lib ${znc_link} ${Python3_LDFLAGS})
set_target_properties(modpython_lib PROPERTIES
PREFIX "_"
OUTPUT_NAME "znc_core"