summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-09-22 11:40:33 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-09-22 11:41:34 (GMT)
commite138d21ef213a1e3a9b11faced2c8cf054297844 (patch)
tree7990174784da448fe64817ef1c684bf362cfefae
parentcedc0a0329333254dfbbe235e168e0fe0cbc8023 (diff)
parentd628ac0eb8b6d0e8e2617f26bf5a7e6280ba0008 (diff)
downloadCMake-e138d21ef213a1e3a9b11faced2c8cf054297844.zip
CMake-e138d21ef213a1e3a9b11faced2c8cf054297844.tar.gz
CMake-e138d21ef213a1e3a9b11faced2c8cf054297844.tar.bz2
Merge topic 'FindGLEW-platform'
d628ac0eb8 FindGLEW: Avoid using CMAKE_GENERATOR_PLATFORM to detect platform Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5244
-rw-r--r--Modules/FindGLEW.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/FindGLEW.cmake b/Modules/FindGLEW.cmake
index 080371a..187b6a8 100644
--- a/Modules/FindGLEW.cmake
+++ b/Modules/FindGLEW.cmake
@@ -126,13 +126,12 @@ if(GLEW_VERBOSE)
message(STATUS "FindGLEW: GLEW_INCLUDE_DIRS: ${GLEW_INCLUDE_DIRS}")
endif()
-if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64" OR "${CMAKE_GENERATOR}" MATCHES "Win64")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_arch "x64")
else()
set(_arch "Win32")
endif()
-
set(__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
__glew_set_find_library_suffix(SHARED)