|
 |
fdddaa9 |
diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/libOpenImageIO/CMakeLists.txt OpenImageIO-oiio-5b37f1c/src/libOpenImageIO/CMakeLists.txt
|
|
|
fdddaa9 |
--- OpenImageIO-oiio-5b37f1c.orig/src/libOpenImageIO/CMakeLists.txt 2012-02-28 12:58:45.306847484 -0600
|
|
|
fdddaa9 |
+++ OpenImageIO-oiio-5b37f1c/src/libOpenImageIO/CMakeLists.txt 2012-02-28 13:02:27.438365805 -0600
|
|
|
fdddaa9 |
@@ -61,7 +61,11 @@
|
|
|
fdddaa9 |
endif ()
|
|
|
fdddaa9 |
|
|
|
fdddaa9 |
# Include our own TBB if using it
|
|
|
fdddaa9 |
-if (USE_TBB)
|
|
|
fdddaa9 |
+if (USE_TBB AND USE_EXTERNAL_TBB)
|
|
|
fdddaa9 |
+ message (STATUS "System TBB library will be used.")
|
|
|
fdddaa9 |
+ set (libOpenImageIO_srcs ${libOpenImageIO_srcs})
|
|
|
fdddaa9 |
+elseif (USE_TBB AND NOT USE_EXTERNAL_TBB)
|
|
|
fdddaa9 |
+ message (STATUS "Built-in TBB library will be used.")
|
|
|
fdddaa9 |
set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp)
|
|
|
fdddaa9 |
endif ()
|
|
|
fdddaa9 |
|
|
|
fdddaa9 |
diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/include/CMakeLists.txt OpenImageIO-oiio-5b37f1c/src/include/CMakeLists.txt
|
|
|
fdddaa9 |
--- OpenImageIO-oiio-5b37f1c.orig/src/include/CMakeLists.txt 2012-02-25 17:17:12.000000000 -0600
|
|
|
fdddaa9 |
+++ OpenImageIO-oiio-5b37f1c/src/include/CMakeLists.txt 2012-02-28 13:32:00.961799696 -0600
|
|
|
fdddaa9 |
@@ -22,7 +22,7 @@
|
|
|
fdddaa9 |
install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
|
|
|
fdddaa9 |
COMPONENT developer)
|
|
|
fdddaa9 |
|
|
|
fdddaa9 |
-if (USE_TBB)
|
|
|
fdddaa9 |
+if (USE_TBB AND NOT USE_EXTERNAL_TBB)
|
|
|
fdddaa9 |
install (DIRECTORY tbb DESTINATION ${INCLUDE_INSTALL_DIR}
|
|
|
fdddaa9 |
COMPONENT developer)
|
|
|
fdddaa9 |
endif ()
|
|
|
3bbc3b7 |
diff -Naur OpenImageIO-oiio-f0a566a.orig/src/CMakeLists.txt OpenImageIO-oiio-f0a566a/src/CMakeLists.txt
|
|
|
3bbc3b7 |
--- OpenImageIO-oiio-f0a566a.orig/src/CMakeLists.txt 2012-06-12 13:03:37.000000000 -0500
|
|
|
3bbc3b7 |
+++ OpenImageIO-oiio-f0a566a/src/CMakeLists.txt 2012-06-28 15:12:45.831826494 -0500
|
|
|
3bbc3b7 |
@@ -34,6 +34,8 @@
|
|
|
3bbc3b7 |
set (PYTHON_VERSION 2.6)
|
|
|
3bbc3b7 |
set (USE_EXTERNAL_PUGIXML OFF CACHE BOOL
|
|
|
3bbc3b7 |
"Use an externally built shared library version of the pugixml library")
|
|
|
3bbc3b7 |
+set (USE_EXTERNAL_TBB OFF CACHE BOOL
|
|
|
3bbc3b7 |
+ "Use system TBB library instead of bundled.")
|
|
|
3bbc3b7 |
|
|
|
3bbc3b7 |
set (SOVERSION ${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}
|
|
|
3bbc3b7 |
CACHE STRING "Set the SO version in the SO name of the output library")
|
|
|
3bbc3b7 |
diff -Naur OpenImageIO-oiio-f0a566a.orig/src/libOpenImageIO/CMakeLists.txt OpenImageIO-oiio-f0a566a/src/libOpenImageIO/CMakeLists.txt
|
|
|
3bbc3b7 |
--- OpenImageIO-oiio-f0a566a.orig/src/libOpenImageIO/CMakeLists.txt 2012-06-28 15:08:38.114834341 -0500
|
|
|
3bbc3b7 |
+++ OpenImageIO-oiio-f0a566a/src/libOpenImageIO/CMakeLists.txt 2012-06-28 15:19:34.819584416 -0500
|
|
|
3bbc3b7 |
@@ -63,7 +63,9 @@
|
|
|
3bbc3b7 |
# Include our own TBB if using it
|
|
|
3bbc3b7 |
if (USE_TBB AND USE_EXTERNAL_TBB)
|
|
|
3bbc3b7 |
message (STATUS "System TBB library will be used.")
|
|
|
3bbc3b7 |
- set (libOpenImageIO_srcs ${libOpenImageIO_srcs})
|
|
|
3bbc3b7 |
+ find_package (TBB REQUIRED)
|
|
|
3bbc3b7 |
+ include_directories (${TBB_INCLUDE_DIRS})
|
|
|
3bbc3b7 |
+ set (libOpenImageIO_srcs ${libOpenImageIO_srcs})
|
|
|
3bbc3b7 |
elseif (USE_TBB AND NOT USE_EXTERNAL_TBB)
|
|
|
3bbc3b7 |
message (STATUS "Built-in TBB library will be used.")
|
|
|
3bbc3b7 |
set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp)
|
|
|
3bbc3b7 |
@@ -211,7 +213,11 @@
|
|
|
3bbc3b7 |
target_link_libraries (OpenImageIO ${OCIO_LIBRARIES})
|
|
|
3bbc3b7 |
endif ()
|
|
|
3bbc3b7 |
|
|
|
3bbc3b7 |
-
|
|
|
3bbc3b7 |
+# Link against system TBB library if specified
|
|
|
3bbc3b7 |
+if (USE_TBB AND USE_EXTERNAL_TBB)
|
|
|
3bbc3b7 |
+ message (STATUS "Linking TBB: ${TBB_LIBRARIES}")
|
|
|
3bbc3b7 |
+ target_link_libraries (OpenImageIO ${TBB_LIBRARIES})
|
|
|
3bbc3b7 |
+endif ()
|
|
|
3bbc3b7 |
|
|
|
3bbc3b7 |
|
|
|
3bbc3b7 |
if (WIN32)
|