From c6441eba9bffb75175c01bd0848c109c6d5015cd Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 6 Mar 2018 14:50:30 +0100 Subject: [PATCH] Cmake refactor part 10 Cleanup cmake files in runtime dir Add missing files to solution Change-Id: I5d0cf8b658039f7bdf21681ac6e3750a5699d311 --- runtime/CMakeLists.txt | 50 +++++++------------ runtime/built_ins/builtins_binary.cmake | 25 +++++----- runtime/built_ins/kernels/CMakeLists.txt | 27 +++------- .../builtin_kernels_simulation/CMakeLists.txt | 9 ++-- runtime/command_queue/CMakeLists.txt | 9 ++-- runtime/compiler_interface/CMakeLists.txt | 1 + runtime/dll/CMakeLists.txt | 3 +- runtime/enable_gens.cmake | 3 -- runtime/gmm_helper/CMakeLists.txt | 1 - runtime/helpers/CMakeLists.txt | 2 +- runtime/sharings/CMakeLists.txt | 4 +- runtime/utilities/CMakeLists.txt | 1 + 12 files changed, 54 insertions(+), 81 deletions(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 1412c949a0..ed4779c199 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -43,21 +43,14 @@ add_library(${NEO_STATIC_LIB_NAME} STATIC add_subdirectories() add_subdirectory(instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX}) - -if(WIN32) - if("${IGDRCL_OPTION__BITS}" STREQUAL "32" ) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") - endif() -endif() - include(enable_gens.cmake) # Enable SSE4/AVX2 options for files that need them if(MSVC) - set_source_files_properties(command_queue/local_id_gen_avx2.cpp PROPERTIES COMPILE_FLAGS /arch:AVX2) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/command_queue/local_id_gen_avx2.cpp PROPERTIES COMPILE_FLAGS /arch:AVX2) else() - set_source_files_properties(command_queue/local_id_gen_avx2.cpp PROPERTIES COMPILE_FLAGS -mavx2) - set_source_files_properties(command_queue/local_id_gen_sse4.cpp PROPERTIES COMPILE_FLAGS -msse4.2) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/command_queue/local_id_gen_avx2.cpp PROPERTIES COMPILE_FLAGS -mavx2) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/command_queue/local_id_gen_sse4.cpp PROPERTIES COMPILE_FLAGS -msse4.2) endif() # Put Driver version into define @@ -65,22 +58,29 @@ if(NEO_DRIVER_VERSION) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/device/device_caps.cpp PROPERTIES COMPILE_DEFINITIONS NEO_DRIVER_VERSION="${NEO_DRIVER_VERSION}") endif() +if(WIN32) + if("${IGDRCL_OPTION__BITS}" STREQUAL "32" ) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") + endif() +endif() + target_link_libraries(${NEO_STATIC_LIB_NAME} elflib) target_include_directories(${NEO_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR} - ${GMM_INCLUDE_PATHS} ${KMDAF_HEADERS_DIR} - ${UMKM_SHAREDDATA_INCLUDE_PATHS} ) target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC ${KHRONOS_HEADERS_DIR} ${CIF_BASE_DIR} + ${GMM_INCLUDE_PATHS} ${GTPIN_HEADERS_DIR} + ${HW_SRC_INCLUDE_PATH} ${IGC_OCL_ADAPTOR_DIR} ${IGDRCL__IGC_INCLUDE_DIR} ${THIRD_PARTY_DIR} + ${UMKM_SHAREDDATA_INCLUDE_PATHS} ) if(WIN32) @@ -88,13 +88,11 @@ if(WIN32) ${WDK_INCLUDE_PATHS} os_interface/windows ) - target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC OGL=1) - target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC INSTR_WIN_UMD=1) + target_compile_definitions(${NEO_STATIC_LIB_NAME} PRIVATE OGL=1) else() - target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC OGL_GEM=1) target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC os_interface/linux - "${LIBDRM_DIR}/include" + ${LIBDRM_DIR}/include ) endif() @@ -105,7 +103,7 @@ link_directories(${GMM_LIB_PATHS}) target_link_libraries(${NEO_STATIC_LIB_NAME} ${GMMUMD_LIB_NAME}) if(INSTRUMENTATION_LIB_NAME) - add_dependencies(${NEO_STATIC_LIB_NAME} ${INSTRUMENTATION_LIB_NAME}) + add_dependencies(${NEO_STATIC_LIB_NAME} ${INSTRUMENTATION_LIB_NAME}) endif() if(WIN32) @@ -114,7 +112,7 @@ if(WIN32) else() set( DEF_FILE "${CMAKE_CURRENT_SOURCE_DIR}/dll/windows/OpenCLExports${IGDRCL_OPTION__BITS}.def" ) endif() -endif(WIN32) +endif() list(APPEND LIB_FLAGS_DEFINITIONS -DCIF_HEADERS_ONLY_BUILD ${SUPPORTED_GEN_FLAGS_DEFINITONS}) @@ -127,8 +125,6 @@ set_property(TARGET ${NEO_STATIC_LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES FOLDER "opencl runtime") -target_include_directories(${NEO_STATIC_LIB_NAME} BEFORE PRIVATE ${HW_SRC_INCLUDE_PATH}) - if(${GENERATE_EXECUTABLE}) if(GTPIN_HEADERS_DIR) foreach(GEN_NUM RANGE ${MAX_GEN}) @@ -152,28 +148,20 @@ if(${GENERATE_EXECUTABLE}) add_subdirectory(dll) if(HAVE_INSTRUMENTATION) - target_link_libraries(${NEO_DYNAMIC_LIB_NAME} instrumentation_umd) + target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${INSTRUMENTATION_LIB_NAME}) endif() target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME}) target_include_directories(${NEO_DYNAMIC_LIB_NAME} BEFORE PRIVATE ${CMAKE_CURRENT_BINARY_DIR} - ${HW_SRC_INCLUDE_PATH} - ) - - target_include_directories(${NEO_DYNAMIC_LIB_NAME} PUBLIC - ${GMM_INCLUDE_PATHS} - ${UMKM_SHAREDDATA_INCLUDE_PATHS} ${INSTRUMENTATION_INCLUDE_PATH} ) + if(WIN32) - target_include_directories(${NEO_DYNAMIC_LIB_NAME} PUBLIC - ${WDK_INCLUDE_PATHS} - ) target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME} dxgi Ws2_32.lib) else() - target_include_directories(${NEO_DYNAMIC_LIB_NAME} PUBLIC + target_include_directories(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/dll/linux/devices${BRANCH_DIR_SUFFIX} ) target_link_libraries(${NEO_DYNAMIC_LIB_NAME} dl pthread) diff --git a/runtime/built_ins/builtins_binary.cmake b/runtime/built_ins/builtins_binary.cmake index b2a36b111f..f9b74759ad 100644 --- a/runtime/built_ins/builtins_binary.cmake +++ b/runtime/built_ins/builtins_binary.cmake @@ -18,22 +18,23 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -add_library(${BUILTINS_BINARIES_LIB_NAME} OBJECT CMakeLists.txt) +add_library(${BUILTINS_BINARIES_LIB_NAME} OBJECT builtins_binary.cmake) # Add builtins sources add_subdirectory(registry) -set(GENERATED_BUILTINS "COPY_BUFFER_TO_BUFFER" - "COPY_BUFFER_RECT" - "FILL_BUFFER" - "COPY_BUFFER_TO_IMAGE3D" - "COPY_IMAGE3D_TO_BUFFER" - "COPY_IMAGE_TO_IMAGE1D" - "COPY_IMAGE_TO_IMAGE2D" - "COPY_IMAGE_TO_IMAGE3D" - "FILL_IMAGE1D" - "FILL_IMAGE2D" - "FILL_IMAGE3D" +set(GENERATED_BUILTINS + "copy_buffer_rect" + "copy_buffer_to_buffer" + "copy_buffer_to_image3d" + "copy_image3d_to_buffer" + "copy_image_to_image1d" + "copy_image_to_image2d" + "copy_image_to_image3d" + "fill_buffer" + "fill_image1d" + "fill_image2d" + "fill_image3d" ) # Generate builtins cpps diff --git a/runtime/built_ins/kernels/CMakeLists.txt b/runtime/built_ins/kernels/CMakeLists.txt index a282d19f8b..3388e50a60 100644 --- a/runtime/built_ins/kernels/CMakeLists.txt +++ b/runtime/built_ins/kernels/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017, Intel Corporation +# Copyright (c) 2017 - 2018, Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -20,32 +20,19 @@ add_custom_target(builtins) set_target_properties(builtins PROPERTIES FOLDER "built_ins") -set (BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}") +set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}") add_dependencies(${BUILTINS_BINARIES_LIB_NAME} builtins) -# Set variables needed to compile built-in kernels -set (COPY_BUFFER_TO_BUFFER_BUILTIN copy_buffer_to_buffer.igdrcl_built_in) -set (COPY_BUFFER_RECT_BUILTIN copy_buffer_rect.igdrcl_built_in) -set (FILL_BUFFER_BUILTIN fill_buffer.igdrcl_built_in) -set (COPY_BUFFER_TO_IMAGE3D_BUILTIN copy_buffer_to_image3d.igdrcl_built_in) -set (COPY_IMAGE3D_TO_BUFFER_BUILTIN copy_image3d_to_buffer.igdrcl_built_in) -set (COPY_IMAGE_TO_IMAGE1D_BUILTIN copy_image_to_image1d.igdrcl_built_in) -set (COPY_IMAGE_TO_IMAGE2D_BUILTIN copy_image_to_image2d.igdrcl_built_in) -set (COPY_IMAGE_TO_IMAGE3D_BUILTIN copy_image_to_image3d.igdrcl_built_in) -set (FILL_IMAGE1D_BUILTIN fill_image1d.igdrcl_built_in) -set (FILL_IMAGE2D_BUILTIN fill_image2d.igdrcl_built_in) -set (FILL_IMAGE3D_BUILTIN fill_image3d.igdrcl_built_in) - if("${NEO_ARCH}" STREQUAL "x32") - set(BUILTIN_OPTIONS "-cl-intel-greater-than-4GB-buffer-required") + set(BUILTIN_OPTIONS "-cl-intel-greater-than-4GB-buffer-required") else() - set(BUILTIN_OPTIONS "") + set(BUILTIN_OPTIONS "") endif() if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" ) - set(BUILTIN_DEBUG_OPTION "-D DEBUG") + set(BUILTIN_DEBUG_OPTION "-D DEBUG") else() - set(BUILTIN_DEBUG_OPTION "") + set(BUILTIN_DEBUG_OPTION "") endif() set(BUILTINS_INCLUDE_DIR ${TargetDir} PARENT_SCOPE) @@ -97,7 +84,7 @@ macro(compile_builtins GEN_NUM PLATFORM_IT) set (BUILTINS_COMMANDS) foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS}) - compile_builtin(${PLATFORM_LOWER} ${${GENERATED_BUILTIN}_BUILTIN}) + compile_builtin(${PLATFORM_LOWER} ${GENERATED_BUILTIN}.igdrcl_built_in) list(APPEND BUILTINS_COMMANDS ${TargetDir}/${BUILTIN_CPP}) set (RUNTIME_GENERATED_${GENERATED_BUILTIN}${GEN} ${BUILTIN_CPP} PARENT_SCOPE) endforeach(GENERATED_BUILTIN) diff --git a/runtime/builtin_kernels_simulation/CMakeLists.txt b/runtime/builtin_kernels_simulation/CMakeLists.txt index c6e985915a..7bff8c258d 100644 --- a/runtime/builtin_kernels_simulation/CMakeLists.txt +++ b/runtime/builtin_kernels_simulation/CMakeLists.txt @@ -49,19 +49,18 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fPIC") endif() -list (APPEND HEADER_INCLUDES ${IGDRCL_SOURCE_DIR}/runtime ${UMKM_SHAREDDATA_INCLUDE_PATHS}) - foreach(GEN_NUM RANGE ${MAX_GEN}) GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) list(APPEND DEFAULT_GEN_PLATFORMS_DEFITIONS DEFAULT_GEN${GEN_NUM}_PLATFORM=${DEFAULT_SUPPORTED_GEN${GEN_NUM}_PLATFORM}) - list (APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/gen${GEN_NUM}/scheduler_simulation.cpp) + list(APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/gen${GEN_NUM}/scheduler_simulation.cpp) endif() endforeach() add_library(${BIKSIM_LIB_NAME} OBJECT ${BUILTIN_KERNELS_SIMULATION_SRCS}) -target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE ${HEADER_INCLUDES}) -target_include_directories(${BIKSIM_LIB_NAME} PRIVATE +target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE + ${IGDRCL_SOURCE_DIR}/runtime + ${UMKM_SHAREDDATA_INCLUDE_PATHS} ${KHRONOS_HEADERS_DIR} ${IGDRCL__IGC_INCLUDE_DIR} ${THIRD_PARTY_DIR} diff --git a/runtime/command_queue/CMakeLists.txt b/runtime/command_queue/CMakeLists.txt index 215cbe54a6..1fae07b837 100644 --- a/runtime/command_queue/CMakeLists.txt +++ b/runtime/command_queue/CMakeLists.txt @@ -20,11 +20,11 @@ set(RUNTIME_SRCS_COMMAND_QUEUE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/cpu_data_transfer_handler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/command_queue.cpp ${CMAKE_CURRENT_SOURCE_DIR}/command_queue.h ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw.h ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cpu_data_transfer_handler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker.h ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_helper.inl @@ -38,23 +38,22 @@ set(RUNTIME_SRCS_COMMAND_QUEUE ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_buffer.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_image.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel.h - ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_svm.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_marker.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_migrate_mem_objects.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer_rect.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_image.h + ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_svm.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_buffer.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_buffer_rect.h ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_image.h ${CMAKE_CURRENT_SOURCE_DIR}/finish.h ${CMAKE_CURRENT_SOURCE_DIR}/flush.h ${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen_avx2.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen_sse4.cpp ${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.h ${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen.inl + ${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen_avx2.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/local_id_gen_sse4.cpp ${CMAKE_CURRENT_SOURCE_DIR}/local_work_size.cpp ) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMAND_QUEUE}) diff --git a/runtime/compiler_interface/CMakeLists.txt b/runtime/compiler_interface/CMakeLists.txt index b0736e088f..b56aee164e 100644 --- a/runtime/compiler_interface/CMakeLists.txt +++ b/runtime/compiler_interface/CMakeLists.txt @@ -21,6 +21,7 @@ set(RUNTIME_SRCS_COMPILER_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/binary_cache.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/binary_cache.h ${CMAKE_CURRENT_SOURCE_DIR}/compiler_interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/compiler_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/compiler_interface.inl diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt index 3a25a8f0d3..2f1db80dc2 100644 --- a/runtime/dll/CMakeLists.txt +++ b/runtime/dll/CMakeLists.txt @@ -25,10 +25,11 @@ else() endif() set(RUNTIME_SRCS_DLL_BASE - ${CMAKE_CURRENT_SOURCE_DIR}/options.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream.cpp ${CMAKE_CURRENT_SOURCE_DIR}/create_deferred_deleter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/create_tbx_sockets.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/options.cpp ${IGDRCL_SOURCE_DIR}/runtime/api/api.cpp ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake index eedfdbc75d..2e34495139 100644 --- a/runtime/enable_gens.cmake +++ b/runtime/enable_gens.cmake @@ -102,9 +102,6 @@ foreach(GEN_NUM RANGE ${MAX_GEN}) list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_GEN${GEN_NUM}_LINUX}) list(APPEND HW_SRC_LINK ${GEN${GEN_NUM}_SRC_LINK_LINUX}) endif() - - source_group("gen${GEN_NUM}" FILES ${RUNTIME_SRCS_GEN${GEN_NUM}_BASE} ${GEN${GEN_NUM}_SRC_LINK_BASE}) - source_group("gen${GEN_NUM}\\windows" FILES ${RUNTIME_SRCS_GEN${GEN_NUM}_WINDOWS}) endif() endforeach() diff --git a/runtime/gmm_helper/CMakeLists.txt b/runtime/gmm_helper/CMakeLists.txt index b967ed1305..45a8d04af1 100644 --- a/runtime/gmm_helper/CMakeLists.txt +++ b/runtime/gmm_helper/CMakeLists.txt @@ -31,7 +31,6 @@ set(RUNTIME_SRCS_GMM_HELPER_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/page_table_mngr.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/gmm_memory.h ${CMAKE_CURRENT_SOURCE_DIR}/gmm_memory_base.h - PARENT_SCOPE ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GMM_HELPER_BASE}) diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index c091d524ad..02c1994db0 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -79,11 +79,11 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4.h ${CMAKE_CURRENT_SOURCE_DIR}/validators.cpp ${CMAKE_CURRENT_SOURCE_DIR}/validators.h - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_helper.h ) set(RUNTIME_SRCS_HELPERS_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/translationtable_callbacks.h ${CMAKE_CURRENT_SOURCE_DIR}/translationtable_callbacks.inl + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_helper.h ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_HELPERS_BASE}) diff --git a/runtime/sharings/CMakeLists.txt b/runtime/sharings/CMakeLists.txt index 23a50a6ffc..7e7348e0ef 100644 --- a/runtime/sharings/CMakeLists.txt +++ b/runtime/sharings/CMakeLists.txt @@ -42,9 +42,9 @@ set(RUNTIME_SRCS_SHARINGS target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SHARINGS}) if(WIN32) - target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PUBLIC ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows) + target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows) else() - target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PUBLIC ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux) + target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux) endif() add_subdirectories() diff --git a/runtime/utilities/CMakeLists.txt b/runtime/utilities/CMakeLists.txt index 58197836cc..bcd29d4471 100644 --- a/runtime/utilities/CMakeLists.txt +++ b/runtime/utilities/CMakeLists.txt @@ -34,6 +34,7 @@ set(RUNTIME_SRCS_UTILITIES_BASE ${CMAKE_CURRENT_SOURCE_DIR}/idlist.h ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.h + ${CMAKE_CURRENT_SOURCE_DIR}/range.h ${CMAKE_CURRENT_SOURCE_DIR}/reference_tracked_object.h ${CMAKE_CURRENT_SOURCE_DIR}/spinlock.h ${CMAKE_CURRENT_SOURCE_DIR}/stackvec.h