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

Revert "Allow custom props settings."

Browse Source 
This reverts commit f43a04d3b2.

Change-Id: Ib4cd854c19fe96b0ea9d5e3782d1247c265927c9
This commit is contained in:
Zdunowski, Piotr
2018-02-22 14:16:36 +01:00
committed by sys_ocldev
parent a891b23830
commit e3268f8a9c
18 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -68,12 +68,6 @@ endif()
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
macro(set_vs_props TARGET_NAME)
if(MSVC AND VS_PROPS)
set_target_properties(${TARGET_NAME} PROPERTIES VS_PRE_DEFAULT_PROPS ${VS_PROPS})
endif()
endmacro(set_vs_props)
# 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)
if(MSVC) if(MSVC)
@@ -97,10 +91,6 @@ set(GMOCK_INCLUDE_DIR "${GMOCK_SRC_DIR}/include")
message(STATUS "Google Test source dir: ${GTEST_SRC_DIR}") message(STATUS "Google Test source dir: ${GTEST_SRC_DIR}")
message(STATUS "Google Mock source dir: ${GMOCK_SRC_DIR}") message(STATUS "Google Mock source dir: ${GMOCK_SRC_DIR}")
add_subdirectory(${GMOCK_SRC_DIR} ${IGDRCL_BINARY_DIR}/gmock) add_subdirectory(${GMOCK_SRC_DIR} ${IGDRCL_BINARY_DIR}/gmock)
set_vs_props(gtest)
set_vs_props(gmock)
set_vs_props(gtest_main)
set_vs_props(gmock_main)
set_target_properties(gtest PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON) set_target_properties(gtest PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
set_target_properties(gmock PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON) set_target_properties(gmock PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)

2
elf/CMakeLists.txt
View File

@@ -33,6 +33,6 @@ add_library(elflib STATIC
target_include_directories(elflib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(elflib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(elflib PRIVATE ${IGDRCL_SOURCE_DIR}) target_include_directories(elflib PRIVATE ${IGDRCL_SOURCE_DIR})
set_vs_props(elflib)
set_target_properties(elflib PROPERTIES FOLDER "elflib") set_target_properties(elflib PROPERTIES FOLDER "elflib")
set_target_properties(elflib PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(elflib PROPERTIES POSITION_INDEPENDENT_CODE ON)

1
offline_compiler/CMakeLists.txt
View File

@@ -113,7 +113,6 @@ endif(UNIX)
target_link_libraries(cloc elflib) target_link_libraries(cloc elflib)
source_group("source files" FILES ${CLOC_SRCS}) source_group("source files" FILES ${CLOC_SRCS})
set_vs_props(cloc)
set_target_properties(cloc PROPERTIES FOLDER "offline_compiler") set_target_properties(cloc PROPERTIES FOLDER "offline_compiler")
set_property(TARGET cloc APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) set_property(TARGET cloc APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})

3
runtime/CMakeLists.txt
View File

@@ -331,7 +331,6 @@ set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_COD
set_property(TARGET ${NEO_STATIC_LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) set_property(TARGET ${NEO_STATIC_LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
set_vs_props(${NEO_STATIC_LIB_NAME})
set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES FOLDER "opencl runtime") set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES FOLDER "opencl runtime")
target_include_directories(${NEO_STATIC_LIB_NAME} BEFORE PRIVATE ${HW_SRC_INCLUDE_PATH}) target_include_directories(${NEO_STATIC_LIB_NAME} BEFORE PRIVATE ${HW_SRC_INCLUDE_PATH})
@@ -386,8 +385,6 @@ if(${GENERATE_EXECUTABLE})
${HW_SRC_INCLUDE_PATH} ${HW_SRC_INCLUDE_PATH}
) )
set_vs_props(${NEO_DYNAMIC_LIB_NAME})
target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME}) target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME})
if(HAVE_INSTRUMENTATION) if(HAVE_INSTRUMENTATION)

1
runtime/built_ins/builtins_binary.cmake
View File

