From 10df55a507f884ae37431cff2f504867ca8ee14b Mon Sep 17 00:00:00 2001 From: Hoppe Date: Thu, 19 Dec 2019 14:22:00 +0100 Subject: [PATCH] Simplify setting TargetDir replace tabs with spaces Change-Id: Ie4c8f7027b7785b1f83bc29c92cbd9e5b7d98d35 Signed-off-by: Mateusz Hoppe --- CMakeLists.txt | 51 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5428a7dd40..33fc2dfa8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -800,42 +800,39 @@ endif() include_directories(${NEO_SOURCE_DIR}/runtime/instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX}) # Define where to put binaries +set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) if(MSVC) - if ("${CMAKE_GENERATOR}" STREQUAL "Ninja") - set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - else() - set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}) - endif() -else() - set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) -endif(MSVC) + if (NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja") + set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}) + endif() +endif() add_subdirectory_unique(offline_compiler ${NEO_BUILD_DIR}/offline_compiler) target_compile_definitions(ocloc PRIVATE MOCKABLE_VIRTUAL=) add_subdirectory_unique(core) macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC) - set(NEO_STATIC_LIB_NAME ${LIB_NAME}) - set(SHARINGS_ENABLE_LIB_NAME "${LIB_NAME}_sharings_enable") - set(GENERATE_EXECUTABLE ${GENERATE_EXEC}) - if(NOT BUILD_WITHOUT_RUNTIME) - add_subdirectory(runtime "${NEO_BUILD_DIR}/${LIB_NAME}") - else() - add_subdirectory(runtime "${NEO_BUILD_DIR}/${LIB_NAME}" EXCLUDE_FROM_ALL) - endif() - target_compile_definitions(${BUILTINS_SOURCES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) - target_compile_definitions(${BUILTINS_BINARIES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) - target_compile_definitions(${SCHEDULER_BINARY_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) + set(NEO_STATIC_LIB_NAME ${LIB_NAME}) + set(SHARINGS_ENABLE_LIB_NAME "${LIB_NAME}_sharings_enable") + set(GENERATE_EXECUTABLE ${GENERATE_EXEC}) + if(NOT BUILD_WITHOUT_RUNTIME) + add_subdirectory(runtime "${NEO_BUILD_DIR}/${LIB_NAME}") + else() + add_subdirectory(runtime "${NEO_BUILD_DIR}/${LIB_NAME}" EXCLUDE_FROM_ALL) + endif() + target_compile_definitions(${BUILTINS_SOURCES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) + target_compile_definitions(${BUILTINS_BINARIES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) + target_compile_definitions(${SCHEDULER_BINARY_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) - if(${MOCKABLE}) - target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual) - target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual) - target_compile_definitions(${LIB_NAME} PUBLIC DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} DEFAULT_TEST_FAMILY_NAME=${DEFAULT_TESTED_FAMILY_NAME} ${TESTED_GEN_FLAGS_DEFINITONS}) - else() - target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) - target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) - endif() + if(${MOCKABLE}) + target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual) + target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual) + target_compile_definitions(${LIB_NAME} PUBLIC DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} DEFAULT_TEST_FAMILY_NAME=${DEFAULT_TESTED_FAMILY_NAME} ${TESTED_GEN_FLAGS_DEFINITONS}) + else() + target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) + target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) + endif() endmacro(generate_runtime_lib) set(NEO_DYNAMIC_LIB_NAME "igdrcl_dll") # single NEO dll