From be0150a56356ad5c9bb77bd70a9cc23b6de88edd Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Sat, 24 Feb 2018 00:25:34 +0100 Subject: [PATCH] WUD is default for Neo@Windows There is no need to have this macro and execute it twice Change-Id: I3756913d2dbba100bb173771d085c609e4509e69 --- CMakeLists.txt | 30 ++++++++----------- runtime/CMakeLists.txt | 6 ---- .../builtin_kernels_simulation/CMakeLists.txt | 2 -- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb20cb83ac..feed139ed6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,22 +348,6 @@ else() endif() endif() -# Support for WUD -macro(ENABLE_WUD) - if(MSVC) - set(CMAKE_CXX_STANDARD_LIBRARIES "onecore.lib") - set(LINKER_FLAGS "") - foreach(IT kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;) - set(LINKER_FLAGS "${LINKER_FLAGS} /NODEFAULTLIB:${IT}") - endforeach() - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}") - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}") - add_definitions(-DUNICODE -D_UNICODE) - link_directories("${WDK_DIR}/Lib/${WindowsTargetPlatformVersion}/um/${NEO_ARCH}/") - endif(MSVC) -endmacro(ENABLE_WUD) - # Miscs options option(IGDRCL_GCOV "generate gcov report" OFF) option(HAVE_TBX_SERVER "Compile TBX server from TbxAccess library" OFF) @@ -405,6 +389,18 @@ if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") endif() message(STATUS "WDK include paths: ${WDK_INCLUDE_PATHS}") + +# Support for WUD + set(CMAKE_CXX_STANDARD_LIBRARIES "onecore.lib") + set(LINKER_FLAGS "") + foreach(IT kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;) + set(LINKER_FLAGS "${LINKER_FLAGS} /NODEFAULTLIB:${IT}") + endforeach() + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}") + add_definitions(-DUNICODE -D_UNICODE) + link_directories("${WDK_DIR}/Lib/${WindowsTargetPlatformVersion}/um/${NEO_ARCH}/") else() if(IGDRCL_GCOV) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage --coverage") @@ -569,7 +565,7 @@ 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 (when WUD-crosscompilation is disabled) +set(NEO_DYNAMIC_LIB_NAME "igdrcl_dll") # single NEO dll set(NEO_DLL_NAME_BASE "igdrcl") set(BIKSIM_LIB_NAME "biksim") diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index b2883e2e16..aad69ab60d 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -28,12 +28,6 @@ endif (POLICY CMP0063) project (neo) -#set (CMAKE_CXX_VISIBILITY_PRESET default) -#set (CMAKE_VISIBILITY_INLINES_HIDDEN 1) - -# Support for Windows Universal Drivers -ENABLE_WUD() - if(NOT (TARGET ${BIKSIM_LIB_NAME})) add_subdirectory(builtin_kernels_simulation) endif(NOT (TARGET ${BIKSIM_LIB_NAME})) diff --git a/runtime/builtin_kernels_simulation/CMakeLists.txt b/runtime/builtin_kernels_simulation/CMakeLists.txt index cdcea5d003..c6e985915a 100644 --- a/runtime/builtin_kernels_simulation/CMakeLists.txt +++ b/runtime/builtin_kernels_simulation/CMakeLists.txt @@ -49,8 +49,6 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fPIC") endif() -ENABLE_WUD() - list (APPEND HEADER_INCLUDES ${IGDRCL_SOURCE_DIR}/runtime ${UMKM_SHAREDDATA_INCLUDE_PATHS}) foreach(GEN_NUM RANGE ${MAX_GEN})