intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-06 02:18:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for static gmmlib

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

https://github.com/intel/compute-runtime/pull/91

Change-Id: I90184d7aabf3dd0d8a74ff40115213241b4ca724
This commit is contained in:
Mateusz Jablonski
2018-09-26 06:31:01 +00:00
committed by sys_ocldev
parent c75dc23b6e
commit caa477115f
8 changed files with 32 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@@ -240,8 +240,8 @@ endif()
# GmmLib detection
if(NOT GMMUMD_LIB_NAME)
if(TARGET gmm_umd)
set(GMMUMD_LIB_NAME "gmm_umd")
if(TARGET igfx_gmmumd_dll)
set(GMMUMD_LIB_NAME "igfx_gmmumd_dll")
else()
if(DEFINED GMM_SOURCE_DIR)
get_filename_component(GMM_SOURCE_DIR "${GMM_SOURCE_DIR}" ABSOLUTE)
@@ -269,7 +269,6 @@ if(NOT GMMUMD_LIB_NAME)
set(IGDRCL__GMM_LIBRARY_PATH "${IGDRCL__GMM_LIBDIR}")
endif()
set(USE_STATIC_GMM FALSE)
set(GMMUMD_LIB_NAME "igfx_gmmumd_dll")
set(IGDRCL__GMM_INCLUDE_DIR ${IGDRCL__GMM_INCLUDE_DIRS})
@@ -288,29 +287,19 @@ if(NOT GMMUMD_LIB_NAME)
set(GMMUMD_LIB_NAME "igfx_gmmumd_dll")
endif()
get_target_property(target_type ${GMMUMD_LIB_NAME} TYPE)
if(target_type STREQUAL "STATIC_LIBRARY")
set(USE_STATIC_GMM TRUE)
endif()
set(UMKM_SHAREDDATA_INCLUDE_PATHS $<TARGET_PROPERTY:${GMMUMD_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
else()
message(FATAL_ERROR "GmmLib not found!")
endif()
endif()
else()
get_target_property(target_type ${GMMUMD_LIB_NAME} TYPE)
if(target_type STREQUAL "STATIC_LIBRARY")
set(USE_STATIC_GMM TRUE)
endif()
set(UMKM_SHAREDDATA_INCLUDE_PATHS $<TARGET_PROPERTY:${GMMUMD_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
endif()
set(GMM_LIBRARY_NAME "igdgmm${NEO_BITS}")
macro(copy_gmm_dll_for target)
if(NOT USE_STATIC_GMM AND NOT IGDRCL__GMM_FOUND)
if(NOT IGDRCL__GMM_FOUND)
add_dependencies(${target} ${GMMUMD_LIB_NAME})
add_custom_command(
TARGET ${target}