Fix finding Dia SDK on non-VS generators (#4087)
This commit is contained in:
Родитель
7d0f3c30ff
Коммит
b780185f78
|
@ -35,20 +35,17 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio 15 2017.*")
|
||||||
else (CMAKE_GENERATOR MATCHES "Visual Studio.*Win64")
|
else (CMAKE_GENERATOR MATCHES "Visual Studio.*Win64")
|
||||||
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib )
|
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib )
|
||||||
endif (CMAKE_GENERATOR MATCHES "Visual Studio.*Win64")
|
endif (CMAKE_GENERATOR MATCHES "Visual Studio.*Win64")
|
||||||
endif (CMAKE_GENERATOR MATCHES "Visual Studio 15 2017.*")
|
else (CMAKE_GENERATOR MATCHES "Visual Studio 15 2017.*")
|
||||||
|
if ((CMAKE_GENERATOR_PLATFORM STREQUAL "x64") OR ("${DXC_BUILD_ARCH}" STREQUAL "x64"))
|
||||||
# VS 2019/2022
|
|
||||||
if (MSVC_VERSION GREATER_EQUAL 1900)
|
|
||||||
if (CMAKE_GENERATOR_PLATFORM STREQUAL "x64")
|
|
||||||
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib/amd64 )
|
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib/amd64 )
|
||||||
elseif (CMAKE_GENERATOR_PLATFORM STREQUAL "ARM")
|
elseif ((CMAKE_GENERATOR_PLATFORM STREQUAL "ARM") OR ("${DXC_BUILD_ARCH}" STREQUAL "ARM"))
|
||||||
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib/arm )
|
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib/arm )
|
||||||
elseif (CMAKE_GENERATOR_PLATFORM MATCHES "ARM64.*")
|
elseif ((CMAKE_GENERATOR_PLATFORM MATCHES "ARM64.*") OR ("${DXC_BUILD_ARCH}" MATCHES "ARM64.*"))
|
||||||
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib/arm64 )
|
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib/arm64 )
|
||||||
else (CMAKE_GENERATOR_PLATFORM STREQUAL "x64")
|
else ((CMAKE_GENERATOR_PLATFORM STREQUAL "x64") OR ("${DXC_BUILD_ARCH}" STREQUAL "x64"))
|
||||||
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib )
|
find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib )
|
||||||
endif(CMAKE_GENERATOR_PLATFORM STREQUAL "x64")
|
endif((CMAKE_GENERATOR_PLATFORM STREQUAL "x64") OR ("${DXC_BUILD_ARCH}" STREQUAL "x64"))
|
||||||
endif (MSVC_VERSION GREATER_EQUAL 1900)
|
endif (CMAKE_GENERATOR MATCHES "Visual Studio 15 2017.*")
|
||||||
|
|
||||||
set(DIASDK_LIBRARIES ${DIASDK_GUIDS_LIBRARY})
|
set(DIASDK_LIBRARIES ${DIASDK_GUIDS_LIBRARY})
|
||||||
set(DIASDK_INCLUDE_DIRS ${DIASDK_INCLUDE_DIR})
|
set(DIASDK_INCLUDE_DIRS ${DIASDK_INCLUDE_DIR})
|
||||||
|
|
Загрузка…
Ссылка в новой задаче