فهرست منبع

Fix darwin build by fixing custom find file for OIIO to use the O3DE PNG package

Signed-off-by: Chris Galvan <[email protected]>
Chris Galvan 3 سال پیش
والد
کامیت
8c819eeca4
1فایلهای تغییر یافته به همراه2 افزوده شده و 5 حذف شده
  1. 2 5
      package-system/openimageio-opencolorio/custom_find_files/FindOpenImageIO.cmake

+ 2 - 5
package-system/openimageio-opencolorio/custom_find_files/FindOpenImageIO.cmake

@@ -17,11 +17,8 @@ message(STATUS "Using the internal FindOpenImageIO.cmake build file")
 
 
 find_package(ZLIB MODULE REQUIRED)
 find_package(ZLIB MODULE REQUIRED)
 find_package(OpenEXR MODULE REQUIRED)
 find_package(OpenEXR MODULE REQUIRED)
-# PNG::PNG - use the one from O3DE 3p
-find_library(png_LIBRARY NAMES png libpng HINTS ${CMAKE_CURRENT_LIST_DIR}/../temp/dependencies/libpng-1.6.37-mac/libpng PATH_SUFFIXES lib64 lib)
-add_library(PNG::PNG UNKNOWN IMPORTED GLOBAL)
-set_target_properties(PNG::PNG PROPERTIES IMPORTED_LOCATION ${png_LIBRARY}
-)
+find_package(PNG MODULE REQUIRED)
+
 # where opencolorio itself was installed
 # where opencolorio itself was installed
 set(OPENIMAGEIO_INSTALL_DIR ${CMAKE_CURRENT_LIST_DIR}/../temp/oiio_install)
 set(OPENIMAGEIO_INSTALL_DIR ${CMAKE_CURRENT_LIST_DIR}/../temp/oiio_install)