From: ana Date: Thu, 28 Feb 2013 14:49:53 +0000 (+0000) Subject: Preparing Win64 version X-Git-Tag: V6_main_FINAL~27 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=213f99aa34b0a059eaf19da345d60841f7ff57d4;p=modules%2Fgui.git Preparing Win64 version --- diff --git a/adm_local/cmake_files/deprecated/FindOPENGL.cmake b/adm_local/cmake_files/deprecated/FindOPENGL.cmake index d7e8d4fed..794f641cc 100644 --- a/adm_local/cmake_files/deprecated/FindOPENGL.cmake +++ b/adm_local/cmake_files/deprecated/FindOPENGL.cmake @@ -18,8 +18,13 @@ # IF(${WINDOWS}) - FIND_LIBRARY(OpenGL_LIB OpenGL32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") - FIND_LIBRARY(GlU_LIB GlU32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") # if platform is Windows 64 bit + FIND_LIBRARY(OpenGL_LIB OpenGL32 HINTS "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib/x64") + FIND_LIBRARY(GlU_LIB GlU32 HINTS "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib/x64") + ELSE("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + FIND_LIBRARY(OpenGL_LIB OpenGL32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") + FIND_LIBRARY(GlU_LIB GlU32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") + ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") ELSE(${WINDOWS}) FIND_LIBRARY(OpenGL_LIB GL) FIND_LIBRARY(GlU_LIB GLU)