@@ -63,7 +63,6 @@ if(COMPILE_BUILT_INS)
set_source_files_properties(${GENERATED_BUILTINS_CPPS} PROPERTIES GENERATED TRUE) set_source_files_properties(${GENERATED_BUILTINS_CPPS} PROPERTIES GENERATED TRUE)
endif(COMPILE_BUILT_INS) endif(COMPILE_BUILT_INS)
set_vs_props(${BUILTINS_BINARIES_LIB_NAME})
set_target_properties(${BUILTINS_BINARIES_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(${BUILTINS_BINARIES_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(${BUILTINS_BINARIES_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${BUILTINS_BINARIES_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${BUILTINS_BINARIES_LIB_NAME} PROPERTIES FOLDER "built_ins") set_target_properties(${BUILTINS_BINARIES_LIB_NAME} PROPERTIES FOLDER "built_ins")

1
runtime/built_ins/registry/CMakeLists.txt
View File

@@ -24,7 +24,6 @@ add_library(${BUILTINS_SOURCES_LIB_NAME} OBJECT
register_ext_vme_source.cpp register_ext_vme_source.cpp
) )
set_vs_props(${BUILTINS_SOURCES_LIB_NAME})
set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES FOLDER "built_ins") set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES FOLDER "built_ins")

2
runtime/builtin_kernels_simulation/CMakeLists.txt
View File

@@ -68,7 +68,5 @@ target_include_directories(${BIKSIM_LIB_NAME} PRIVATE
${IGDRCL__IGC_INCLUDE_DIR} ${IGDRCL__IGC_INCLUDE_DIR}
${THIRD_PARTY_DIR} ${THIRD_PARTY_DIR}
) )
set_vs_props(${BIKSIM_LIB_NAME})
set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "built_ins") set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "built_ins")
target_compile_definitions(${BIKSIM_LIB_NAME} PUBLIC ${SUPPORTED_GEN_FLAGS_DEFINITONS} ${DEFAULT_GEN_PLATFORMS_DEFITIONS}) target_compile_definitions(${BIKSIM_LIB_NAME} PUBLIC ${SUPPORTED_GEN_FLAGS_DEFINITONS} ${DEFAULT_GEN_PLATFORMS_DEFITIONS})

1
runtime/scheduler/scheduler_binary.cmake
View File

@@ -93,7 +93,6 @@ if(COMPILE_BUILT_INS)
set_source_files_properties(${GENERATED_SCHEDULER_CPPS} PROPERTIES GENERATED TRUE) set_source_files_properties(${GENERATED_SCHEDULER_CPPS} PROPERTIES GENERATED TRUE)
endif(COMPILE_BUILT_INS) endif(COMPILE_BUILT_INS)
set_vs_props(${SCHEDULER_BINARY_LIB_NAME})
set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES FOLDER "scheduler") set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES FOLDER "scheduler")

2
runtime/sharings/CMakeLists.txt
View File

@@ -45,8 +45,6 @@ else()
target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PUBLIC ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux) target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PUBLIC ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux)
endif() endif()
set_vs_props(${SHARINGS_ENABLE_LIB_NAME})
add_subdirectory(d3d) add_subdirectory(d3d)
add_subdirectory(va) add_subdirectory(va)

1
unit_tests/CMakeLists.txt
View File

@@ -364,7 +364,6 @@ source_group("source files\\utilities" FILES ${IGDRCL_SRCS_tests_utilities})
if(MSVC) if(MSVC)
source_group("source files\\d3d_sharing" FILES ${IGDRCL_SRCS_tests_d3d_sharing}) source_group("source files\\d3d_sharing" FILES ${IGDRCL_SRCS_tests_d3d_sharing})
endif() endif()
set_vs_props(igdrcl_tests)
set_target_properties(igdrcl_tests PROPERTIES FOLDER "opencl runtime") set_target_properties(igdrcl_tests PROPERTIES FOLDER "opencl runtime")
set_property(TARGET igdrcl_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) set_property(TARGET igdrcl_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
if(NOT MSVC) if(NOT MSVC)

1
unit_tests/aub_tests/CMakeLists.txt
View File

@@ -33,7 +33,6 @@ add_executable(igdrcl_aub_tests
$<TARGET_OBJECTS:igdrcl_libult_cs> $<TARGET_OBJECTS:igdrcl_libult_cs>
) )
set_vs_props(igdrcl_aub_tests)
set_target_properties(igdrcl_aub_tests PROPERTIES FOLDER "opencl runtime") set_target_properties(igdrcl_aub_tests PROPERTIES FOLDER "opencl runtime")
add_custom_target(run_aub_tests) add_custom_target(run_aub_tests)

1
unit_tests/elflib/CMakeLists.txt
View File

