intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-21 09:14:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

CMake: rename variables

Browse Source 
IGDRCL_BINARY_DIR -> NEO_BINARY_DIR
IGDRCL_BUILD_DIR -> NEO_BUILD_DIR

Change-Id: I977b1819ac46482b3e18a4483195a2d1a18a6e68
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2019-10-14 12:55:52 +02:00
committed by sys_ocldev
parent 53307faf68
commit 9ed6194420
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeLists.txt
View File

@@ -100,12 +100,12 @@ if(SKIP_ALL_ULT)
endif() endif()
# Set our build directory # Set our build directory
if(NOT DEFINED IGDRCL_BUILD_DIR) if(NOT DEFINED NEO_BUILD_DIR)
set(IGDRCL_BUILD_DIR ${CMAKE_BINARY_DIR}) set(NEO_BUILD_DIR ${CMAKE_BINARY_DIR})
endif() endif()
if(NOT IGDRCL_BINARY_DIR) if(NOT NEO_BINARY_DIR)
set(IGDRCL_BINARY_DIR ${CMAKE_BINARY_DIR}) set(NEO_BINARY_DIR ${CMAKE_BINARY_DIR})
endif() endif()
# we use c++14 # we use c++14
@@ -116,9 +116,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1) set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
# set output paths # set output paths
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IGDRCL_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${NEO_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${IGDRCL_BINARY_DIR}/bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${NEO_BINARY_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${IGDRCL_BINARY_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${NEO_BINARY_DIR}/lib)
# We want to build with the static, multithreaded runtime libraries (as opposed # We want to build with the static, multithreaded runtime libraries (as opposed
# to the multithreaded runtime DLLs) # to the multithreaded runtime DLLs)
@@ -279,9 +279,9 @@ if(NOT IGC__IGC_TARGETS)
elseif(EXISTS "${IGC_DIR}/CMakeLists.txt") elseif(EXISTS "${IGC_DIR}/CMakeLists.txt")
message(STATUS "IGC source dir is: ${IGC_DIR}") message(STATUS "IGC source dir is: ${IGC_DIR}")
set(IGC_OPTION__OUTPUT_DIR "${IGDRCL_BUILD_DIR}/igc") set(IGC_OPTION__OUTPUT_DIR "${NEO_BUILD_DIR}/igc")
set(IGC_OPTION__INCLUDE_IGC_COMPILER_TOOLS OFF) set(IGC_OPTION__INCLUDE_IGC_COMPILER_TOOLS OFF)
add_subdirectory_unique("${IGC_DIR}" "${IGDRCL_BUILD_DIR}/igc" EXCLUDE_FROM_ALL) add_subdirectory_unique("${IGC_DIR}" "${NEO_BUILD_DIR}/igc" EXCLUDE_FROM_ALL)
set(IGDRCL__IGC_TARGETS "${IGC__IGC_TARGETS}") set(IGDRCL__IGC_TARGETS "${IGC__IGC_TARGETS}")
foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS}) foreach(TARGET_tmp ${IGDRCL__IGC_TARGETS})
@@ -394,7 +394,7 @@ if(NOT DEFINED GMMUMD_LIB_NAME)
else() else()
if(EXISTS "${GMM_SOURCE_DIR}/CMakeLists.txt") if(EXISTS "${GMM_SOURCE_DIR}/CMakeLists.txt")
message(STATUS "GmmLib source dir is: ${GMM_SOURCE_DIR}") message(STATUS "GmmLib source dir is: ${GMM_SOURCE_DIR}")
add_subdirectory_unique("${GMM_SOURCE_DIR}" "${IGDRCL_BUILD_DIR}/gmmlib") add_subdirectory_unique("${GMM_SOURCE_DIR}" "${NEO_BUILD_DIR}/gmmlib")
if(NOT DEFINED GMMUMD_LIB_NAME) if(NOT DEFINED GMMUMD_LIB_NAME)
set(GMMUMD_LIB_NAME "igfx_gmmumd_dll") set(GMMUMD_LIB_NAME "igfx_gmmumd_dll")
@@ -743,7 +743,7 @@ endif()
# Project-wide include paths # Project-wide include paths
# Please keep alphabetical order # Please keep alphabetical order
include_directories(${IGDRCL_BUILD_DIR}) include_directories(${NEO_BUILD_DIR})
include_directories(${NEO_SOURCE_DIR}) include_directories(${NEO_SOURCE_DIR})
include_directories(${NEO_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/core/memory_manager/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/core/memory_properties${BRANCH_DIR_SUFFIX})
@@ -780,7 +780,7 @@ else()
set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
endif(MSVC) endif(MSVC)
add_subdirectory_unique(offline_compiler ${IGDRCL_BUILD_DIR}/offline_compiler) add_subdirectory_unique(offline_compiler ${NEO_BUILD_DIR}/offline_compiler)
target_compile_definitions(ocloc PRIVATE MOCKABLE_VIRTUAL=) target_compile_definitions(ocloc PRIVATE MOCKABLE_VIRTUAL=)
add_subdirectory_unique(core) add_subdirectory_unique(core)
@@ -789,9 +789,9 @@ macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
set(SHARINGS_ENABLE_LIB_NAME "${LIB_NAME}_sharings_enable") set(SHARINGS_ENABLE_LIB_NAME "${LIB_NAME}_sharings_enable")
set(GENERATE_EXECUTABLE ${GENERATE_EXEC}) set(GENERATE_EXECUTABLE ${GENERATE_EXEC})
if(NOT BUILD_WITHOUT_RUNTIME) if(NOT BUILD_WITHOUT_RUNTIME)
add_subdirectory(runtime "${IGDRCL_BUILD_DIR}/${LIB_NAME}") add_subdirectory(runtime "${NEO_BUILD_DIR}/${LIB_NAME}")
else() else()
add_subdirectory(runtime "${IGDRCL_BUILD_DIR}/${LIB_NAME}" EXCLUDE_FROM_ALL) add_subdirectory(runtime "${NEO_BUILD_DIR}/${LIB_NAME}" EXCLUDE_FROM_ALL)
endif() endif()
target_compile_definitions(${BUILTINS_SOURCES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) target_compile_definitions(${BUILTINS_SOURCES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${BUILTINS_BINARIES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) target_compile_definitions(${BUILTINS_BINARIES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
@@ -832,24 +832,24 @@ else()
endif() endif()
if(DEFAULT_TESTED_PLATFORM) if(DEFAULT_TESTED_PLATFORM)
add_subdirectory_unique(unit_tests ${IGDRCL_BUILD_DIR}/unit_tests) add_subdirectory_unique(unit_tests ${NEO_BUILD_DIR}/unit_tests)
else() else()
hide_subdir(unit_tests) hide_subdir(unit_tests)
endif() endif()
set(DONT_LINK_ELF_STATICALLY TRUE) set(DONT_LINK_ELF_STATICALLY TRUE)
if(EXISTS ${NEO_SOURCE_DIR}/../internal) if(EXISTS ${NEO_SOURCE_DIR}/../internal)
add_subdirectory_unique(${NEO_SOURCE_DIR}/../internal ${IGDRCL_BUILD_DIR}/internal) add_subdirectory_unique(${NEO_SOURCE_DIR}/../internal ${NEO_BUILD_DIR}/internal)
endif(EXISTS ${NEO_SOURCE_DIR}/../internal) endif(EXISTS ${NEO_SOURCE_DIR}/../internal)
add_subdirectory_unique(scripts/lint) add_subdirectory_unique(scripts/lint)
configure_file(config.h.in ${IGDRCL_BUILD_DIR}/config.h) configure_file(config.h.in ${NEO_BUILD_DIR}/config.h)
if(WIN32 AND NOT IGDRCL__IGC_FOUND) if(WIN32 AND NOT IGDRCL__IGC_FOUND)
configure_file(igc.opencl.h.in ${IGDRCL_BUILD_DIR}/igc.opencl.h) configure_file(igc.opencl.h.in ${NEO_BUILD_DIR}/igc.opencl.h)
endif() endif()
configure_file(driver_version.h.in ${IGDRCL_BUILD_DIR}/driver_version.h) # Put Driver version into define configure_file(driver_version.h.in ${NEO_BUILD_DIR}/driver_version.h) # Put Driver version into define
configure_file(lib_names.h.in ${IGDRCL_BUILD_DIR}/lib_names.h) configure_file(lib_names.h.in ${NEO_BUILD_DIR}/lib_names.h)
hide_subdir(runtime) hide_subdir(runtime)
add_subdirectories() add_subdirectories()

20
package.cmake
View File

@@ -5,8 +5,8 @@
# #
if(UNIX) if(UNIX)
set(package_input_dir ${IGDRCL_BINARY_DIR}/packageinput) set(package_input_dir ${NEO_BINARY_DIR}/packageinput)
set(package_output_dir ${IGDRCL_BINARY_DIR}/packages) set(package_output_dir ${NEO_BINARY_DIR}/packages)
if(NOT DEFINED NEO_VERSION_MAJOR) if(NOT DEFINED NEO_VERSION_MAJOR)
set(NEO_VERSION_MAJOR 1) set(NEO_VERSION_MAJOR 1)
@@ -31,14 +31,14 @@ if(UNIX)
set(OCL_ICD_RUNTIME_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${NEO_DLL_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX}) set(OCL_ICD_RUNTIME_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${NEO_DLL_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX})
install( install(
CODE "file( WRITE ${IGDRCL_BINARY_DIR}/intel.icd \"${CMAKE_INSTALL_FULL_LIBDIR}/intel-opencl/${OCL_ICD_RUNTIME_NAME}\n\" )" CODE "file( WRITE ${NEO_BINARY_DIR}/intel.icd \"${CMAKE_INSTALL_FULL_LIBDIR}/intel-opencl/${OCL_ICD_RUNTIME_NAME}\n\" )"
CODE "file( WRITE ${IGDRCL_BINARY_DIR}/tmp/postinst \"/sbin/ldconfig\n\" )" CODE "file( WRITE ${NEO_BINARY_DIR}/tmp/postinst \"/sbin/ldconfig\n\" )"
CODE "file( WRITE ${IGDRCL_BINARY_DIR}/tmp/postrm \"/sbin/ldconfig\n\" )" CODE "file( WRITE ${NEO_BINARY_DIR}/tmp/postrm \"/sbin/ldconfig\n\" )"
CODE "file( COPY ${IGDRCL_BINARY_DIR}/tmp/postinst DESTINATION ${IGDRCL_BINARY_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )" CODE "file( COPY ${NEO_BINARY_DIR}/tmp/postinst DESTINATION ${NEO_BINARY_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )"
CODE "file( COPY ${IGDRCL_BINARY_DIR}/tmp/postrm DESTINATION ${IGDRCL_BINARY_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )" CODE "file( COPY ${NEO_BINARY_DIR}/tmp/postrm DESTINATION ${NEO_BINARY_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )"
COMPONENT opencl COMPONENT opencl
) )
install(FILES ${IGDRCL_BINARY_DIR}/intel.icd DESTINATION ${_dir_etc}/OpenCL/vendors/ COMPONENT opencl) install(FILES ${NEO_BINARY_DIR}/intel.icd DESTINATION ${_dir_etc}/OpenCL/vendors/ COMPONENT opencl)
if(NEO_CPACK_GENERATOR) if(NEO_CPACK_GENERATOR)
set(CPACK_GENERATOR "${NEO_CPACK_GENERATOR}") set(CPACK_GENERATOR "${NEO_CPACK_GENERATOR}")
@@ -75,8 +75,8 @@ if(UNIX)
set(CPACK_RPM_PACKAGE_RELEASE 1) set(CPACK_RPM_PACKAGE_RELEASE 1)
set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
set(CPACK_RPM_PACKAGE_URL "http://01.org/compute-runtime") set(CPACK_RPM_PACKAGE_URL "http://01.org/compute-runtime")
set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${IGDRCL_BINARY_DIR}/postinst") set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${NEO_BINARY_DIR}/postinst")
set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${IGDRCL_BINARY_DIR}/postrm") set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${NEO_BINARY_DIR}/postrm")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}) set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX})
set(CPACK_PACKAGE_CONTACT "Intel Corporation") set(CPACK_PACKAGE_CONTACT "Intel Corporation")
set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_DEB_COMPONENT_INSTALL ON)

2
runtime/CMakeLists.txt
View File

@@ -188,7 +188,7 @@ if(UNIX AND NOT (TARGET clang-tidy))
TARGET clang-tidy TARGET clang-tidy
POST_BUILD POST_BUILD
COMMAND echo clang-tidy... COMMAND echo clang-tidy...
COMMAND find ${CMAKE_CURRENT_SOURCE_DIR} -name *.cpp | xargs --verbose -I{} -P`nproc` clang-tidy-8 -p ${IGDRCL_BINARY_DIR} {} | tee ${IGDRCL_BINARY_DIR}/clang-tidy.log COMMAND find ${CMAKE_CURRENT_SOURCE_DIR} -name *.cpp | xargs --verbose -I{} -P`nproc` clang-tidy-8 -p ${NEO_BINARY_DIR} {} | tee ${NEO_BINARY_DIR}/clang-tidy.log
WORKING_DIRECTORY ${NEO_SOURCE_DIR} WORKING_DIRECTORY ${NEO_SOURCE_DIR}
) )
endif() endif()