1a39c4a653
Rebuild for libpng 1.5. Fixed bulding against tbb library.
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
diff -Naur OpenImageIO-oiio-7d98ca6.orig/src/libOpenImageIO/CMakeLists.txt OpenImageIO-oiio-7d98ca6/src/libOpenImageIO/CMakeLists.txt
|
|
--- OpenImageIO-oiio-7d98ca6.orig/src/libOpenImageIO/CMakeLists.txt 2011-11-05 14:58:12.807482262 -0500
|
|
+++ OpenImageIO-oiio-7d98ca6/src/libOpenImageIO/CMakeLists.txt 2011-11-05 15:24:19.934139140 -0500
|
|
@@ -62,7 +62,7 @@
|
|
# Include our own TBB if using it
|
|
if (USE_TBB)
|
|
add_definitions ("-DUSE_TBB=1")
|
|
- set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp)
|
|
+ include_directories(SYSTEM "/usr/include")
|
|
else ()
|
|
add_definitions ("-DUSE_TBB=0")
|
|
message (STATUS "TBB will not be used")
|
|
diff -Naur OpenImageIO-oiio-7d98ca6.orig/src/include/CMakeLists.txt OpenImageIO-oiio-7d98ca6/src/include/CMakeLists.txt
|
|
--- OpenImageIO-oiio-7d98ca6.orig/src/include/CMakeLists.txt 2011-11-05 15:42:23.297182938 -0500
|
|
+++ OpenImageIO-oiio-7d98ca6/src/include/CMakeLists.txt 2011-11-05 16:01:10.691264012 -0500
|
|
@@ -21,9 +21,3 @@
|
|
|
|
install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
|
|
COMPONENT developer)
|
|
-
|
|
-if (USE_TBB)
|
|
- install (DIRECTORY tbb DESTINATION ${INCLUDE_INSTALL_DIR}
|
|
- COMPONENT developer)
|
|
-endif ()
|
|
-
|