[Bf-blender-cvs] [90f2feb] master: CMake: Auto-detect path to idiff application in FindOpenImageIO.cmake

Sergey Sharybin noreply at git.blender.org
Thu Jan 22 11:58:26 CET 2015


Commit: 90f2febbf41ed6cd18b4606e956d6887cb8aba3e
Author: Sergey Sharybin
Date:   Thu Jan 22 15:52:50 2015 +0500
Branches: master
https://developer.blender.org/rB90f2febbf41ed6cd18b4606e956d6887cb8aba3e

CMake: Auto-detect path to idiff application in FindOpenImageIO.cmake

Not used at this moment, but will be real soon with new ctests.

===================================================================

M	CMakeLists.txt
M	build_files/cmake/Modules/FindOpenImageIO.cmake

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f0fa76..843f430 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1445,6 +1445,7 @@ elseif(WIN32)
 			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
 			set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
+			set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
 			add_definitions(-DOIIO_STATIC_BUILD)
 		endif()
 
@@ -1684,6 +1685,7 @@ elseif(WIN32)
 			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
 			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS "")
+			set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
 		endif()
 		
 		if(WITH_LLVM)
@@ -2012,6 +2014,7 @@ elseif(APPLE)
 		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO}/lib/libOpenImageIO.a ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
 		set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib ${JPEG_LIBPATH} ${PNG_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH} ${ZLIB_LIBPATH})
 		set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
+		set(OPENIMAGEIO_IDIFF "${LIBDIR}/openimageio/bin/idiff")
 	endif()
 
 	if(WITH_OPENCOLORIO)
diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake
index f8d6612..6b82c9d 100644
--- a/build_files/cmake/Modules/FindOpenImageIO.cmake
+++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
@@ -8,6 +8,7 @@
 #                        This can also be an environment variable.
 #  OPENIMAGEIO_FOUND, If false, do not try to use OpenImageIO.
 #  OPENIMAGEIO_PUGIXML_FOUND, Indicates whether OIIO has biltin PuguXML parser.
+#  OPENIMAGEIO_IDIFF, full path to idiff application if found.
 #
 # also defined, but not for general use are
 #  OPENIMAGEIO_LIBRARY, where to find the OpenImageIO library.
@@ -55,6 +56,14 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY
     lib64 lib
   )
 
+FIND_FILE(OPENIMAGEIO_IDIFF
+  NAMES
+    idiff
+  ${OPENIMAGEIO_ROOT_DIR}
+  PATH_SUFFIXES
+    bin
+)
+
 # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)




More information about the Bf-blender-cvs mailing list