[openimageio] Add feature tools

microsoft · Dec 27, 2019 · 9d0fc9a · 9d0fc9a
1 parent 88727b4
commit 9d0fc9a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
@@ -38,4 +38,7 @@ Description: Enable openjpeg support for openimageio
 
 Feature: webp
 Build-Depends: libwebp
-Description: Enable libwebp support for openimageio
+Description: Enable libwebp support for openimageio
+
+Feature: tools
+Description: Build openimageio tools
diff --git a/ports/openimageio/fix-dependency.patch b/ports/openimageio/fix-dependency.patch
@@ -1,5 +1,5 @@
 diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 2f4f7ce..4c49082 100644
+index 2f4f7ce..6419c79 100644
 --- a/src/cmake/externalpackages.cmake
 +++ b/src/cmake/externalpackages.cmake
 @@ -169,10 +169,17 @@ checked_find_package (PNG REQUIRED)
@@ -46,6 +46,16 @@ index 2f4f7ce..4c49082 100644
 
  option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF)
  checked_find_package (R3DSDK)  # RED camera
+@@ -254,7 +265,9 @@ if (OPENGL_FOUND)
+     list (APPEND qt5_modules OpenGL)
+ endif ()
+ option (USE_QT "Use Qt if found" ON)
++if (USE_QT)
+ checked_find_package (Qt5 COMPONENTS ${qt5_modules})
++endif()
+ if (USE_QT AND NOT Qt5_FOUND AND APPLE)
+     message (STATUS "  If you think you installed qt5 with Homebrew and it still doesn't work,")
+     message (STATUS "  try:   export PATH=/usr/local/opt/qt5/bin:$PATH")
 diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt
 index 81a0ff5..23326a0 100644
 --- a/src/raw.imageio/CMakeLists.txt

diff --git a/ports/openimageio/fix-tools-path.patch b/ports/openimageio/fix-tools-path.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake
+index 9e54f67..d9c9437 100644
+--- a/src/cmake/oiio_macros.cmake
++++ b/src/cmake/oiio_macros.cmake
+@@ -142,7 +142,7 @@ macro (fancy_add_executable)
+             target_link_libraries (${_target_NAME} PRIVATE ${_target_LINK_LIBRARIES})
+         endif ()
+         set_target_properties (${_target_NAME} PROPERTIES FOLDER "Tools")
+-        install_targets (${_target_NAME})
++        install(TARGETS ${_target_NAME} RUNTIME DESTINATION tools)
+     else ()
+         message (STATUS "${ColorRed}Disabling ${_target_NAME} ${ColorReset}")
+     endif ()
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         fix-dependency.patch
         fix_static_build.patch
+        fix-tools-path.patch
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
@@ -34,13 +35,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     opencv USE_OPENCV
     openjpeg USE_OPENJPEG
     webp USE_WEBP
+    tools OIIO_BUILD_TOOLS
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS ${FEATURE_OPTIONS}
-        -DOIIO_BUILD_TOOLS=OFF
         -DOIIO_BUILD_TESTS=OFF
         -DHIDE_SYMBOLS=ON
         -DUSE_DCMTK=OFF