mirror of
https://github.com/intel/compute-runtime.git
synced 2025-09-15 13:01:45 +08:00
Rename cmake variables
IGDRCL__* to NEO__* UMKM_SHAREDDATA_INCLUDE_PATHS to NEO__GMM_INCLUDE_DIR Change-Id: I565eedfbf572badd6bdbfaf9e09e62dbb2efb017 Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
committed by
sys_ocldev
sys_ocldev
parent
d838ed8a24
commit
d24735b38f
@ -277,26 +277,26 @@ if(NOT IGC__IGC_TARGETS)
|
||||
set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
|
||||
set(ENV{PKG_CONFIG_PATH} "${IGC_DIR}/${__tmp_LIBDIR}/pkgconfig")
|
||||
endif()
|
||||
pkg_check_modules(IGDRCL__IGC igc-opencl)
|
||||
pkg_check_modules(NEO__IGC igc-opencl)
|
||||
if(DEFINED __tmp_LIBDIR)
|
||||
set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
|
||||
set(IGDRCL__IGC_LIBRARY_PATH "${IGC_DIR}/${__tmp_LIBDIR}/")
|
||||
set(NEO__IGC_LIBRARY_PATH "${IGC_DIR}/${__tmp_LIBDIR}/")
|
||||
endif()
|
||||
|
||||
if(IGDRCL__IGC_FOUND)
|
||||
if(NEO__IGC_FOUND)
|
||||
if(DEFINED IGC_DIR AND IS_DIRECTORY "${IGC_DIR}/${__tmp_LIBDIR}/pkgconfig/")
|
||||
string(REPLACE "${IGDRCL__IGC_INCLUDEDIR}" "${IGC_DIR}/include/igc" IGDRCL__IGC_INCLUDE_DIRS "${IGDRCL__IGC_INCLUDE_DIRS}")
|
||||
string(REPLACE "${NEO__IGC_INCLUDEDIR}" "${IGC_DIR}/include/igc" NEO__IGC_INCLUDE_DIRS "${NEO__IGC_INCLUDE_DIRS}")
|
||||
endif()
|
||||
|
||||
set(IGDRCL__IGC_INCLUDE_DIR ${IGDRCL__IGC_INCLUDE_DIRS})
|
||||
message(STATUS "IGC include dirs: ${IGDRCL__IGC_INCLUDE_DIR}")
|
||||
set(NEO__IGC_INCLUDE_DIR ${NEO__IGC_INCLUDE_DIRS})
|
||||
message(STATUS "IGC include dirs: ${NEO__IGC_INCLUDE_DIR}")
|
||||
endif()
|
||||
if(DEFINED __tmp_LIBDIR)
|
||||
unset(__tmp_LIBDIR)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(IGDRCL__IGC_FOUND)
|
||||
if(NEO__IGC_FOUND)
|
||||
# do nothing
|
||||
elseif(EXISTS "${IGC_DIR}/CMakeLists.txt")
|
||||
message(STATUS "IGC source dir is: ${IGC_DIR}")
|
||||
@ -305,23 +305,23 @@ if(NOT IGC__IGC_TARGETS)
|
||||
set(IGC_OPTION__INCLUDE_IGC_COMPILER_TOOLS OFF)
|
||||
add_subdirectory_unique("${IGC_DIR}" "${NEO_BUILD_DIR}/igc" EXCLUDE_FROM_ALL)
|
||||
|
||||
set(IGDRCL__IGC_TARGETS "${IGC__IGC_TARGETS}")
|
||||
foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS})
|
||||
list(APPEND IGDRCL__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
list(APPEND IGDRCL__IGC_COMPILE_DEFINITIONS $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_COMPILE_DEFINITIONS>)
|
||||
set(NEO__IGC_TARGETS "${IGC__IGC_TARGETS}")
|
||||
foreach(TARGET_tmp ${NEO__IGC_TARGETS})
|
||||
list(APPEND NEO__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
list(APPEND NEO__IGC_COMPILE_DEFINITIONS $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_COMPILE_DEFINITIONS>)
|
||||
endforeach(TARGET_tmp)
|
||||
message(STATUS "IGC targets: ${IGDRCL__IGC_TARGETS}")
|
||||
message(STATUS "IGC targets: ${NEO__IGC_TARGETS}")
|
||||
else()
|
||||
message(FATAL_ERROR "Intel Graphics Compiler not found!")
|
||||
endif()
|
||||
else()
|
||||
set(IGDRCL__IGC_TARGETS "${IGC__IGC_TARGETS}")
|
||||
foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS})
|
||||
list(APPEND IGDRCL__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
list(APPEND IGDRCL__IGC_LIBRARY_PATH $<TARGET_FILE_DIR:${TARGET_tmp}>)
|
||||
set(NEO__IGC_TARGETS "${IGC__IGC_TARGETS}")
|
||||
foreach(TARGET_tmp ${NEO__IGC_TARGETS})
|
||||
list(APPEND NEO__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
list(APPEND NEO__IGC_LIBRARY_PATH $<TARGET_FILE_DIR:${TARGET_tmp}>)
|
||||
endforeach(TARGET_tmp)
|
||||
string(REPLACE ";" ":" IGDRCL__IGC_LIBRARY_PATH "${IGDRCL__IGC_LIBRARY_PATH}")
|
||||
message(STATUS "IGC targets: ${IGDRCL__IGC_TARGETS}")
|
||||
string(REPLACE ";" ":" NEO__IGC_LIBRARY_PATH "${NEO__IGC_LIBRARY_PATH}")
|
||||
message(STATUS "IGC targets: ${NEO__IGC_TARGETS}")
|
||||
endif()
|
||||
|
||||
# VISA headers - always relative to IGC
|
||||
@ -331,8 +331,8 @@ elseif(IS_DIRECTORY "${IGC_DIR}/visa")
|
||||
set(VISA_DIR "${IGC_DIR}/visa")
|
||||
elseif(IS_DIRECTORY "${IGC_DIR}/include/visa")
|
||||
set(VISA_DIR "${IGC_DIR}/include/visa")
|
||||
elseif(IS_DIRECTORY "${IGDRCL__IGC_INCLUDEDIR}/../visa")
|
||||
get_filename_component(VISA_DIR "${IGDRCL__IGC_INCLUDEDIR}/../visa" ABSOLUTE)
|
||||
elseif(IS_DIRECTORY "${NEO__IGC_INCLUDEDIR}/../visa")
|
||||
get_filename_component(VISA_DIR "${NEO__IGC_INCLUDEDIR}/../visa" ABSOLUTE)
|
||||
elseif(IS_DIRECTORY "${IGC_OCL_ADAPTOR_DIR}/../../visa")
|
||||
get_filename_component(VISA_DIR "${IGC_OCL_ADAPTOR_DIR}/../../visa" ABSOLUTE)
|
||||
endif()
|
||||
@ -375,8 +375,8 @@ endif()
|
||||
if(TARGET igfx_gmmumd_dll)
|
||||
set(GMM_TARGET_NAME "igfx_gmmumd_dll")
|
||||
set(GMM_LINK_NAME $<TARGET_PROPERTY:${GMM_TARGET_NAME},OUTPUT_NAME>)
|
||||
set(IGDRCL__GMM_LIBRARY_PATH $<TARGET_FILE_DIR:${GMM_TARGET_NAME}>)
|
||||
set(UMKM_SHAREDDATA_INCLUDE_PATHS $<TARGET_PROPERTY:${GMM_TARGET_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
set(NEO__GMM_LIBRARY_PATH $<TARGET_FILE_DIR:${GMM_TARGET_NAME}>)
|
||||
set(NEO__GMM_INCLUDE_DIR $<TARGET_PROPERTY:${GMM_TARGET_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
else()
|
||||
if(DEFINED GMM_DIR)
|
||||
get_filename_component(GMM_DIR "${GMM_DIR}" ABSOLUTE)
|
||||
@ -401,24 +401,23 @@ else()
|
||||
set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
|
||||
set(ENV{PKG_CONFIG_PATH} "${GMM_DIR}/${__tmp_LIBDIR}/pkgconfig/")
|
||||
endif()
|
||||
pkg_check_modules(IGDRCL__GMM igdgmm)
|
||||
pkg_check_modules(NEO__GMM igdgmm)
|
||||
if(DEFINED __tmp_LIBDIR)
|
||||
set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
|
||||
endif()
|
||||
|
||||
if(IGDRCL__GMM_FOUND)
|
||||
if(NEO__GMM_FOUND)
|
||||
if(DEFINED __tmp_LIBDIR)
|
||||
string(REPLACE "${IGDRCL__GMM_INCLUDEDIR}" "${GMM_DIR}/include/igdgmm" IGDRCL__GMM_INCLUDE_DIRS "${IGDRCL__GMM_INCLUDE_DIRS}")
|
||||
string(REPLACE "${IGDRCL__GMM_LIBDIR}" "${GMM_DIR}/${__tmp_LIBDIR}" IGDRCL__GMM_LIBDIR "${IGDRCL__GMM_LIBDIR}")
|
||||
set(IGDRCL__GMM_LIBRARY_PATH "${IGDRCL__GMM_LIBDIR}")
|
||||
string(REPLACE "${NEO__GMM_INCLUDEDIR}" "${GMM_DIR}/include/igdgmm" NEO__GMM_INCLUDE_DIRS "${NEO__GMM_INCLUDE_DIRS}")
|
||||
string(REPLACE "${NEO__GMM_LIBDIR}" "${GMM_DIR}/${__tmp_LIBDIR}" NEO__GMM_LIBDIR "${NEO__GMM_LIBDIR}")
|
||||
set(NEO__GMM_LIBRARY_PATH "${NEO__GMM_LIBDIR}")
|
||||
endif()
|
||||
|
||||
set(GMM_TARGET_NAME "igfx_gmmumd_dll")
|
||||
set(GMM_LINK_NAME ${IGDRCL__GMM_LIBRARIES})
|
||||
set(GMM_LINK_NAME ${NEO__GMM_LIBRARIES})
|
||||
|
||||
set(IGDRCL__GMM_INCLUDE_DIR ${IGDRCL__GMM_INCLUDE_DIRS})
|
||||
set(UMKM_SHAREDDATA_INCLUDE_PATHS "${IGDRCL__GMM_INCLUDE_DIR}")
|
||||
message(STATUS "GmmLib include dirs: ${IGDRCL__GMM_INCLUDE_DIR}")
|
||||
set(NEO__GMM_INCLUDE_DIR ${NEO__GMM_INCLUDE_DIRS})
|
||||
message(STATUS "GmmLib include dirs: ${NEO__GMM_INCLUDE_DIR}")
|
||||
else()
|
||||
message(FATAL_ERROR "GmmLib not found!")
|
||||
endif()
|
||||
@ -434,8 +433,8 @@ else()
|
||||
set(GMM_TARGET_NAME "igfx_gmmumd_dll")
|
||||
endif()
|
||||
|
||||
set(UMKM_SHAREDDATA_INCLUDE_PATHS $<TARGET_PROPERTY:${GMM_TARGET_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
set(IGDRCL__GMM_LIBRARY_PATH $<TARGET_FILE_DIR:${GMM_TARGET_NAME}>)
|
||||
set(NEO__GMM_INCLUDE_DIR $<TARGET_PROPERTY:${GMM_TARGET_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
set(NEO__GMM_LIBRARY_PATH $<TARGET_FILE_DIR:${GMM_TARGET_NAME}>)
|
||||
set(GMM_LINK_NAME $<TARGET_PROPERTY:${GMM_TARGET_NAME},OUTPUT_NAME>)
|
||||
else()
|
||||
message(FATAL_ERROR "GmmLib not found!")
|
||||
@ -454,7 +453,7 @@ macro(copy_gmm_dll_for target)
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
link_directories(${IGDRCL__GMM_LIBRARY_PATH})
|
||||
link_directories(${NEO__GMM_LIBRARY_PATH})
|
||||
|
||||
# Instrumentation detection
|
||||
if(NOT DEFINED INSTRUMENTATION_LIB_NAME)
|
||||
@ -487,9 +486,9 @@ endif()
|
||||
if(NOT DISABLE_LIBVA)
|
||||
# LibVA detection
|
||||
if(UNIX)
|
||||
set(IGDRCL__LIBVA_IS_REQUIRED "")
|
||||
set(NEO__LIBVA_IS_REQUIRED "")
|
||||
if(IGDRCL_FORCE_USE_LIBVA)
|
||||
set(IGDRCL__LIBVA_IS_REQUIRED "REQUIRED")
|
||||
set(NEO__LIBVA_IS_REQUIRED "REQUIRED")
|
||||
endif()
|
||||
|
||||
if(DEFINED LIBVA_SOURCE_DIR)
|
||||
@ -506,29 +505,29 @@ if(NOT DISABLE_LIBVA)
|
||||
set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
|
||||
set(ENV{PKG_CONFIG_PATH} "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
|
||||
endif()
|
||||
pkg_check_modules(IGDRCL__LIBVA ${IGDRCL__LIBVA_IS_REQUIRED} libva>=1.0.0)
|
||||
pkg_check_modules(NEO__LIBVA ${NEO__LIBVA_IS_REQUIRED} libva>=1.0.0)
|
||||
include(CheckLibraryExists)
|
||||
if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
|
||||
set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
|
||||
endif()
|
||||
|
||||
if(IGDRCL__LIBVA_FOUND)
|
||||
CHECK_LIBRARY_EXISTS(va vaGetLibFunc ${IGDRCL__LIBVA_LIBDIR} HAVE_VAGETLIBFUNC)
|
||||
if(NEO__LIBVA_FOUND)
|
||||
CHECK_LIBRARY_EXISTS(va vaGetLibFunc ${NEO__LIBVA_LIBDIR} HAVE_VAGETLIBFUNC)
|
||||
|
||||
add_definitions(-DLIBVA)
|
||||
message(STATUS "Using libva ")
|
||||
|
||||
if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
|
||||
string(REPLACE "${IGDRCL__LIBVA_INCLUDEDIR}" "${LIBVA_SOURCE_DIR}/include" IGDRCL__LIBVA_INCLUDE_DIRS "${IGDRCL__LIBVA_INCLUDE_DIRS}")
|
||||
string(REPLACE "${IGDRCL__LIBVA_LIBDIR}" "${LIBVA_SOURCE_DIR}/lib" IGDRCL__LIBVA_LIBDIR "${IGDRCL__LIBVA_LIBDIR}")
|
||||
set(IGDRCL__LIBVA_LIBRARY_PATH "${IGDRCL__LIBVA_LIBDIR}")
|
||||
string(REPLACE "${NEO__LIBVA_INCLUDEDIR}" "${LIBVA_SOURCE_DIR}/include" NEO__LIBVA_INCLUDE_DIRS "${NEO__LIBVA_INCLUDE_DIRS}")
|
||||
string(REPLACE "${NEO__LIBVA_LIBDIR}" "${LIBVA_SOURCE_DIR}/lib" NEO__LIBVA_LIBDIR "${NEO__LIBVA_LIBDIR}")
|
||||
set(NEO__LIBVA_LIBRARY_PATH "${NEO__LIBVA_LIBDIR}")
|
||||
endif()
|
||||
|
||||
list(LENGTH IGDRCL__LIBVA_INCLUDE_DIRS __len)
|
||||
list(LENGTH NEO__LIBVA_INCLUDE_DIRS __len)
|
||||
if(__len GREATER 0)
|
||||
set(IGDRCL__LIBVA_INCLUDE_DIR ${IGDRCL__LIBVA_INCLUDE_DIRS})
|
||||
include_directories("${IGDRCL__LIBVA_INCLUDE_DIR}")
|
||||
message(STATUS "LibVA include dirs: ${IGDRCL__LIBVA_INCLUDE_DIR}")
|
||||
set(NEO__LIBVA_INCLUDE_DIR ${NEO__LIBVA_INCLUDE_DIRS})
|
||||
include_directories("${NEO__LIBVA_INCLUDE_DIR}")
|
||||
message(STATUS "LibVA include dirs: ${NEO__LIBVA_INCLUDE_DIR}")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
@ -793,13 +792,13 @@ include_directories(${NEO_SOURCE_DIR}/runtime/memory_manager/definitions${BRANCH
|
||||
|
||||
|
||||
if(HAVE_INSTRUMENTATION)
|
||||
set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
|
||||
set(NEO__INSTRUMENTATION_DIR_SUFFIX ${BRANCH_DIR_SUFFIX})
|
||||
message(STATUS "Instrumentation include dirs: ${INSTRUMENTATION_INCLUDE_PATHS}")
|
||||
include_directories(${INSTRUMENTATION_INCLUDE_PATHS})
|
||||
else()
|
||||
set(IGDRCL__INSTRUMENTATION_DIR_SUFFIX "/")
|
||||
set(NEO__INSTRUMENTATION_DIR_SUFFIX "/")
|
||||
endif()
|
||||
include_directories(${NEO_SOURCE_DIR}/runtime/instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
|
||||
include_directories(${NEO_SOURCE_DIR}/runtime/instrumentation${NEO__INSTRUMENTATION_DIR_SUFFIX})
|
||||
|
||||
# Define where to put binaries
|
||||
set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
@ -877,7 +876,7 @@ if(EXISTS ${NEO_SOURCE_DIR}/scripts/format)
|
||||
endif()
|
||||
|
||||
configure_file(config.h.in ${NEO_BUILD_DIR}/config.h)
|
||||
if(WIN32 AND NOT IGDRCL__IGC_FOUND)
|
||||
if(WIN32 AND NOT NEO__IGC_FOUND)
|
||||
configure_file(igc.opencl.h.in ${NEO_BUILD_DIR}/igc.opencl.h)
|
||||
endif()
|
||||
configure_file(driver_version.h.in ${NEO_BUILD_DIR}/driver_version.h) # Put Driver version into define
|
||||
|
||||
Reference in New Issue
Block a user