[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58631] branches/soc-2013-cycles_volume: - changed root CMakeLists.txt so OpenVDB would compile on Mac OS X;
Rafael Campos
rafaelcdn at gmail.com
Fri Jul 26 18:53:28 CEST 2013
Revision: 58631
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58631
Author: jehuty
Date: 2013-07-26 16:53:28 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
- changed root CMakeLists.txt so OpenVDB would compile on Mac OS X;
- moved cycles_openvdb_test out of cycles/app since most internal dependencies are not shared between them, to simplify compilation;
- removed -fno-rtti compilation flag since typeid is used;
- re-ordered includes to cause the recently added tbb dependency to be added first, since OIIO has its own lite version of tbb, causing many symbols to remain undefined;
Modified Paths:
--------------
branches/soc-2013-cycles_volume/CMakeLists.txt
branches/soc-2013-cycles_volume/extern/openvdb/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/app/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.h
branches/soc-2013-cycles_volume/intern/cycles/openvdb_app/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/openvdb_app/cycles_openvdb_test.cpp
branches/soc-2013-cycles_volume/source/creator/CMakeLists.txt
Added Paths:
-----------
branches/soc-2013-cycles_volume/intern/cycles/openvdb_app/
Modified: branches/soc-2013-cycles_volume/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/CMakeLists.txt 2013-07-26 16:50:50 UTC (rev 58630)
+++ branches/soc-2013-cycles_volume/CMakeLists.txt 2013-07-26 16:53:28 UTC (rev 58631)
@@ -1259,14 +1259,6 @@
set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
endif()
- if(WITH_CYCLES_OPENVDB) #requires tbb
- set(TBB ${LIBDIR}/tbb)
- set(TBB_INCLUDE_DIRS ${TBB}/include)
- set(TBB_LIBRARIES tbb tbb_debug)
- set(TBB_LIBPATH ${TBB}/lib)
- set(TBB_DEFINITIONS "")
- endif()
-
if(WITH_LLVM)
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
file(GLOB LLVM_LIBRARY ${LLVM_DIRECTORY}/lib/*.lib)
@@ -1821,6 +1813,14 @@
message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES")
endif()
+ if(WITH_CYCLES_OPENVDB) #requires tbb
+ set(TBB ${LIBDIR}/tbb)
+ set(TBB_INCLUDE_DIRS ${TBB}/include)
+ set(TBB_LIBRARIES tbb)
+ set(TBB_LIBPATH ${TBB}/lib)
+ set(TBB_DEFINITIONS "")
+ endif()
+
if(WITH_CYCLES_OSL)
if(NOT WITH_LLVM)
message(FATAL_ERROR "Cycles OSL reqires WITH_LLVM, the library may not have been found. Configure LLVM or disable WITH_CYCLES_OSL")
Modified: branches/soc-2013-cycles_volume/extern/openvdb/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/extern/openvdb/CMakeLists.txt 2013-07-26 16:50:50 UTC (rev 58630)
+++ branches/soc-2013-cycles_volume/extern/openvdb/CMakeLists.txt 2013-07-26 16:53:28 UTC (rev 58631)
@@ -29,8 +29,8 @@
set(INC_SYS
${BOOST_INCLUDE_DIR}
+ ${OPENEXR_INCLUDE_DIR}
${TBB_INCLUDE_DIRS}
- ${OPENEXR_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
Modified: branches/soc-2013-cycles_volume/intern/cycles/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/CMakeLists.txt 2013-07-26 16:50:50 UTC (rev 58630)
+++ branches/soc-2013-cycles_volume/intern/cycles/CMakeLists.txt 2013-07-26 16:53:28 UTC (rev 58631)
@@ -63,6 +63,12 @@
add_definitions(-DWITH_CUDA)
add_definitions(-DWITH_MULTI)
+if(WITH_CYCLES_OPENVDB)
+ include_directories(
+ SYSTEM
+ ${TBB_INCLUDE_DIRS})
+endif()
+
include_directories(
SYSTEM
${BOOST_INCLUDE_DIR}
@@ -82,10 +88,14 @@
add_subdirectory(blender)
endif()
-if(WITH_CYCLES_TEST OR WITH_CYCLES_NETWORK OR WITH_CYCLES_OPENVDB)
+if(WITH_CYCLES_TEST OR WITH_CYCLES_NETWORK)
add_subdirectory(app)
endif()
+if(WITH_CYCLES_OPENVDB)
+ add_subdirectory(openvdb_app)
+endif()
+
add_subdirectory(bvh)
add_subdirectory(device)
add_subdirectory(doc)
Modified: branches/soc-2013-cycles_volume/intern/cycles/app/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/app/CMakeLists.txt 2013-07-26 16:50:50 UTC (rev 58630)
+++ branches/soc-2013-cycles_volume/intern/cycles/app/CMakeLists.txt 2013-07-26 16:53:28 UTC (rev 58631)
@@ -67,20 +67,3 @@
endif()
unset(SRC)
endif()
-
-if (WITH_CYCLES_OPENVDB)
- set(SRC
- cycles_openvdb_test.cpp
- )
- add_executable(cycles_openvdb_test ${SRC})
-
- list(
- APPEND LIBRARIES
- ${TBB_LIBRARIES}
- extern_openvdb
- )
-
- target_link_libraries(cycles_openvdb_test ${LIBRARIES})
- unset(SRC)
-endif()
-
Modified: branches/soc-2013-cycles_volume/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/kernel/CMakeLists.txt 2013-07-26 16:50:50 UTC (rev 58630)
+++ branches/soc-2013-cycles_volume/intern/cycles/kernel/CMakeLists.txt 2013-07-26 16:53:28 UTC (rev 58631)
@@ -196,6 +196,7 @@
if(WITH_CYCLES_OSL)
add_subdirectory(osl)
+ add_subdirectory(textures)
add_subdirectory(shaders)
endif()
Modified: branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/CMakeLists.txt 2013-07-26 16:50:50 UTC (rev 58630)
+++ branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/CMakeLists.txt 2013-07-26 16:53:28 UTC (rev 58631)
@@ -21,7 +21,6 @@
osl_closures.cpp
osl_services.cpp
osl_shader.cpp
- openvdb_volume.cpp
)
set(HEADER_SRC
@@ -30,7 +29,6 @@
osl_globals.h
osl_services.h
osl_shader.h
- openvdb_volume.h
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
Modified: branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.h
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.h 2013-07-26 16:50:50 UTC (rev 58630)
+++ branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.h 2013-07-26 16:53:28 UTC (rev 58631)
@@ -30,8 +30,6 @@
#include <OSL/oslexec.h>
#include <OSL/oslclosure.h>
-#include<openvdb/openvdb.h>
-
CCL_NAMESPACE_BEGIN
class Object;
Modified: branches/soc-2013-cycles_volume/intern/cycles/openvdb_app/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/app/CMakeLists.txt 2013-07-20 00:21:16 UTC (rev 58431)
+++ branches/soc-2013-cycles_volume/intern/cycles/openvdb_app/CMakeLists.txt 2013-07-26 16:53:28 UTC (rev 58631)
@@ -1,24 +1,11 @@
set(INC
.
- ../device
- ../kernel
- ../kernel/svm
- ../bvh
- ../util
- ../render
- ../subd
)
set(INC_SYS
)
set(LIBRARIES
- cycles_device
- cycles_kernel
- cycles_render
- cycles_bvh
- cycles_subd
- cycles_util
${BOOST_LIBRARIES}
${OPENGL_LIBRARIES}
${CYCLES_GLEW_LIBRARY}
@@ -33,41 +20,9 @@
list(APPEND LIBRARIES ${GLUT_LIBRARIES})
endif()
-if(WITH_CYCLES_OSL)
- list(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
-endif()
-
include_directories(${INC})
include_directories(SYSTEM ${INC_SYS})
-if(WITH_CYCLES_TEST)
- set(SRC
- cycles_test.cpp
- cycles_xml.cpp
- cycles_xml.h
- )
- add_executable(cycles_test ${SRC})
- target_link_libraries(cycles_test ${LIBRARIES})
-
- if(UNIX AND NOT APPLE)
- set_target_properties(cycles_test PROPERTIES INSTALL_RPATH $ORIGIN/lib)
- endif()
- unset(SRC)
-endif()
-
-if(WITH_CYCLES_NETWORK)
- set(SRC
- cycles_server.cpp
- )
- add_executable(cycles_server ${SRC})
- target_link_libraries(cycles_server ${LIBRARIES})
-
- if(UNIX AND NOT APPLE)
- set_target_properties(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib)
- endif()
- unset(SRC)
-endif()
-
if (WITH_CYCLES_OPENVDB)
set(SRC
cycles_openvdb_test.cpp
Modified: branches/soc-2013-cycles_volume/intern/cycles/openvdb_app/cycles_openvdb_test.cpp
===================================================================
--- branches/soc-2013-cycles_volume/intern/cycles/app/cycles_openvdb_test.cpp 2013-07-20 00:21:16 UTC (rev 58431)
+++ branches/soc-2013-cycles_volume/intern/cycles/openvdb_app/cycles_openvdb_test.cpp 2013-07-26 16:53:28 UTC (rev 58631)
@@ -47,8 +47,8 @@
#include <unistd.h> // for getopt(), optarg
#endif
-#include <osl/openvdb_volume.h>
-#include <OSL/oslexec.h>
+//#include <textures/openvdb_volume.h>
+//#include <OSL/oslexec.h>
namespace {
@@ -292,13 +292,13 @@
}
}
-void
+/*void
openVdbVolumeFile()
{
OIIO::ustring testFile("R:\Documents\Projects\openvdbProjects\OpenVDB_Hello_World\OpenVDB_Hello_World");
// ccl::OpenVDBVolume::open_file(testFile);
}
-
+*/
} // unnamed namespace
Modified: branches/soc-2013-cycles_volume/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/source/creator/CMakeLists.txt 2013-07-26 16:50:50 UTC (rev 58630)
+++ branches/soc-2013-cycles_volume/source/creator/CMakeLists.txt 2013-07-26 16:53:28 UTC (rev 58631)
@@ -832,7 +832,8 @@
cycles_device
cycles_kernel
cycles_util
- cycles_subd)
+ cycles_subd
+ cycles_kernel_texture)
if(WITH_CYCLES_OSL)
list(APPEND BLENDER_LINK_LIBS cycles_kernel_osl)
endif()
More information about the Bf-blender-cvs
mailing list