[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36410] branches/cycles/intern/cycles: Cycles: build without GLUT test app by default.

[Brecht Van Lommel]

Revision: 36410
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36410
Author:   blendix
Date:     2011-05-01 10:00:21 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Cycles: build without GLUT test app by default.

Modified Paths:
--------------
    branches/cycles/intern/cycles/CMakeLists.txt
    branches/cycles/intern/cycles/app/CMakeLists.txt
    branches/cycles/intern/cycles/cmake/external_libs.cmake
    branches/cycles/intern/cycles/util/CMakeLists.txt
    branches/cycles/intern/cycles/util/util_opengl.h
    branches/cycles/intern/cycles/util/util_view.cpp

Modified: branches/cycles/intern/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/CMakeLists.txt	2011-05-01 09:39:32 UTC (rev 36409)
+++ branches/cycles/intern/cycles/CMakeLists.txt	2011-05-01 10:00:21 UTC (rev 36410)
@@ -13,6 +13,7 @@
 OPTION(WITH_CYCLES_NETWORK "Build with network rendering support (unfinished)" OFF)
 OPTION(WITH_CYCLES_MULTI "Build with network rendering support (unfinished)" OFF)
 OPTION(WITH_CYCLES_DOCS "Build html documentation" OFF)
+OPTION(WITH_CYCLES_TEST "Build cycles test application" OFF)
 
 # Flags
 

Modified: branches/cycles/intern/cycles/app/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/app/CMakeLists.txt	2011-05-01 09:39:32 UTC (rev 36409)
+++ branches/cycles/intern/cycles/app/CMakeLists.txt	2011-05-01 10:00:21 UTC (rev 36410)
@@ -19,9 +19,12 @@
 	${Boost_LIBRARIES}
 	${OPENGL_LIBRARIES}
 	${GLEW_LIBRARY}
-	${OPENIMAGEIO_LIBRARY}
-	${GLUT_LIBRARIES})
+	${OPENIMAGEIO_LIBRARY})
 
+IF(WITH_CYCLES_TEST)
+	LIST(APPEND LIBRARIES ${GLUT_LIBRARIES})
+ENDIF()
+
 IF(WITH_CYCLES_OSL)
 	LIST(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
 ENDIF()
@@ -34,12 +37,14 @@
 	LIST(APPEND LIBRARIES ${OPENCL_LIBRARIES})
 ENDIF()
 
-ADD_EXECUTABLE(cycles_test cycles_test.cpp cycles_xml.cpp cycles_xml.h)
-TARGET_LINK_LIBRARIES(cycles_test ${LIBRARIES})
-INSTALL(TARGETS cycles_test DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
+IF(WITH_CYCLES_TEST)
+	ADD_EXECUTABLE(cycles_test cycles_test.cpp cycles_xml.cpp cycles_xml.h)
+	TARGET_LINK_LIBRARIES(cycles_test ${LIBRARIES})
+	INSTALL(TARGETS cycles_test DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
 
-IF(UNIX AND NOT APPLE)
-	SET_TARGET_PROPERTIES(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib)
+	IF(UNIX AND NOT APPLE)
+		SET_TARGET_PROPERTIES(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib)
+	ENDIF()
 ENDIF()
 
 IF(WITH_CYCLES_NETWORK)

Modified: branches/cycles/intern/cycles/cmake/external_libs.cmake
===================================================================
--- branches/cycles/intern/cycles/cmake/external_libs.cmake	2011-05-01 09:39:32 UTC (rev 36409)
+++ branches/cycles/intern/cycles/cmake/external_libs.cmake	2011-05-01 10:00:21 UTC (rev 36410)
@@ -1,7 +1,6 @@
 ###########################################################################
 # Boost setup
 
-MESSAGE(STATUS "CYCLES_BOOST ${CYCLES_BOOST}")
 SET(BOOST_ROOT ${CYCLES_BOOST})
 
 SET(Boost_ADDITIONAL_VERSIONS "1.45" "1.44" 
@@ -37,8 +36,6 @@
 ###########################################################################
 # OpenImageIO
 
-MESSAGE(STATUS "CYCLES_OIIO = ${CYCLES_OIIO}")
-
 FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib)
 FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h ${CYCLES_OIIO}/include)
 FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin)
@@ -57,12 +54,14 @@
 ###########################################################################
 # GLUT
 
-SET(GLUT_ROOT_PATH ${CYCLES_GLUT})
+IF(WITH_CYCLES_TEST)
+	SET(GLUT_ROOT_PATH ${CYCLES_GLUT})
 
-FIND_PACKAGE(GLUT)
-MESSAGE(STATUS "GLUT_FOUND=${GLUT_FOUND}")
+	FIND_PACKAGE(GLUT)
+	MESSAGE(STATUS "GLUT_FOUND=${GLUT_FOUND}")
 
-INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
+	INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
+ENDIF()
 
 ###########################################################################
 # OpenShadingLanguage

Modified: branches/cycles/intern/cycles/util/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/util/CMakeLists.txt	2011-05-01 09:39:32 UTC (rev 36409)
+++ branches/cycles/intern/cycles/util/CMakeLists.txt	2011-05-01 10:00:21 UTC (rev 36410)
@@ -13,9 +13,12 @@
 	util_string.cpp
 	util_system.cpp
 	util_time.cpp
-	util_transform.cpp
-	util_view.cpp)
+	util_transform.cpp)
 
+IF(WITH_CYCLES_TEST)
+	LIST(APPEND sources util_view.cpp)
+ENDIF()
+
 SET(headers
 	util_algorithm.h
 	util_args.h

Modified: branches/cycles/intern/cycles/util/util_opengl.h
===================================================================
--- branches/cycles/intern/cycles/util/util_opengl.h	2011-05-01 09:39:32 UTC (rev 36409)
+++ branches/cycles/intern/cycles/util/util_opengl.h	2011-05-01 10:00:21 UTC (rev 36410)
@@ -23,12 +23,10 @@
  * platform differences in one central place. */
 
 #ifdef __APPLE__
-#include <GLUT/glut.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #else
 #include <GL/glew.h>
-#include <GL/glut.h>
 #endif
 
 #endif /* __UTIL_OPENGL_H__ */

Modified: branches/cycles/intern/cycles/util/util_view.cpp
===================================================================
--- branches/cycles/intern/cycles/util/util_view.cpp	2011-05-01 09:39:32 UTC (rev 36409)
+++ branches/cycles/intern/cycles/util/util_view.cpp	2011-05-01 10:00:21 UTC (rev 36410)
@@ -20,6 +20,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __APPLE__
+#include <GLUT/glut.h>
+#else
+#include <GL/glut.h>
+#endif
+
 #include "util_opengl.h"
 #include "util_time.h"
 #include "util_view.h"