build system improvements

Change-Id: I7f43535f01638f9aef1b7b80a01d10b74cc8e0fd
This commit is contained in:
Artur Harasimiuk
2018-03-21 23:40:59 +01:00
committed by sys_ocldev
parent 9486dba6dd
commit b93a208886
2 changed files with 13 additions and 5 deletions

View File

@@ -491,8 +491,6 @@ macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
endif()
endmacro(generate_runtime_lib)
set(NEO_MOCKABLE_LIB_NAME "igdrcl_lib_mockable") # Used by ULTS
set(NEO_RELEASE_LIB_NAME "igdrcl_lib_release") # Used by dll/so
set(NEO_DYNAMIC_LIB_NAME "igdrcl_dll") # single NEO dll
set(NEO_DLL_NAME_BASE "igdrcl")
@@ -502,8 +500,18 @@ set(BUILTINS_BINARIES_LIB_NAME "builtins_binaries")
set(SCHEDULER_BINARY_LIB_NAME "scheduler_binary")
add_subdirectory(elf)
generate_runtime_lib(${NEO_RELEASE_LIB_NAME} FALSE TRUE)
generate_runtime_lib(${NEO_MOCKABLE_LIB_NAME} TRUE FALSE)
if(DONT_CARE_OF_VIRTUALS)
message(STATUS "All targets will use virtuals")
set(NEO_RELEASE_LIB_NAME "igdrcl_lib")
set(NEO_MOCKABLE_LIB_NAME ${NEO_RELEASE_LIB_NAME})
generate_runtime_lib(${NEO_RELEASE_LIB_NAME} TRUE TRUE)
else()
set(NEO_MOCKABLE_LIB_NAME "igdrcl_lib_mockable") # Used by ULTS
set(NEO_RELEASE_LIB_NAME "igdrcl_lib_release") # Used by dll/so
generate_runtime_lib(${NEO_RELEASE_LIB_NAME} FALSE TRUE)
generate_runtime_lib(${NEO_MOCKABLE_LIB_NAME} TRUE FALSE)
endif()
if(TARGET OpenCL)
target_include_directories(OpenCL PRIVATE ${KHRONOS_HEADERS_DIR})

View File

@@ -31,7 +31,7 @@ components:
branch: infra
clean_on_sync: true
dest_dir: infra
revision: 037807f15c32ab1346a8ed23a0c26e76870ddde0
revision: 3c5866c732da9dcadb7dc4a7c7f11aab7950d0ac
type: git
internal:
branch: master