From 0d51e90953d09268d328f2cd2dc38192220912a9 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 6 Aug 2020 21:52:44 +0800 Subject: [PATCH] TD-1057 --- deps/MsvcLibX/CMakeLists.txt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/deps/MsvcLibX/CMakeLists.txt b/deps/MsvcLibX/CMakeLists.txt index a94625f29d..7f24d34dd5 100644 --- a/deps/MsvcLibX/CMakeLists.txt +++ b/deps/MsvcLibX/CMakeLists.txt @@ -8,15 +8,23 @@ IF (TD_WINDOWS_64) get_mywindowssdk_include_dirs(${WINDOWSSDK_PREFERRED_DIR} WINSDK_INCLUDE_DIR) get_ucrt_include_dirs(${WINDOWSSDK_PREFERRED_DIR} UCRT_INCLUDE_DIR) - Message(STATUS "WINSDK_INCLUDE_DIR ============> ${WINSDK_INCLUDE_DIR}") - Message(STATUS "UCRT_INCLUDE_DIR ============> ${UCRT_INCLUDE_DIR}") - - Add_Definitions("-DUCRTINCLUDE=${UCRT_INCLUDE_DIR}") Add_Definitions("-DWSDKINCLUDE=${WINSDK_INCLUDE_DIR}") include(FindMSVC) Add_Definitions("-DMSVCINCLUDE=${VC_INCLUDE_DIR}") - + + IF ((NOT DEFINED UCRT_INCLUDE_DIR) OR (UCRT_INCLUDE_DIR STREQUAL "NOTFOUND")) + Message(STATUS "UCRT_INCLUDE_DIR notu found, set it to vc incude dir") + SET(UCRT_INCLUDE_DIR "${VC_INCLUDE_DIR}") + Add_Definitions("-DUCRTINCLUDE=${VC_INCLUDE_DIR}") + ELSE () + Add_Definitions("-DUCRTINCLUDE=${UCRT_INCLUDE_DIR}") + ENDIF () + + Message(STATUS "WINSDK_INCLUDE_DIR: ${WINSDK_INCLUDE_DIR}") + Message(STATUS "UCRT_INCLUDE_DIR: ${UCRT_INCLUDE_DIR}") + Message(STATUS "VC_INCLUDE_DIR: ${VC_INCLUDE_DIR}") + INCLUDE_DIRECTORIES(include) AUX_SOURCE_DIRECTORY(src SRC) ADD_LIBRARY(MsvcLibXw64 ${SRC}) -- GitLab