Commit a4aa963c7b80527b41d85d9cf4816d82dbfcfc92
1 parent
9d5f5797
fixed GLEW linking problem on window
Showing
1 changed file
with
12 additions
and
0 deletions
Show diff stats
FindGLEW.cmake
... | ... | @@ -71,7 +71,9 @@ IF ( GLEW_LOCATION ) |
71 | 71 | # Link library |
72 | 72 | SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") |
73 | 73 | FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS ${GLEW_LOCATION}/lib ) |
74 | + FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS ${GLEW_LOCATION}/lib/Release/x64 ) | |
74 | 75 | FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib ) |
76 | + FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib/Release/x64 ) | |
75 | 77 | ELSE (APPLE) |
76 | 78 | SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") |
77 | 79 | FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib |
... | ... | @@ -94,17 +96,27 @@ IF ( GLEW_LOCATION ) |
94 | 96 | # Link library |
95 | 97 | SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") |
96 | 98 | FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32 PATHS ${GLEW_LOCATION}/lib ) |
99 | + FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32 PATHS ${GLEW_LOCATION}/lib/Release/x64 ) | |
97 | 100 | FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32mx PATHS ${GLEW_LOCATION}/lib ) |
101 | + FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32mx PATHS ${GLEW_LOCATION}/lib/Release/x64 ) | |
98 | 102 | # Load library |
99 | 103 | SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll") |
100 | 104 | FIND_LIBRARY ( GLEW_DLL_PATH GLEW32 PATHS ${GLEW_LOCATION}/bin |
101 | 105 | NO_DEFAULT_PATH |
102 | 106 | NO_SYSTEM_ENVIRONMENT_PATH |
103 | 107 | ) |
108 | + FIND_LIBRARY ( GLEW_DLL_PATH GLEW32 PATHS ${GLEW_LOCATION}/bin/Release/x64 | |
109 | + NO_DEFAULT_PATH | |
110 | + NO_SYSTEM_ENVIRONMENT_PATH | |
111 | + ) | |
104 | 112 | FIND_LIBRARY ( GLEWmx_DLL_PATH GLEW32mx PATHS ${GLEW_LOCATION}/bin |
105 | 113 | NO_DEFAULT_PATH |
106 | 114 | NO_SYSTEM_ENVIRONMENT_PATH |
107 | 115 | ) |
116 | + FIND_LIBRARY ( GLEWmx_DLL_PATH GLEW32mx PATHS ${GLEW_LOCATION}/bin/Release/x64 | |
117 | + NO_DEFAULT_PATH | |
118 | + NO_SYSTEM_ENVIRONMENT_PATH | |
119 | + ) | |
108 | 120 | ELSE (APPLE) |
109 | 121 | # Unices |
110 | 122 | FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib | ... | ... |