From e3268f8a9cfda5f90f3d696fe9e5a41e238b0b4c Mon Sep 17 00:00:00 2001 From: "Zdunowski, Piotr" Date: Thu, 22 Feb 2018 14:16:36 +0100 Subject: [PATCH] Revert "Allow custom props settings." This reverts commit f43a04d3b27fc48d1d2c8d6b0849180e86b157ad. Change-Id: Ib4cd854c19fe96b0ea9d5e3782d1247c265927c9 --- CMakeLists.txt | 10 ---------- elf/CMakeLists.txt | 2 +- offline_compiler/CMakeLists.txt | 1 - runtime/CMakeLists.txt | 3 --- runtime/built_ins/builtins_binary.cmake | 1 - runtime/built_ins/registry/CMakeLists.txt | 1 - runtime/builtin_kernels_simulation/CMakeLists.txt | 2 -- runtime/scheduler/scheduler_binary.cmake | 1 - runtime/sharings/CMakeLists.txt | 2 -- unit_tests/CMakeLists.txt | 1 - unit_tests/aub_tests/CMakeLists.txt | 1 - unit_tests/elflib/CMakeLists.txt | 1 - unit_tests/libult/CMakeLists.txt | 2 -- unit_tests/mock_gdi/CMakeLists.txt | 1 - unit_tests/mt_tests/CMakeLists.txt | 1 - unit_tests/offline_compiler/CMakeLists.txt | 1 - unit_tests/tbx/CMakeLists.txt | 1 - unit_tests/test_dynamic_lib/CMakeLists.txt | 2 -- 18 files changed, 1 insertion(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af84c16459..f1e5a83592 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,12 +68,6 @@ endif() set(CMAKE_CXX_STANDARD 11) 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 # to the multithreaded runtime DLLs) 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 Mock source dir: ${GMOCK_SRC_DIR}") 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(gmock PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON) diff --git a/elf/CMakeLists.txt b/elf/CMakeLists.txt index 00dfa3d5e8..15f0686823 100644 --- a/elf/CMakeLists.txt +++ b/elf/CMakeLists.txt @@ -33,6 +33,6 @@ add_library(elflib STATIC target_include_directories(elflib PUBLIC ${CMAKE_CURRENT_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 POSITION_INDEPENDENT_CODE ON) diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt index 8c9f76ee74..d30d63faaf 100644 --- a/offline_compiler/CMakeLists.txt +++ b/offline_compiler/CMakeLists.txt @@ -113,7 +113,6 @@ endif(UNIX) target_link_libraries(cloc elflib) source_group("source files" FILES ${CLOC_SRCS}) -set_vs_props(cloc) set_target_properties(cloc PROPERTIES FOLDER "offline_compiler") set_property(TARGET cloc APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 67f5f6dc89..0b62950631 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -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_vs_props(${NEO_STATIC_LIB_NAME}) set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES FOLDER "opencl runtime") target_include_directories(${NEO_STATIC_LIB_NAME} BEFORE PRIVATE ${HW_SRC_INCLUDE_PATH}) @@ -386,8 +385,6 @@ if(${GENERATE_EXECUTABLE}) ${HW_SRC_INCLUDE_PATH} ) - set_vs_props(${NEO_DYNAMIC_LIB_NAME}) - target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME}) if(HAVE_INSTRUMENTATION) diff --git a/runtime/built_ins/builtins_binary.cmake b/runtime/built_ins/builtins_binary.cmake index 3401d3ea6c..b2a36b111f 100644 --- a/runtime/built_ins/builtins_binary.cmake +++ b/runtime/built_ins/builtins_binary.cmake @@ -63,7 +63,6 @@ if(COMPILE_BUILT_INS) set_source_files_properties(${GENERATED_BUILTINS_CPPS} PROPERTIES GENERATED TRUE) 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 POSITION_INDEPENDENT_CODE ON) set_target_properties(${BUILTINS_BINARIES_LIB_NAME} PROPERTIES FOLDER "built_ins") diff --git a/runtime/built_ins/registry/CMakeLists.txt b/runtime/built_ins/registry/CMakeLists.txt index 566532ab54..807f1834aa 100644 --- a/runtime/built_ins/registry/CMakeLists.txt +++ b/runtime/built_ins/registry/CMakeLists.txt @@ -24,7 +24,6 @@ add_library(${BUILTINS_SOURCES_LIB_NAME} OBJECT 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 FOLDER "built_ins") diff --git a/runtime/builtin_kernels_simulation/CMakeLists.txt b/runtime/builtin_kernels_simulation/CMakeLists.txt index b412aaa4a2..cdcea5d003 100644 --- a/runtime/builtin_kernels_simulation/CMakeLists.txt +++ b/runtime/builtin_kernels_simulation/CMakeLists.txt @@ -68,7 +68,5 @@ target_include_directories(${BIKSIM_LIB_NAME} PRIVATE ${IGDRCL__IGC_INCLUDE_DIR} ${THIRD_PARTY_DIR} ) - -set_vs_props(${BIKSIM_LIB_NAME}) 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}) diff --git a/runtime/scheduler/scheduler_binary.cmake b/runtime/scheduler/scheduler_binary.cmake index 7b3b0380fc..0af8efeafd 100644 --- a/runtime/scheduler/scheduler_binary.cmake +++ b/runtime/scheduler/scheduler_binary.cmake @@ -93,7 +93,6 @@ if(COMPILE_BUILT_INS) set_source_files_properties(${GENERATED_SCHEDULER_CPPS} PROPERTIES GENERATED TRUE) 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 POSITION_INDEPENDENT_CODE ON) set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES FOLDER "scheduler") diff --git a/runtime/sharings/CMakeLists.txt b/runtime/sharings/CMakeLists.txt index e904b78496..1c97d54b9e 100644 --- a/runtime/sharings/CMakeLists.txt +++ b/runtime/sharings/CMakeLists.txt @@ -45,8 +45,6 @@ else() target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PUBLIC ${IGDRCL_SOURCE_DIR}/runtime/os_interface/linux) endif() -set_vs_props(${SHARINGS_ENABLE_LIB_NAME}) - add_subdirectory(d3d) add_subdirectory(va) diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt index 9c80051947..ac8d6a57e5 100644 --- a/unit_tests/CMakeLists.txt +++ b/unit_tests/CMakeLists.txt @@ -364,7 +364,6 @@ source_group("source files\\utilities" FILES ${IGDRCL_SRCS_tests_utilities}) if(MSVC) source_group("source files\\d3d_sharing" FILES ${IGDRCL_SRCS_tests_d3d_sharing}) endif() -set_vs_props(igdrcl_tests) set_target_properties(igdrcl_tests PROPERTIES FOLDER "opencl runtime") set_property(TARGET igdrcl_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) if(NOT MSVC) diff --git a/unit_tests/aub_tests/CMakeLists.txt b/unit_tests/aub_tests/CMakeLists.txt index 1f23967083..5e624451ee 100644 --- a/unit_tests/aub_tests/CMakeLists.txt +++ b/unit_tests/aub_tests/CMakeLists.txt @@ -33,7 +33,6 @@ add_executable(igdrcl_aub_tests $ ) -set_vs_props(igdrcl_aub_tests) set_target_properties(igdrcl_aub_tests PROPERTIES FOLDER "opencl runtime") add_custom_target(run_aub_tests) diff --git a/unit_tests/elflib/CMakeLists.txt b/unit_tests/elflib/CMakeLists.txt index eb58665f44..67ef7c3a89 100644 --- a/unit_tests/elflib/CMakeLists.txt +++ b/unit_tests/elflib/CMakeLists.txt @@ -53,7 +53,6 @@ add_custom_command( add_dependencies(run_unit_tests run_elflib_tests) # 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(run_elflib_tests PROPERTIES FOLDER "elflib") source_group("source files" FILES ${CLELFLIB_UNIT_TESTS_SRCS}) diff --git a/unit_tests/libult/CMakeLists.txt b/unit_tests/libult/CMakeLists.txt index 9e068c4d47..7b6db295cd 100644 --- a/unit_tests/libult/CMakeLists.txt +++ b/unit_tests/libult/CMakeLists.txt @@ -100,8 +100,6 @@ target_include_directories(igdrcl_libult_cs BEFORE PRIVATE ${HW_SRC_INCLUDE_PATH # target_include_directories(igdrcl_libult PRIVATE $) # 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_cs PROPERTIES POSITION_INDEPENDENT_CODE ON) target_compile_definitions(igdrcl_libult PUBLIC ${IGDRCL_LIB_FLAGS_DEFINITIONS} ${TESTED_GEN_FLAGS_DEFINITONS}) diff --git a/unit_tests/mock_gdi/CMakeLists.txt b/unit_tests/mock_gdi/CMakeLists.txt index 02b8ce7ee1..4acd784ba7 100644 --- a/unit_tests/mock_gdi/CMakeLists.txt +++ b/unit_tests/mock_gdi/CMakeLists.txt @@ -49,7 +49,6 @@ target_include_directories(mock_gdi PRIVATE ${KHRONOS_HEADERS_DIR} ) -set_vs_props(mock_gdi) set_target_properties( mock_gdi PROPERTIES DEBUG_OUTPUT_NAME "gdi32_mock" diff --git a/unit_tests/mt_tests/CMakeLists.txt b/unit_tests/mt_tests/CMakeLists.txt index 9c3279ec8a..42064e857e 100644 --- a/unit_tests/mt_tests/CMakeLists.txt +++ b/unit_tests/mt_tests/CMakeLists.txt @@ -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\\utilities" FILES ${IGDRCL_SRCS_mt_tests_utilities}) -set_vs_props(igdrcl_mt_tests) set_target_properties(igdrcl_mt_tests PROPERTIES FOLDER "opencl runtime") set_property(TARGET igdrcl_mt_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${TSAN_FLAGS}) if(NOT MSVC) diff --git a/unit_tests/offline_compiler/CMakeLists.txt b/unit_tests/offline_compiler/CMakeLists.txt index 1537d38a4d..14c39b91fd 100644 --- a/unit_tests/offline_compiler/CMakeLists.txt +++ b/unit_tests/offline_compiler/CMakeLists.txt @@ -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\\mock" FILES ${IGDRCL_SRCS_offline_compiler_mock}) -set_vs_props(cloc_tests) set_target_properties(cloc_tests PROPERTIES FOLDER "offline_compiler") set_property(TARGET cloc_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) diff --git a/unit_tests/tbx/CMakeLists.txt b/unit_tests/tbx/CMakeLists.txt index 4edbfa1e43..10358ee1e8 100644 --- a/unit_tests/tbx/CMakeLists.txt +++ b/unit_tests/tbx/CMakeLists.txt @@ -67,6 +67,5 @@ add_custom_command( ) 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(run_tbx_tests PROPERTIES FOLDER "opencl runtime") diff --git a/unit_tests/test_dynamic_lib/CMakeLists.txt b/unit_tests/test_dynamic_lib/CMakeLists.txt index 45f51ca318..4159873566 100644 --- a/unit_tests/test_dynamic_lib/CMakeLists.txt +++ b/unit_tests/test_dynamic_lib/CMakeLists.txt @@ -30,8 +30,6 @@ endif(WIN32) 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_property(TARGET test_dynamic_lib APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})