[lugaru] Don't force internal GLU, Vorbis

Alexander Monakov amonakov at gmail.com
Thu May 13 17:14:44 EDT 2010


Use correct variable names so that internal libraries are not forced.

diff -r e30efb5a189b CMakeLists.txt
--- a/CMakeLists.txt	Thu May 13 20:01:23 2010 +0200
+++ b/CMakeLists.txt	Fri May 14 00:50:12 2010 +0400
@@ -298,7 +298,7 @@
 if (NOT LUGARU_FORCE_INTERNAL_GLU)
     find_package(GLU)
 endif (NOT LUGARU_FORCE_INTERNAL_GLU)
-if (NOT GLU_FOUND)
+if (NOT OPENGL_GLU_FOUND)
     message(STATUS "Using internal copy of libGLU")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} GLU")
     set(GLUDIR "${DEPDIR}/GLU")
@@ -319,13 +319,13 @@
         ${GLUDIR}/tessmono.c
         ${GLUDIR}/util.c
     )
-endif (NOT GLU_FOUND)
+endif (NOT OPENGL_GLU_FOUND)
 
 option (LUGARU_FORCE_INTERNAL_VORBIS "Force internal Vorbis, even if there's a system version" False)
 if (NOT LUGARU_FORCE_INTERNAL_VORBIS)
     find_package(OggVorbis)
 endif (NOT LUGARU_FORCE_INTERNAL_VORBIS)
-if (NOT OggVorbis_FOUND)
+if (NOT OGGVORBIS_FOUND)
     message(STATUS "Using internal copy of Ogg Vorbis")
     set(LUGARU_MISSING_DEPS "${LUGARU_MISSING_DEPS} OggVorbis")
     set(OGGDIR "${DEPDIR}/libogg")
@@ -359,7 +359,7 @@
         ${VORBISDIR}/lib/vorbisfile.c
         ${VORBISDIR}/lib/window.c
     )
-endif (NOT OggVorbis_FOUND)
+endif (NOT OGGVORBIS_FOUND)
 
 include_directories(
     ${OPENAL_INCLUDE_DIR}


More information about the lugaru mailing list