diff options
| -rw-r--r-- | Modules/FindOpenGL.cmake | 1 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 8cdf938..20e3b6d 100644 --- a/Modules/FindOpenGL.cmake +++ b/Modules/FindOpenGL.cmake @@ -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) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index c758438..f5d995a 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -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", |