From 49e5d2382486a5461a0031ce90e95d0ebd9ebceb Mon Sep 17 00:00:00 2001 From: kgv Date: Sat, 10 Sep 2016 15:38:05 +0300 Subject: [PATCH] 0027861: Configuration - include ApplicationFramework to UWP list --- CMakeLists.txt | 4 ++++ adm/cmake/vardescr.cmake | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee5e9edc3f..6e667562d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,6 +340,10 @@ if (ANDROID AND BUILD_MODULE_Draw) message (STATUS "Info. Draw module is turned off due to it is not supported on Android") set (BUILD_MODULE_Draw OFF CACHE BOOL "${BUILD_MODULE_Draw_DESCR}" FORCE) endif() +if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" AND BUILD_MODULE_Draw) + message (STATUS "Info. Draw module is turned off due to it is not supported on UWP") + set (BUILD_MODULE_Draw OFF CACHE BOOL "${BUILD_MODULE_Draw_DESCR}" FORCE) +endif() # Overview if (NOT DEFINED BUILD_DOC_Overview) diff --git a/adm/cmake/vardescr.cmake b/adm/cmake/vardescr.cmake index 875107073a..568fb97e0f 100644 --- a/adm/cmake/vardescr.cmake +++ b/adm/cmake/vardescr.cmake @@ -158,10 +158,5 @@ set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualiz macro (BUILD_MODULE MODULE_NAME) set (ENABLE_MODULE TRUE) - set (OCCT_MODULES_FOR_UWP FoundationClasses ModelingAlgorithms ModelingData DataExchange Visualization) - list (FIND OCCT_MODULES_FOR_UWP ${OCCT_MODULE} CAN_BE_USED_IN_UWP) - if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" AND CAN_BE_USED_IN_UWP EQUAL -1) - set (ENABLE_MODULE FALSE) - endif() set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}") endmacro()