[Bf-blender-cvs] [aac33118b7c] epoxy: additional epoxy install and find fixes for Windows

[Christian Rauch]

Commit: aac33118b7c7de24cf181bf1617c33c1738d9df1
Author: Christian Rauch
Date:   Mon Jul 4 09:52:16 2022 +0100
Branches: epoxy
https://developer.blender.org/rBaac33118b7c7de24cf181bf1617c33c1738d9df1

additional epoxy install and find fixes for Windows

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

M	build_files/build_environment/cmake/epoxy.cmake
M	build_files/cmake/platform/platform_win32.cmake

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

diff --git a/build_files/build_environment/cmake/epoxy.cmake b/build_files/build_environment/cmake/epoxy.cmake
index 3367f26eecd..6de6685eb14 100644
--- a/build_files/build_environment/cmake/epoxy.cmake
+++ b/build_files/build_environment/cmake/epoxy.cmake
@@ -5,7 +5,7 @@ ExternalProject_Add(external_epoxy
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${EPOXY_HASH_TYPE}=${EPOXY_HASH}
   PREFIX ${BUILD_DIR}/epoxy
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && meson setup --prefix ${LIBDIR}/epoxy --default-library static --libdir lib . ../external_epoxy -Dtests=false
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && meson setup --prefix ${LIBDIR}/epoxy --default-library static --libdir lib ${BUILD_DIR}/epoxy/src/external_epoxy-build ${BUILD_DIR}/epoxy/src/external_epoxy -Dtests=false
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index b4c54d93531..700973b1769 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -324,7 +324,11 @@ if(NOT JPEG_FOUND)
 endif()
 
 set(EPOXY_ROOT_DIR ${LIBDIR}/epoxy)
-find_package(Epoxy REQUIRED)
+windows_find_package(Epoxy REQUIRED)
+if(NOT EPOXY_FOUND)
+  set(Epoxy_INCLUDE_DIRS ${LIBDIR}/epoxy/include)
+  set(Epoxy_LIBRARIES ${LIBDIR}/epoxy/lib/libepoxy.lib)
+endif()
 
 set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
 set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC3.lib)