@@ -53,7 +53,6 @@ add_custom_command(
add_dependencies(run_unit_tests run_elflib_tests) add_dependencies(run_unit_tests run_elflib_tests)
# The following filters are added to the VS IDE representation # The following filters are added to the VS IDE representation
set_vs_props(elflib_tests)
set_target_properties(elflib_tests PROPERTIES FOLDER "elflib") set_target_properties(elflib_tests PROPERTIES FOLDER "elflib")
set_target_properties(run_elflib_tests PROPERTIES FOLDER "elflib") set_target_properties(run_elflib_tests PROPERTIES FOLDER "elflib")
source_group("source files" FILES ${CLELFLIB_UNIT_TESTS_SRCS}) source_group("source files" FILES ${CLELFLIB_UNIT_TESTS_SRCS})

2
unit_tests/libult/CMakeLists.txt
View File

@@ -100,8 +100,6 @@ target_include_directories(igdrcl_libult_cs BEFORE PRIVATE ${HW_SRC_INCLUDE_PATH
# target_include_directories(igdrcl_libult PRIVATE $<TARGET_PROPERTY:instrumentation_umd,INTERFACE_INCLUDE_DIRECTORIES>) # target_include_directories(igdrcl_libult PRIVATE $<TARGET_PROPERTY:instrumentation_umd,INTERFACE_INCLUDE_DIRECTORIES>)
# endif() # endif()
set_vs_props(igdrcl_libult)
set_vs_props(igdrcl_libult_cs)
set_target_properties (igdrcl_libult PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties (igdrcl_libult PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties (igdrcl_libult_cs PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties (igdrcl_libult_cs PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(igdrcl_libult PUBLIC ${IGDRCL_LIB_FLAGS_DEFINITIONS} ${TESTED_GEN_FLAGS_DEFINITONS}) target_compile_definitions(igdrcl_libult PUBLIC ${IGDRCL_LIB_FLAGS_DEFINITIONS} ${TESTED_GEN_FLAGS_DEFINITONS})

1
unit_tests/mock_gdi/CMakeLists.txt
View File

@@ -49,7 +49,6 @@ target_include_directories(mock_gdi PRIVATE
${KHRONOS_HEADERS_DIR} ${KHRONOS_HEADERS_DIR}
) )
set_vs_props(mock_gdi)
set_target_properties( set_target_properties(
mock_gdi mock_gdi
PROPERTIES DEBUG_OUTPUT_NAME "gdi32_mock" PROPERTIES DEBUG_OUTPUT_NAME "gdi32_mock"

1
unit_tests/mt_tests/CMakeLists.txt
View File

@@ -135,7 +135,6 @@ source_group("source files\\os_interface" FILES ${IGDRCL_SRCS_mt_tests_os_interf
source_group("source files\\platform" FILES ${IGDRCL_SRCS_mt_tests_platform}) source_group("source files\\platform" FILES ${IGDRCL_SRCS_mt_tests_platform})
source_group("source files\\utilities" FILES ${IGDRCL_SRCS_mt_tests_utilities}) source_group("source files\\utilities" FILES ${IGDRCL_SRCS_mt_tests_utilities})
set_vs_props(igdrcl_mt_tests)
set_target_properties(igdrcl_mt_tests PROPERTIES FOLDER "opencl runtime") set_target_properties(igdrcl_mt_tests PROPERTIES FOLDER "opencl runtime")
set_property(TARGET igdrcl_mt_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${TSAN_FLAGS}) set_property(TARGET igdrcl_mt_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${TSAN_FLAGS})
if(NOT MSVC) if(NOT MSVC)

1
unit_tests/offline_compiler/CMakeLists.txt
View File

@@ -89,7 +89,6 @@ source_group("source files" FILES ${IGDRCL_SRCS_offline_compiler_tests})
source_group("source files\\windows" FILES ${IGDRCL_SRCS_offline_compiler_tests_windows}) source_group("source files\\windows" FILES ${IGDRCL_SRCS_offline_compiler_tests_windows})
source_group("source files\\mock" FILES ${IGDRCL_SRCS_offline_compiler_mock}) source_group("source files\\mock" FILES ${IGDRCL_SRCS_offline_compiler_mock})
set_vs_props(cloc_tests)
set_target_properties(cloc_tests PROPERTIES FOLDER "offline_compiler") set_target_properties(cloc_tests PROPERTIES FOLDER "offline_compiler")
set_property(TARGET cloc_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) set_property(TARGET cloc_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})

1
unit_tests/tbx/CMakeLists.txt
View File

@@ -67,6 +67,5 @@ add_custom_command(
) )
add_dependencies(run_unit_tests run_tbx_tests) add_dependencies(run_unit_tests run_tbx_tests)
set_vs_props(igdrcl_tbx_tests)
set_target_properties(igdrcl_tbx_tests PROPERTIES FOLDER "opencl runtime") set_target_properties(igdrcl_tbx_tests PROPERTIES FOLDER "opencl runtime")
set_target_properties(run_tbx_tests PROPERTIES FOLDER "opencl runtime") set_target_properties(run_tbx_tests PROPERTIES FOLDER "opencl runtime")

2
unit_tests/test_dynamic_lib/CMakeLists.txt
View File

@@ -30,8 +30,6 @@ endif(WIN32)
add_library(test_dynamic_lib SHARED test_dynamic_lib_${OS_SUFFIX}.cpp) add_library(test_dynamic_lib SHARED test_dynamic_lib_${OS_SUFFIX}.cpp)
set_vs_props(test_dynamic_lib)
set_target_properties(test_dynamic_lib PROPERTIES FOLDER "test mocks") set_target_properties(test_dynamic_lib PROPERTIES FOLDER "test mocks")
set_property(TARGET test_dynamic_lib APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) set_property(TARGET test_dynamic_lib APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})