mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 03:27:50 +08:00
f1e7a3f167
* [opencv4] draft update to v4.3 * restore uwp patch * fix qt and ipp features * fix libepoxy and meson on osx * fix baseline, trigger a full rebuild due to meson tool changes * remove jpeg feature on windows due to a bug with MSVC * minor fixes for some features * ffmpeg x11 lib not required anymore on apple for downstream projects * small fixes for ogre and qt5 * remove a broken module * fix installation path * fix openexr which was broken and regressed opencv downstream projects * first round of ci passes * improve compatibility with android toolchain * [openexr] upgrade to v2.5.0 to fix regressions, might require fixes in dependent projects and might deserve its own PR * fix OpenEXR link for downstream projects * do not install unrequested features * fix compatibility with newer OpenEXR * [OpenCV3] update to v3.4.10 * fix openexr on windows, was creating symlinks that broke vcpkg * fix openexr wrapper * [openexr] cmake config files are installed into a lowered-case folder * remove mangled paths trying to fix android setup * disable dnn on android, fix mangled cmake config paths again * fix downstream CUDA dependency * fix compatibility with vs16.6 * remove from baseline ports now passing tests * [alembic] fixes for new openexr * fix baseline * [field3d] fixes for new openexr * [field3d] improve fixes, windows still unsupported despite what is said upstream * apply fixes required from review * add missing field3d patch * [field3d] disable mpi integration * [opencv2] remove cublas integration * [vtk] do not create libharu::libharu target if already existing * Update ports/opencv4/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/opencv3/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * improve compatibility with newer CUDNN * [OpenCV3, OpenCV4] improve compatibility with CUDA 11 * [OpenCV2] improve compatibility with CUDA 11 * [field3d] regenerate patch ignoring space at eol * [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (#11999) * [field3d] regenerate patch ignoring space at eol * [field3d] regenerate patch, again * [field3d] fixes for windows * [libass] fix regression * ci.baseline.txt update * [CUDA11] use FindCUDA from CMake 3.18 to ease transition later * re-bump vtk and ffmpeg, which were lost with merges from master * [OpenCV4] Halide feature is not broken anymore * [field3d] regenerate hdf5 patch * [OpenCV4] remove GTK features: it can be built only on *nix but GTK on vcpkg cannot be built on *nix systems... * merge ci.baseline.txt from master and fix field3d patch * remove rebuilding * restore vtk CONTROL file * update CONTROL files * Trigger rebuild * Update ports/freeimage/CONTROL * Update ports/freeimage/CONTROL * [opencv3/4] avoid tesseract dependency on uwp builds * [opencv] add missing module search Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
44 lines
985 B
Diff
44 lines
985 B
Diff
diff --git a/include/UtilFoundation.h b/include/UtilFoundation.h
|
|
index 2eb6290..a449b5b 100644
|
|
--- a/include/UtilFoundation.h
|
|
+++ b/include/UtilFoundation.h
|
|
@@ -90,6 +90,9 @@
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
+#ifndef NOMINMAX
|
|
+#define NOMINMAX
|
|
+#endif
|
|
|
|
// needed for mutex stuff
|
|
#include <Windows.h>
|
|
diff --git a/src/FieldMapping.cpp b/src/FieldMapping.cpp
|
|
index b1f1a1f..90612b1 100644
|
|
--- a/src/FieldMapping.cpp
|
|
+++ b/src/FieldMapping.cpp
|
|
@@ -49,9 +49,6 @@
|
|
#include "FieldMapping.h"
|
|
#include "Types.h"
|
|
|
|
-#ifdef WIN32
|
|
-#define isnan(__x__) _isnan(__x__)
|
|
-#endif
|
|
|
|
//----------------------------------------------------------------------------//
|
|
|
|
diff --git a/src/Log.cpp b/src/Log.cpp
|
|
index f78229c..d095a50 100644
|
|
--- a/src/Log.cpp
|
|
+++ b/src/Log.cpp
|
|
@@ -40,8 +40,9 @@
|
|
*/
|
|
|
|
//----------------------------------------------------------------------------//
|
|
-
|
|
+#ifndef _WIN32
|
|
#include <unistd.h>
|
|
+#endif
|
|
#include <ios>
|
|
#include <fstream>
|
|
|