Add headers interface

Author: ZzEeKkAa

CMakeLists.txt

@@ -53,7 +53,7 @@ add_subdirectory(libsyclinterface)
 
 add_library(DpctlCAPI INTERFACE)
 target_include_directories(DpctlCAPI INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/dpctl/apis/include)
-target_link_libraries(DpctlCAPI INTERFACE DPCTLSyclInterface)
+target_link_libraries(DpctlCAPI INTERFACE DPCTLSyclInterfaceHeaders)
 
 install(DIRECTORY
     ${CMAKE_CURRENT_SOURCE_DIR}/dpctl/apis/include/

dpctl/CMakeLists.txt

@@ -116,6 +116,7 @@ function(build_dpctl_ext _trgt _src _dest)
     #   headers related to this target and appropriate folder structure to
     #   eliminate shadow dependencies
     get_filename_component(_generated_src_dir_dir ${_generated_src_dir} DIRECTORY)
+    # TODO: do not set directory if we did not generate header
     target_include_directories(${_trgt} INTERFACE ${_generated_src_dir_dir})
 
     install(TARGETS ${_trgt}
@@ -128,21 +129,32 @@ function(build_dpctl_ext _trgt _src _dest)
         ${_generated_public_h}
         DESTINATION ${CMAKE_INSTALL_PREFIX}/dpctl/include/${_dest}
         OPTIONAL)
+
+    set(_trgt_headers ${_trgt}_headers)
+    add_library(${_trgt_headers} INTERFACE)
+    add_dependencies(${_trgt_headers} ${_trgt})
+    get_target_property(_trgt_headers_dir ${_trgt} INTERFACE_INCLUDE_DIRECTORIES)
+    target_include_directories(${_trgt_headers} INTERFACE ${_trgt_headers_dir})
 endfunction()
 
 file(GLOB _cython_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.pyx)
 list(REMOVE_ITEM _cython_sources ${CMAKE_CURRENT_SOURCE_DIR}/_sycl_queue.pyx)
 foreach(_cy_file ${_cython_sources})
     get_filename_component(_trgt ${_cy_file} NAME_WLE)
     build_dpctl_ext(${_trgt} ${_cy_file} "dpctl")
-    target_link_libraries(DpctlCAPI INTERFACE ${_trgt})
+    target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)
+    # TODO: cleanup
+    # add_dependencies(DpctlCAPI ${_trgt})
+    # get_target_property(_trgt_headers ${_trgt} INTERFACE_INCLUDE_DIRECTORIES)
+    # target_include_directories(DpctlCAPI INTERFACE ${_trgt_headers})
 endforeach()
 
 set(_cy_file ${CMAKE_CURRENT_SOURCE_DIR}/_sycl_queue.pyx)
 get_filename_component(_trgt ${_cy_file} NAME_WLE)
 build_dpctl_ext(${_trgt} ${_cy_file} "dpctl" SYCL)
 # _sycl_queue include _host_task_util.hpp
 target_include_directories(${_trgt} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)
 
 add_subdirectory(program)
 add_subdirectory(memory)

dpctl/memory/CMakeLists.txt

@@ -3,5 +3,5 @@ file(GLOB _cython_sources *.pyx)
 foreach(_cy_file ${_cython_sources})
     get_filename_component(_trgt ${_cy_file} NAME_WLE)
     build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/memory")
-    target_link_libraries(DpctlCAPI INTERFACE ${_trgt})
+    target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)
 endforeach()

dpctl/program/CMakeLists.txt

@@ -3,5 +3,5 @@ file(GLOB _cython_sources *.pyx)
 foreach(_cy_file ${_cython_sources})
     get_filename_component(_trgt ${_cy_file} NAME_WLE)
     build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/program")
-    target_link_libraries(DpctlCAPI INTERFACE ${_trgt})
+    target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)
 endforeach()

dpctl/tensor/CMakeLists.txt

@@ -3,7 +3,7 @@ foreach(_cy_file ${_cython_sources})
     get_filename_component(_trgt ${_cy_file} NAME_WLE)
     build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/tensor")
     target_include_directories(${_trgt} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-    target_link_libraries(DpctlCAPI INTERFACE ${_trgt})
+    target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)
 endforeach()
 
 # TODO: do we need to write this dependencies explicitly? Does it even work this

libsyclinterface/CMakeLists.txt

@@ -269,11 +269,18 @@ if(DPCTL_ENABLE_L0_PROGRAM_CREATION)
 endif()
 
 target_include_directories(DPCTLSyclInterface INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include>
+)
+add_library(DPCTLSyclInterfaceHeaders INTERFACE)
+add_dependencies(DPCTLSyclInterfaceHeaders DPCTLSyclInterface)
+target_include_directories(DPCTLSyclInterfaceHeaders INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
 install(TARGETS
     DPCTLSyclInterface
+    EXPORT DPCTLSyclInterface
     LIBRARY
     DESTINATION ${CMAKE_INSTALL_PREFIX}/dpctl
 )
@@ -283,6 +290,11 @@ install(DIRECTORY
     FILES_MATCHING REGEX "\\.h(pp)?$"
 )
 
+install(EXPORT DPCTLSyclInterface
+  FILE DPCTLSyclInterface.cmake
+  DESTINATION cmake/DPCTLSyclInterface
+)
+
 # Add sub-directory to build the dpctl C API test cases
 if(DPCTL_BUILD_CAPI_TESTS)
     add_subdirectory(tests)