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/app | |
| parent | e5d7a38a257b543ff44e823c29a12198e3817427 (diff) | |
Cycles: build without GLUT test app by default.
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 19 |
1 files changed, 12 insertions, 7 deletions
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) |