diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-03 18:32:13 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-03 18:32:13 +0400 |
commit | 615fe0295fe13c229d7376b02a50ac110b636c47 (patch) | |
tree | 490bcc8d4af2abb7eed7679990fbee29a5376fb9 /CMakeLists.txt | |
parent | 6b098d7406f7d84b04be8d8604073de4e06613c9 (diff) |
Cycles OSL: refactoring and fixes
* Moved kernel/osl/nodes to kernel/shaders
* Renamed standard attributes to use geom:, particle:, object: prefixes
* Update stdosl.h to properly reflect the closures we support
* Fix the wrong stdosl.h being used for building shaders
* Add geom:numpolyvertices, geom:trianglevertices, geom:polyvertices attributes
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 25980544647..5cb6f255d10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -658,11 +658,7 @@ if(UNIX AND NOT APPLE) else() set(Boost_USE_MULTITHREADED ON) endif() - if(WITH_CYCLES_OSL) - find_package(Boost 1.34 COMPONENTS filesystem python3 regex system thread) # osl_nodes uses boost_python - else() - find_package(Boost 1.34 COMPONENTS filesystem regex system thread) - endif() + find_package(Boost 1.34 COMPONENTS filesystem regex system thread) mark_as_advanced(Boost_DIR) # why doesnt boost do this? endif() @@ -1137,12 +1133,6 @@ elseif(WIN32) debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX} debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX}) - if(WITH_CYCLES_OSL) - set(BOOST_LIBRARIES ${BOOST_LIBRARIES} - optimized libboost_python3-${BOOST_POSTFIX} - debug libboost_python3-${BOOST_DEBUG_POSTFIX}) - endif(WITH_CYCLES_OSL) - set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB") endif() @@ -1323,12 +1313,6 @@ elseif(WIN32) debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX} boost_regex-${BOOST_DEBUG_POSTFIX} boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX}) - if(WITH_CYCLES_OSL) - set(BOOST_LIBRARIES ${BOOST_LIBRARIES} - optimized libboost_python3-${BOOST_POSTFIX} - debug libboost_python3-${BOOST_DEBUG_POSTFIX}) - endif(WITH_CYCLES_OSL) - set(BOOST_LIBPATH ${BOOST}/lib) set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ") endif() @@ -1583,11 +1567,7 @@ elseif(APPLE) if(WITH_BOOST) set(BOOST ${LIBDIR}/boost) set(BOOST_INCLUDE_DIR ${BOOST}/include) - if(WITH_CYCLES_OSL) - set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt boost_python3-mt boost_regex-mt boost_system-mt boost_thread-mt) - else(WITH_CYCLES_OSL) - set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt) - endif(WITH_CYCLES_OSL) + set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt) set(BOOST_LIBPATH ${BOOST}/lib) set(BOOST_DEFINITIONS) endif() |