diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-01 14:00:21 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-01 14:00:21 +0400 |
commit | 170f8c8c4109afb366bac0f385d9e2f59af6c8e2 (patch) | |
tree | 5a76e595f1b61524cadbd2ee1f99b9e49235a848 /intern/cycles | |
parent | e5d7a38a257b543ff44e823c29a12198e3817427 (diff) |
Cycles: build without GLUT test app by default.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/cycles/app/CMakeLists.txt | 19 | ||||
-rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 13 | ||||
-rw-r--r-- | intern/cycles/util/CMakeLists.txt | 7 | ||||
-rw-r--r-- | intern/cycles/util/util_opengl.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_view.cpp | 6 |
6 files changed, 30 insertions, 18 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 164f1e95297..5877b26b7f5 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -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_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 diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index d90ebf0a8b5..0934124ea25 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -19,8 +19,11 @@ SET(LIBRARIES ${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}) @@ -34,12 +37,14 @@ IF(WITH_CYCLES_OPENCL) 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) diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index e61aee1e582..5d1ed868574 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -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 @@ ENDIF() ########################################################################### # 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 @@ INCLUDE_DIRECTORIES(${OPENIMAGEIO_INCLUDES} ${OPENIMAGEIO_INCLUDES}/OpenImageIO) ########################################################################### # 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 diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 4137c73a39a..380383e3146 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -13,8 +13,11 @@ SET(sources 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 diff --git a/intern/cycles/util/util_opengl.h b/intern/cycles/util/util_opengl.h index 5396f6f17be..352aa7b1c19 100644 --- a/intern/cycles/util/util_opengl.h +++ b/intern/cycles/util/util_opengl.h @@ -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__ */ diff --git a/intern/cycles/util/util_view.cpp b/intern/cycles/util/util_view.cpp index 75f0b92e705..2c6251b02ee 100644 --- a/intern/cycles/util/util_view.cpp +++ b/intern/cycles/util/util_view.cpp @@ -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" |