diff --git a/CMakeLists.txt b/CMakeLists.txt index b57c02d845..2e46850f95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,4 @@ -cmake_minimum_required(VERSION 3.21...3.22 FATAL_ERROR) - -if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24") - cmake_policy(SET CMP0135 NEW) -endif() +cmake_minimum_required(VERSION 3.21...3.27 FATAL_ERROR) project(dpctl LANGUAGES CXX diff --git a/dpctl/CMakeLists.txt b/dpctl/CMakeLists.txt index 487a5782e2..27b8b00b33 100644 --- a/dpctl/CMakeLists.txt +++ b/dpctl/CMakeLists.txt @@ -1,6 +1,4 @@ - -find_package(PythonExtensions REQUIRED) -find_package(NumPy REQUIRED) +find_package(Python REQUIRED COMPONENTS Development.Module NumPy) set(CYTHON_FLAGS "-t -w \"${CMAKE_SOURCE_DIR}\"") find_package(Cython REQUIRED) @@ -142,17 +140,16 @@ function(build_dpctl_ext _trgt _src _dest) add_cython_target(${_trgt} ${_src} CXX OUTPUT_VAR _generated_src) set(_cythonize_trgt "${_trgt}_cythonize_pyx") add_custom_target(${_cythonize_trgt} DEPENDS ${_src}) - add_library(${_trgt} MODULE ${_generated_src}) + python_add_library(${_trgt} MODULE ${_generated_src}) target_include_directories(${_trgt} PRIVATE ${NumPy_INCLUDE_DIR} ${DPCTL_INCLUDE_DIR}) add_dependencies(${_trgt} _build_time_create_dpctl_include_copy ${_cythonize_trgt}) if (DPCTL_GENERATE_COVERAGE) target_compile_definitions(${_trgt} PRIVATE CYTHON_TRACE=1 CYTHON_TRACE_NOGIL=1) target_compile_options(${_trgt} PRIVATE -fno-sycl-use-footer) endif() - target_link_libraries(${_trgt} DPCTLSyclInterface) + target_link_libraries(${_trgt} PRIVATE DPCTLSyclInterface) set(_linker_options "LINKER:${DPCTL_LDFLAGS}") target_link_options(${_trgt} PRIVATE ${_linker_options}) - python_extension_module(${_trgt}) get_filename_component(_name_wle ${_generated_src} NAME_WLE) get_filename_component(_generated_src_dir ${_generated_src} DIRECTORY) set(_generated_public_h "${_generated_src_dir}/${_name_wle}.h")