File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- cmake_minimum_required (VERSION 3.5.0 FATAL_ERROR ) #CPACK_DEBIAN_<COMPONENT>_PACKAGE_NAME
1+ cmake_minimum_required (VERSION 3.12 FATAL_ERROR ) #FindPython
22
33find_package (IRODS REQUIRED )
44set (IRODS_PLUGIN_REVISION "0" )
@@ -45,8 +45,7 @@ endif()
4545
4646find_package (OpenSSL REQUIRED COMPONENTS Crypto SSL )
4747find_package (nlohmann_json "3.6.1" REQUIRED )
48- find_package (PythonInterp ${IRODS_PYTHON_VERSION} REQUIRED )
49- find_package (PythonLibs ${IRODS_PYTHON_VERSION} REQUIRED )
48+ find_package (Python "${IRODS_PYTHON_VERSION} " REQUIRED COMPONENTS Development )
5049
5150set (
5251 IRODS_RULE_ENGINE_PLUGIN-PYTHON_COMPILE_DEFINITIONS
7776 ${IRODS_INCLUDE_DIRS}
7877 ${IRODS_EXTERNALS_FULLPATH_BOOST} /include
7978 ${IRODS_EXTERNALS_FULLPATH_FMT} /include
80- ${PYTHON_INCLUDE_DIRS}
8179 )
8280
8381 target_link_libraries (
8482 ${PLUGIN}
8583 PRIVATE
86- ${IRODS_EXTERNALS_FULLPATH_BOOST} /lib/libboost_python${PYTHON_VERSION_MAJOR }${PYTHON_VERSION_MINOR }.so
84+ ${IRODS_EXTERNALS_FULLPATH_BOOST} /lib/libboost_python${Python_VERSION_MAJOR }${Python_VERSION_MINOR }.so
8785 ${IRODS_EXTERNALS_FULLPATH_BOOST} /lib/libboost_system.so
8886 ${IRODS_EXTERNALS_FULLPATH_BOOST} /lib/libboost_date_time.so
8987 ${IRODS_EXTERNALS_FULLPATH_BOOST} /lib/libboost_filesystem.so
9088 ${IRODS_EXTERNALS_FULLPATH_FMT} /lib/libfmt.so
91- ${PYTHON_LIBRARIES}
9289 ${CMAKE_DL_LIBS}
9390 irods_common
9491 irods_server
92+ Python::Python
9593 nlohmann_json::nlohmann_json
9694 )
9795
You can’t perform that action at this time.
0 commit comments