From: Neal Gompa Date: Sat, 15 May 2010 18:04:37 +0000 (-0500) Subject: Removing option to not use internal OpenGL headers on Windows; headers for all Window... X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=commitdiff_plain;h=fc49e8aa667aa912dc3ef3e49c29d40f002e2b68 Removing option to not use internal OpenGL headers on Windows; headers for all Windows compilers are not sane --- diff --git a/CMakeLists.txt b/CMakeLists.txt index c7bc8f4..7e2eac0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,11 +161,15 @@ endif (APPLE) # Deal with dependencies... find_package(OpenGL REQUIRED) -# force this include dir no matter what, so we get sane headers. -option (LUGARU_FORCE_INTERNAL_OPENGL "Force internal OpenGL headers, even if there's a system version" True) -if (LUGARU_FORCE_INTERNAL_OPENGL) +# force this include dir no matter what on Windows, so we get sane headers. +if(NOT WIN32) + option (LUGARU_FORCE_INTERNAL_OPENGL "Force internal OpenGL headers, even if there's a system version" True) + if (LUGARU_FORCE_INTERNAL_OPENGL) + include_directories("${DEPDIR}/OpenGL") + endif (LUGARU_FORCE_INTERNAL_OPENGL) +elseif(NOT WIN32) include_directories("${DEPDIR}/OpenGL") -endif (LUGARU_FORCE_INTERNAL_OPENGL) +endif(NOT WIN32) option (LUGARU_FORCE_INTERNAL_OPENAL "Force internal libOpenAL, even if there's a system version" False) if (NOT LUGARU_FORCE_INTERNAL_OPENAL)