[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36949] branches/cycles/intern/cycles: Cycles: fix GLEW library build issue.

[Brecht Van Lommel]

Revision: 36949
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36949
Author:   blendix
Date:     2011-05-27 12:13:10 +0000 (Fri, 27 May 2011)
Log Message:
-----------
Cycles: fix GLEW library build issue.

Modified Paths:
--------------
    branches/cycles/intern/cycles/app/CMakeLists.txt
    branches/cycles/intern/cycles/blender/CMakeLists.txt
    branches/cycles/intern/cycles/cmake/external_libs.cmake

Modified: branches/cycles/intern/cycles/app/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/app/CMakeLists.txt    2011-05-27 11:02:36 UTC 
(rev 36948)
+++ branches/cycles/intern/cycles/app/CMakeLists.txt    2011-05-27 12:13:10 UTC 
(rev 36949)
@@ -18,7 +18,7 @@
        cycles_util
        ${Boost_LIBRARIES}
        ${OPENGL_LIBRARIES}
-       ${GLEW_LIBRARY}
+       ${CYCLES_GLEW_LIBRARY}
        ${OPENIMAGEIO_LIBRARY})
 
 IF(WITH_CYCLES_TEST)

Modified: branches/cycles/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/blender/CMakeLists.txt        2011-05-27 
11:02:36 UTC (rev 36948)
+++ branches/cycles/intern/cycles/blender/CMakeLists.txt        2011-05-27 
12:13:10 UTC (rev 36949)
@@ -43,7 +43,7 @@
        ${OPENGL_LIBRARIES}
        ${OPENIMAGEIO_LIBRARY}
        ${GLUT_LIBRARIES}
-       ${GLEW_LIBRARIES}
+       ${CYCLES_GLEW_LIBRARY}
        ${BLENDER_LIBRARIES})
 
 IF(WITH_CYCLES_OSL)

Modified: branches/cycles/intern/cycles/cmake/external_libs.cmake
===================================================================
--- branches/cycles/intern/cycles/cmake/external_libs.cmake     2011-05-27 
11:02:36 UTC (rev 36948)
+++ branches/cycles/intern/cycles/cmake/external_libs.cmake     2011-05-27 
12:13:10 UTC (rev 36949)
@@ -62,6 +62,12 @@
        INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
 ENDIF()
 
+IF(WITH_BUILTIN_GLEW)
+       SET(CYCLES_GLEW_LIBRARY extern_glew)
+ELSE()
+       SET(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY})
+ENDIF()
+
 ###########################################################################
 # OpenShadingLanguage
 
@@ -165,12 +171,12 @@
 
        IF(WIN32)
                SET(OPENCL_INCLUDES "")
-               SET(OPENCL_LIRBARIES "OpenCL")
+               SET(OPENCL_LIBRARIES "OpenCL")
        ENDIF()
 
        IF(UNIX AND NOT APPLE)
                SET(OPENCL_INCLUDES ${CYCLES_OPENCL})
-               SET(OPENCL_LIRBARIES "OpenCL")
+               SET(OPENCL_LIBRARIES "OpenCL")
        ENDIF()
 
        ADD_DEFINITIONS(-DWITH_OPENCL)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs