diff options
| author | Christian Rauch <Rauch.Christian@gmx.de> | 2022-07-04 11:52:16 +0300 |
|---|---|---|
| committer | Christian Rauch <Rauch.Christian@gmx.de> | 2022-07-04 12:40:47 +0300 |
| commit | aac33118b7c7de24cf181bf1617c33c1738d9df1 (patch) | |
| tree | 859338451f8e0d4600a7240974fbf072cb688142 | |
| parent | 6ca3b461436f59d566222f2271fb047b69cabce9 (diff) | |
additional epoxy install and find fixes for Windowsepoxy
| -rw-r--r-- | build_files/build_environment/cmake/epoxy.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
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) |