Skip to content

Commit 33ece78

Browse files
Merge pull request #1398 from ZzEeKkAa/fix/remove_python_extension_module
2 parents edbdf0d + 2d8f32c commit 33ece78

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
cmake_minimum_required(VERSION 3.21...3.22 FATAL_ERROR)
2-
3-
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
4-
cmake_policy(SET CMP0135 NEW)
5-
endif()
1+
cmake_minimum_required(VERSION 3.21...3.27 FATAL_ERROR)
62

73
project(dpctl
84
LANGUAGES CXX

dpctl/CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
2-
find_package(PythonExtensions REQUIRED)
3-
find_package(NumPy REQUIRED)
1+
find_package(Python REQUIRED COMPONENTS Development.Module NumPy)
42

53
set(CYTHON_FLAGS "-t -w \"${CMAKE_SOURCE_DIR}\"")
64
find_package(Cython REQUIRED)
@@ -142,17 +140,16 @@ function(build_dpctl_ext _trgt _src _dest)
142140
add_cython_target(${_trgt} ${_src} CXX OUTPUT_VAR _generated_src)
143141
set(_cythonize_trgt "${_trgt}_cythonize_pyx")
144142
add_custom_target(${_cythonize_trgt} DEPENDS ${_src})
145-
add_library(${_trgt} MODULE ${_generated_src})
143+
python_add_library(${_trgt} MODULE ${_generated_src})
146144
target_include_directories(${_trgt} PRIVATE ${NumPy_INCLUDE_DIR} ${DPCTL_INCLUDE_DIR})
147145
add_dependencies(${_trgt} _build_time_create_dpctl_include_copy ${_cythonize_trgt})
148146
if (DPCTL_GENERATE_COVERAGE)
149147
target_compile_definitions(${_trgt} PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1)
150148
target_compile_options(${_trgt} PRIVATE -fno-sycl-use-footer)
151149
endif()
152-
target_link_libraries(${_trgt} DPCTLSyclInterface)
150+
target_link_libraries(${_trgt} PRIVATE DPCTLSyclInterface)
153151
set(_linker_options "LINKER:${DPCTL_LDFLAGS}")
154152
target_link_options(${_trgt} PRIVATE ${_linker_options})
155-
python_extension_module(${_trgt})
156153
get_filename_component(_name_wle ${_generated_src} NAME_WLE)
157154
get_filename_component(_generated_src_dir ${_generated_src} DIRECTORY)
158155
set(_generated_public_h "${_generated_src_dir}/${_name_wle}.h")

0 commit comments

Comments
 (0)