ENH: add checking for NOTFOUND
This commit is contained in:
parent
f58d7df66a
commit
81aee11c21
|
@ -19,6 +19,7 @@
|
||||||
IF (APPLE)
|
IF (APPLE)
|
||||||
SET (OPENGL_gl_LIBRARY "-framework OpenGL" CACHE STRING "OpenGL lib for OSX")
|
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_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)
|
ENDIF (APPLE)
|
||||||
|
|
||||||
IF (WIN32)
|
IF (WIN32)
|
||||||
|
|
|
@ -301,8 +301,8 @@ void cmGlobalGenerator::Configure()
|
||||||
{
|
{
|
||||||
if(cmSystemTools::IsNOTFOUND(lib->first.c_str()))
|
if(cmSystemTools::IsNOTFOUND(lib->first.c_str()))
|
||||||
{
|
{
|
||||||
std::string not = lib->first.substr(0, lib->first.size()-9);
|
std::string varName = lib->first.substr(0, lib->first.size()-9);
|
||||||
notFoundMap.insert(not);
|
notFoundMap.insert(varName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
std::vector<std::string>& incs =
|
std::vector<std::string>& incs =
|
||||||
|
@ -313,8 +313,8 @@ void cmGlobalGenerator::Configure()
|
||||||
{
|
{
|
||||||
if(cmSystemTools::IsNOTFOUND(lib->c_str()))
|
if(cmSystemTools::IsNOTFOUND(lib->c_str()))
|
||||||
{
|
{
|
||||||
std::string not = lib->substr(0, lib->size()-9);
|
std::string varName = lib->substr(0, lib->size()-9);
|
||||||
notFoundMap.insert(not);
|
notFoundMap.insert(varName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_CMakeInstance->UpdateProgress("Configuring",
|
m_CMakeInstance->UpdateProgress("Configuring",
|
||||||
|
|
Loading…
Reference in New Issue