kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: add checking for NOTFOUND

This commit is contained in:
Bill Hoffman 2003-01-31 14:39:49 -05:00
parent f58d7df66a
commit 81aee11c21
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/FindOpenGL.cmake
View File

@ -19,6 +19,7 @@
IF (APPLE)
SET (OPENGL_gl_LIBRARY "-framework OpenGL" CACHE STRING "OpenGL lib for OSX")
SET (OPENGL_glu_LIBRARY "-framework AGL" CACHE STRING "AGL lib for OSX")
SET (OPENGL_INCLUDE_DIR "" CACHE STRING "Include path for OpenGL is not required for OSX when -framework is being used")
ENDIF (APPLE)
IF (WIN32)

8
Source/cmGlobalGenerator.cxx
View File

@ -301,8 +301,8 @@ void cmGlobalGenerator::Configure()
{
if(cmSystemTools::IsNOTFOUND(lib->first.c_str()))
{
std::string not = lib->first.substr(0, lib->first.size()-9);
notFoundMap.insert(not);
std::string varName = lib->first.substr(0, lib->first.size()-9);
notFoundMap.insert(varName);
}
}
std::vector<std::string>& incs =
@ -313,8 +313,8 @@ void cmGlobalGenerator::Configure()
{
if(cmSystemTools::IsNOTFOUND(lib->c_str()))
{
std::string not = lib->substr(0, lib->size()-9);
notFoundMap.insert(not);
std::string varName = lib->substr(0, lib->size()-9);
notFoundMap.insert(varName);
}
}
m_CMakeInstance->UpdateProgress("Configuring",