diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-16 20:15:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-16 20:15:34 +0400 |
| commit | 360fcd73fe2868ba32c65697e21ed1bbab8b649a (patch) | |
| tree | 29c77024343a26c0358b814e581efaf388a3030a /intern/cycles/app | |
| parent | 18387f3e3fc4e3fbb9f2cd27d49d12e56975e87c (diff) | |
Cycles:
* add some (disabled) test code for using OpenImageIO in imbuf
* link cycles, openimageio and boost into blender instead of a shared library
* some cmakefile changes to simplify the code and follow conventions better
* this may solve running cycles problems on windows XP, or give a different
and hopefully more useful error message
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index c250662aecf..1d74c32ca28 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES( +include_directories( . ../device ../kernel @@ -9,51 +9,51 @@ INCLUDE_DIRECTORIES( ../render ../subd) -SET(LIBRARIES +set(LIBRARIES cycles_device cycles_kernel cycles_render cycles_bvh cycles_subd cycles_util - ${Boost_LIBRARIES} + ${BOOST_LIBRARIES} ${OPENGL_LIBRARIES} ${CYCLES_GLEW_LIBRARY} ${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() - -IF(WITH_CYCLES_PARTIO) - LIST(APPEND LIBRARIES ${PARTIO_LIBRARIES}) -ENDIF() - -IF(WITH_CYCLES_OPENCL) - LIST(APPEND LIBRARIES ${OPENCL_LIBRARIES}) -ENDIF() - -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) - ENDIF() -ENDIF() - -IF(WITH_CYCLES_NETWORK) - ADD_EXECUTABLE(cycles_server cycles_server.cpp) - TARGET_LINK_LIBRARIES(cycles_server ${LIBRARIES}) - INSTALL(TARGETS cycles_server DESTINATION ${CYCLES_INSTALL_PATH}/cycles) - - IF(UNIX AND NOT APPLE) - SET_TARGET_PROPERTIES(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib) - ENDIF() -ENDIF() +link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH}) + +if(WITH_CYCLES_TEST) + list(APPEND LIBRARIES ${GLUT_LIBRARIES}) +endif() + +if(WITH_CYCLES_OSL) + list(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES}) +endif() + +if(WITH_CYCLES_PARTIO) + list(APPEND LIBRARIES ${PARTIO_LIBRARIES}) +endif() + +if(WITH_CYCLES_OPENCL) + list(APPEND LIBRARIES ${OPENCL_LIBRARIES}) +endif() + +if(WITH_CYCLES_TEST) + add_executable(cycles_test cycles_test.cpp cycles_xml.cpp cycles_xml.h) + target_link_libraries(cycles_test ${LIBRARIES}) + + if(UNIX AND NOT APPLE) + set_target_properties(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib) + endif() +endif() + +if(WITH_CYCLES_NETWORK) + add_executable(cycles_server cycles_server.cpp) + target_link_libraries(cycles_server ${LIBRARIES}) + + if(UNIX AND NOT APPLE) + set_target_properties(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib) + endif() +endif() |