[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/kgllib
From:       Rivo Laks <rivolaks () hot ! ee>
Date:       2008-03-30 15:41:37
Message-ID: 1206891697.927703.9660.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 791868 by rivol:

Add internal copy of GLEW (v 1.5.0).
  When no installed GLEW can be found then this one is used instead. It's meant to \
lower KGLLib's  requirements even more - it now depends only on Qt, OpenGL (including \
GLU) and Eigen.

 M  +10 -5     CMakeLists.txt  
 M  +1 -1      core/kgllib/kgllib.h  
 A             glew (directory)  
 A             glew/CMakeLists.txt  
 A             glew/GL (directory)  
 A             glew/GL/glew.h   [License: BSD X11 (BSD like)]
 A             glew/GL/glxew.h   [License: BSD X11 (BSD like)]
 A             glew/GL/wglew.h   [License: BSD]
 A             glew/LICENSE.txt  
 A             glew/README  
 A             glew/glew.c   [License: BSD]


--- trunk/playground/libs/kgllib/CMakeLists.txt #791867:791868
@@ -4,16 +4,12 @@
 set(QT_USE_OPENGL true)
 find_package(Qt4 REQUIRED)
 find_package(OpenGL REQUIRED)
-find_package(GLEW REQUIRED)
+find_package(GLEW)
 find_package(Eigen REQUIRED)
 if(NOT OPENGL_GLU_FOUND)
     message(FATAL_ERROR "GLU was not found")
 endif(NOT OPENGL_GLU_FOUND)
 
-if(NOT GLEW_FOUND)
-    message(FATAL_ERROR "GLEW was not found")
-endif(NOT GLEW_FOUND)
-
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
 set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}  CACHE PATH  "Base directory for \
executables and libraries" FORCE)  set(LIB_INSTALL_DIR      \
"${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"  CACHE PATH "The subdirectory relative to \
the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" \
FORCE) @@ -24,6 +20,15 @@
     set(CMAKE_DEBUG_POSTFIX "d")
 endif(WIN32)
 
+# If GLEW wasn't found then use our own internal version
+if(NOT GLEW_FOUND)
+    message(STATUS "GLEW was not found. Using internal GLEW")
+
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/glew)
+    add_subdirectory(glew)
+    set(GLEW_GLEW_LIBRARY glew)
+endif(NOT GLEW_FOUND)
+
 add_subdirectory(core)
 add_subdirectory(extras)
 add_subdirectory(examples)
--- trunk/playground/libs/kgllib/core/kgllib/kgllib.h #791867:791868
@@ -18,7 +18,7 @@
 #ifndef KGLLIB_KGLLIB_H
 #define KGLLIB_KGLLIB_H
 
-#include <GL/glew.h>
+#include "GL/glew.h"
 
 #include "kgllib_export.h"
 


[prev in list] [next in list] [prev in thread] [next in thread]