Fixed detection of x64 vs x86 dependencies

before, the CMAKE_GENERATOR_PLATFORM was used, which may not be set at all, if the default setting is being used. Now the proper CMAKE_SIZEOF_VOID_P variable is used.
eclipse-ecal · Jan 29, 2024 · 811c1a8 · 811c1a8
1 parent 9ec1681
commit 811c1a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/thirdparty/npcap/Modules/Findnpcap.cmake b/thirdparty/npcap/Modules/Findnpcap.cmake
@@ -38,7 +38,7 @@ find_path(npcap_INCLUDE_DIR
 )
 
 # Lib dir
-if(("${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64") OR ("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)"))
+if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
     # Find 64-bit libraries
     find_path (npcap_LIB_DIR
         NAMES wpcap.lib

diff --git a/thirdparty/pcapplusplus/Modules/Findpcapplusplus.cmake b/thirdparty/pcapplusplus/Modules/Findpcapplusplus.cmake
@@ -41,7 +41,7 @@ find_path(pcapplusplus_INCLUDE_DIR
 )
 
 # Lib dir
-if(("${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64") OR ("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)"))
+if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
     # Find 64-bit libraries
     find_path (pcapplusplus_LIB_DIR
         NAMES "Release/Pcap++.lib"