Pārlūkot izejas kodu

Fix DIA SDK detection (#3231)

Helena Kotas 4 gadi atpakaļ
vecāks
revīzija
075d3ce9ef
1 mainītis faili ar 4 papildinājumiem un 1 dzēšanām
  1. 4 1
      cmake/modules/FindDiaSDK.cmake

+ 4 - 1
cmake/modules/FindDiaSDK.cmake

@@ -31,7 +31,10 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio.*Win64" OR CMAKE_GENERATOR_PLATFORM S
 elseif (CMAKE_GENERATOR MATCHES "Visual Studio.*ARM" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM")
 elseif (CMAKE_GENERATOR MATCHES "Visual Studio.*ARM" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM")
   find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib
   find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib
                HINTS ${DIASDK_INCLUDE_DIR}/../lib/arm )
                HINTS ${DIASDK_INCLUDE_DIR}/../lib/arm )
-else (CMAKE_GENERATOR MATCHES "Visual Studio.*Win64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64")
+elseif (CMAKE_GENERATOR MATCHES "Visual Studio.*ARM64" OR CMAKE_GENERATOR_PLATFORM MATCHES "ARM64.*")
+  find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib
+               HINTS ${DIASDK_INCLUDE_DIR}/../lib/arm64 )
+else (CMAKE_GENERATOR MATCHES "Visual Studio.*Win64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64")
   find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib
   find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib
                HINTS ${DIASDK_INCLUDE_DIR}/../lib )
                HINTS ${DIASDK_INCLUDE_DIR}/../lib )
 endif (CMAKE_GENERATOR MATCHES "Visual Studio.*Win64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64")
 endif (CMAKE_GENERATOR MATCHES "Visual Studio.*Win64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64")