Commit 15dbd763e6a77efe0dc31436a3cb02e0b1e9a6ac
1 parent
56c31322
updated GLEW CMake library search
Showing
1 changed file
with
13 additions
and
15 deletions
Show diff stats
FindGLEW.cmake
| ... | ... | @@ -50,7 +50,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( GLEW |
| 50 | 50 | ) |
| 51 | 51 | |
| 52 | 52 | IF ( GLEW_LOCATION ) |
| 53 | - | |
| 54 | 53 | SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path") |
| 55 | 54 | |
| 56 | 55 | SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) |
| ... | ... | @@ -68,10 +67,16 @@ IF ( GLEW_LOCATION ) |
| 68 | 67 | # MESSAGE ( "APPLE STATIC" ) |
| 69 | 68 | # MESSAGE ( "GLEW_LIBRARY_PATH = " ${GLEW_LIBRARY_PATH} ) |
| 70 | 69 | ELSEIF (WIN32) |
| 70 | + message("Windows Found!") | |
| 71 | 71 | # Link library |
| 72 | 72 | SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") |
| 73 | - FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS ${GLEW_LOCATION}/lib ) | |
| 74 | - FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib ) | |
| 73 | + if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) | |
| 74 | + FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS $ENV{GLEW_ROOT}/lib/x64 NO_DEFAULT_PATH) | |
| 75 | + message("64-bit library") | |
| 76 | + else( CMAKE_SIZEOF_VOID_P EQUAL 8 ) | |
| 77 | + FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS $ENV{GLEW_ROOT}/lib NO_DEFAULT_PATH) | |
| 78 | + message("32-bit library") | |
| 79 | + endif( CMAKE_SIZEOF_VOID_P EQUAL 8 ) | |
| 75 | 80 | ELSE (APPLE) |
| 76 | 81 | SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") |
| 77 | 82 | FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib |
| ... | ... | @@ -93,18 +98,11 @@ IF ( GLEW_LOCATION ) |
| 93 | 98 | ELSEIF (WIN32) |
| 94 | 99 | # Link library |
| 95 | 100 | SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") |
| 96 | - FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32 PATHS ${GLEW_LOCATION}/lib ) | |
| 97 | - FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32mx PATHS ${GLEW_LOCATION}/lib ) | |
| 98 | - # Load library | |
| 99 | - SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll") | |
| 100 | - FIND_LIBRARY ( GLEW_DLL_PATH GLEW32 PATHS ${GLEW_LOCATION}/bin | |
| 101 | - NO_DEFAULT_PATH | |
| 102 | - NO_SYSTEM_ENVIRONMENT_PATH | |
| 103 | - ) | |
| 104 | - FIND_LIBRARY ( GLEWmx_DLL_PATH GLEW32mx PATHS ${GLEW_LOCATION}/bin | |
| 105 | - NO_DEFAULT_PATH | |
| 106 | - NO_SYSTEM_ENVIRONMENT_PATH | |
| 107 | - ) | |
| 101 | + if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) | |
| 102 | + FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS $ENV{GLEW_ROOT}/lib/x64 NO_DEFAULT_PATH) | |
| 103 | + else( CMAKE_SIZEOF_VOID_P EQUAL 8 ) | |
| 104 | + FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS $ENV{GLEW_ROOT}/lib NO_DEFAULT_PATH) | |
| 105 | + endif( CMAKE_SIZEOF_VOID_P EQUAL 8 ) | |
| 108 | 106 | ELSE (APPLE) |
| 109 | 107 | # Unices |
| 110 | 108 | FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib | ... | ... |