reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-28 14:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix opengl on hp

Browse Source
This commit is contained in:
Bill Hoffman 2001-05-21 15:16:19 -04:00
parent 33793198b6
commit c43e3a4f3f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/FindOpenGL.cmake
View File

@ -19,7 +19,7 @@ ELSE (WIN32)
) )
FIND_LIBRARY(OPENGL_LIB_PATH GL FIND_LIBRARY(OPENGL_LIBRARY GL
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/opt/graphics/OpenGL/lib /opt/graphics/OpenGL/lib
@ -27,7 +27,4 @@ ELSE (WIN32)
/usr/X11R6/lib /usr/X11R6/lib
) )
# right now we only look for -lgl maybe in future also mesa
SET (OPENGL_LIBRARY GL CACHE)
ENDIF (WIN32) ENDIF (WIN32)

4
Source/cmSystemTools.cxx
View File

@ -799,7 +799,7 @@ std::string cmSystemTools::FindLibrary(const char* name,
return cmSystemTools::CollapseFullPath(tryPath.c_str()); return cmSystemTools::CollapseFullPath(tryPath.c_str());
} }
tryPath = *p; tryPath = *p;
tryPath = "/lib"; tryPath += "/lib";
tryPath += name; tryPath += name;
tryPath += ".a"; tryPath += ".a";
if(cmSystemTools::FileExists(tryPath.c_str())) if(cmSystemTools::FileExists(tryPath.c_str()))
@ -807,7 +807,7 @@ std::string cmSystemTools::FindLibrary(const char* name,
return cmSystemTools::CollapseFullPath(tryPath.c_str()); return cmSystemTools::CollapseFullPath(tryPath.c_str());
} }
tryPath = *p; tryPath = *p;
tryPath = "/lib"; tryPath += "/lib";
tryPath += name; tryPath += name;
tryPath += ".sl"; tryPath += ".sl";
if(cmSystemTools::FileExists(tryPath.c_str())) if(cmSystemTools::FileExists(tryPath.c_str()))