Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: build without GLUT test app by default.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-05-01 10:00:21 +00:00
parent e5d7a38a25
commit 170f8c8c41
6 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/CMakeLists.txt
View File

@@ -13,6 +13,7 @@ OPTION(WITH_CYCLES_PARTIO "Build with Partio point cloud support (unfinished)" O
OPTION(WITH_CYCLES_NETWORK "Build with network rendering support (unfinished)" OFF) 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_MULTI "Build with network rendering support (unfinished)" OFF)
OPTION(WITH_CYCLES_DOCS "Build html documentation" OFF) OPTION(WITH_CYCLES_DOCS "Build html documentation" OFF)
OPTION(WITH_CYCLES_TEST "Build cycles test application" OFF)
# Flags # Flags

9
intern/cycles/app/CMakeLists.txt
View File

@@ -19,8 +19,11 @@ SET(LIBRARIES
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${GLEW_LIBRARY} ${GLEW_LIBRARY}
${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_LIBRARY})
${GLUT_LIBRARIES})
IF(WITH_CYCLES_TEST)
LIST(APPEND LIBRARIES ${GLUT_LIBRARIES})
ENDIF()
IF(WITH_CYCLES_OSL) IF(WITH_CYCLES_OSL)
LIST(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES}) LIST(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
@@ -34,6 +37,7 @@ IF(WITH_CYCLES_OPENCL)
LIST(APPEND LIBRARIES ${OPENCL_LIBRARIES}) LIST(APPEND LIBRARIES ${OPENCL_LIBRARIES})
ENDIF() ENDIF()
IF(WITH_CYCLES_TEST)
ADD_EXECUTABLE(cycles_test cycles_test.cpp cycles_xml.cpp cycles_xml.h) ADD_EXECUTABLE(cycles_test cycles_test.cpp cycles_xml.cpp cycles_xml.h)
TARGET_LINK_LIBRARIES(cycles_test ${LIBRARIES}) TARGET_LINK_LIBRARIES(cycles_test ${LIBRARIES})
INSTALL(TARGETS cycles_test DESTINATION ${CYCLES_INSTALL_PATH}/cycles) INSTALL(TARGETS cycles_test DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
@@ -41,6 +45,7 @@ INSTALL(TARGETS cycles_test DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
SET_TARGET_PROPERTIES(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib) SET_TARGET_PROPERTIES(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib)
ENDIF() ENDIF()
ENDIF()
IF(WITH_CYCLES_NETWORK) IF(WITH_CYCLES_NETWORK)
ADD_EXECUTABLE(cycles_server cycles_server.cpp) ADD_EXECUTABLE(cycles_server cycles_server.cpp)

5
intern/cycles/cmake/external_libs.cmake
View File

@@ -1,7 +1,6 @@
########################################################################### ###########################################################################
# Boost setup # Boost setup
MESSAGE(STATUS "CYCLES_BOOST ${CYCLES_BOOST}")
SET(BOOST_ROOT ${CYCLES_BOOST}) SET(BOOST_ROOT ${CYCLES_BOOST})
SET(Boost_ADDITIONAL_VERSIONS "1.45" "1.44" SET(Boost_ADDITIONAL_VERSIONS "1.45" "1.44"
@@ -37,8 +36,6 @@ ENDIF()
########################################################################### ###########################################################################
# OpenImageIO # OpenImageIO
MESSAGE(STATUS "CYCLES_OIIO = ${CYCLES_OIIO}")
FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib) FIND_LIBRARY(OPENIMAGEIO_LIBRARY NAMES OpenImageIO PATHS ${CYCLES_OIIO}/lib)
FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h ${CYCLES_OIIO}/include) FIND_PATH(OPENIMAGEIO_INCLUDES OpenImageIO/imageio.h ${CYCLES_OIIO}/include)
FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin) FIND_PROGRAM(OPENIMAGEIO_IDIFF NAMES idiff PATHS ${CYCLES_OIIO}/bin)
@@ -57,12 +54,14 @@ INCLUDE_DIRECTORIES(${OPENIMAGEIO_INCLUDES} ${OPENIMAGEIO_INCLUDES}/OpenImageIO)
########################################################################### ###########################################################################
# GLUT # GLUT
IF(WITH_CYCLES_TEST)
SET(GLUT_ROOT_PATH ${CYCLES_GLUT}) SET(GLUT_ROOT_PATH ${CYCLES_GLUT})
FIND_PACKAGE(GLUT) FIND_PACKAGE(GLUT)
MESSAGE(STATUS "GLUT_FOUND=${GLUT_FOUND}") MESSAGE(STATUS "GLUT_FOUND=${GLUT_FOUND}")
INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
ENDIF()
########################################################################### ###########################################################################
# OpenShadingLanguage # OpenShadingLanguage

7
intern/cycles/util/CMakeLists.txt
View File

@@ -13,8 +13,11 @@ SET(sources
util_string.cpp util_string.cpp
util_system.cpp util_system.cpp
util_time.cpp util_time.cpp
util_transform.cpp util_transform.cpp)
util_view.cpp)
IF(WITH_CYCLES_TEST)
LIST(APPEND sources util_view.cpp)
ENDIF()
SET(headers SET(headers
util_algorithm.h util_algorithm.h

2
intern/cycles/util/util_opengl.h
View File

@@ -23,12 +23,10 @@
* platform differences in one central place. */ * platform differences in one central place. */
#ifdef __APPLE__ #ifdef __APPLE__
#include <GLUT/glut.h>
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#else #else
#include <GL/glew.h> #include <GL/glew.h>
#include <GL/glut.h>
#endif #endif
#endif /* __UTIL_OPENGL_H__ */ #endif /* __UTIL_OPENGL_H__ */

6
intern/cycles/util/util_view.cpp
View File

@@ -20,6 +20,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef __APPLE__
#include <GLUT/glut.h>
#else
#include <GL/glut.h>
#endif
#include "util_opengl.h" #include "util_opengl.h"
#include "util_time.h" #include "util_time.h"
#include "util_view.h" #include "util_view.h"