diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-29 12:48:21 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:31:07 +0300 |
| commit | 4497b6ac84016c72d408dfef8e6ee1088c0a226b (patch) | |
| tree | 74224642183382b8429b62a7a251f6ed1924e194 /intern/cycles/app/CMakeLists.txt | |
| parent | 7f356c20dce083a2ddbb569543e3c93d74b60050 (diff) | |
Cycles: Synchronize changes with standalone repository
This changes were done in original commit of the standalone Cycles repository
and needed here for easier patch synchronization.
Diffstat (limited to 'intern/cycles/app/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index c8464899725..3d4a72dc015 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -22,7 +22,6 @@ set(LIBRARIES ${BOOST_LIBRARIES} ${OPENEXR_LIBRARIES} ${BLENDER_GL_LIBRARIES} - bf_intern_glew_mx ${CYCLES_APP_GLEW_LIBRARY} ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} @@ -33,20 +32,30 @@ set(LIBRARIES extern_cuew ) +if(NOT CYCLES_STANDALONE_REPOSITORY) + list(APPEND LIBRARIES bf_intern_glew_mx) +endif() + add_definitions(${GL_DEFINITIONS}) if(WIN32) list(APPEND LIBRARIES ${PTHREADS_LIBRARIES}) endif() -link_directories(${OPENIMAGEIO_LIBPATH} ${BOOST_LIBPATH} ${PNG_LIBPATH} ${JPEG_LIBPATH} ${ZLIB_LIBPATH} ${TIFF_LIBPATH}) +link_directories(${OPENIMAGEIO_LIBPATH} + ${BOOST_LIBPATH} + ${PNG_LIBPATH} + ${JPEG_LIBPATH} + ${ZLIB_LIBPATH} + ${TIFF_LIBPATH} + ${OPENEXR_LIBPATH}) if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) list(APPEND LIBRARIES ${GLUT_LIBRARIES}) endif() if(WITH_CYCLES_OSL) - list(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES} ${LLVM_LIBRARY}) + list(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES} ${LLVM_LIBRARIES}) endif() include_directories(${INC}) |