diff options
| author | Markus Rickert <rickertm@users.noreply.github.com> | 2020-12-16 00:20:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 15:20:43 -0800 |
| commit | 18558d876c845060c2e21ea69a2b9fe1c476dff2 (patch) | |
| tree | 0e2272084d62b19c54de455bc8c2a95ab5459790 | |
| parent | 3de5895272a73e1457938c1ff28ec363e449e21d (diff) | |
| download | vcpkg-18558d876c845060c2e21ea69a2b9fe1c476dff2.tar.gz vcpkg-18558d876c845060c2e21ea69a2b9fe1c476dff2.zip | |
[NLopt] Update to 2.7.0 (#15105)
| -rw-r--r-- | ports/nlopt/0001-suppress-MS-compiler-complaint-about-negating-unsign.patch | 31 | ||||
| -rw-r--r-- | ports/nlopt/CONTROL | 4 | ||||
| -rw-r--r-- | ports/nlopt/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/nlopt/vcpkg.json | 6 |
4 files changed, 8 insertions, 39 deletions
diff --git a/ports/nlopt/0001-suppress-MS-compiler-complaint-about-negating-unsign.patch b/ports/nlopt/0001-suppress-MS-compiler-complaint-about-negating-unsign.patch deleted file mode 100644 index cd5fed49a..000000000 --- a/ports/nlopt/0001-suppress-MS-compiler-complaint-about-negating-unsign.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 004f415c5d04dd1f616a953eb8ad078a20b72c58 Mon Sep 17 00:00:00 2001 -From: "Steven G. Johnson" <stevenj@mit.edu> -Date: Sat, 9 May 2020 13:56:40 -0400 -Subject: [PATCH] suppress MS compiler complaint about negating unsigned - (closes #330) - ---- - src/util/sobolseq.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/util/sobolseq.c b/src/util/sobolseq.c -index 6626f51..848ff68 100644 ---- a/src/util/sobolseq.c -+++ b/src/util/sobolseq.c -@@ -93,7 +93,12 @@ static unsigned rightzero32(uint32_t n) - const uint32_t a = 0x05f66a47; /* magic number, found by brute force */ - static const unsigned decode[32] = { 0, 1, 2, 26, 23, 3, 15, 27, 24, 21, 19, 4, 12, 16, 28, 6, 31, 25, 22, 14, 20, 18, 11, 5, 30, 13, 17, 10, 29, 9, 8, 7 }; - n = ~n; /* change to rightmost-one problem */ -- n = a * (n & (-n)); /* store in n to make sure mult. is 32 bits */ -+#ifdef _MSC_VER -+#pragma warning(suppress:4146) -+ n = a * (n & (-n)); /* same as below, but suppress spurious warning/error with MS compiler about negating unsigned int */ -+#else -+ n = a * (n & (-n)); /* store in n to make sure mult. is 32 bits */ -+#endif - return decode[n >> 27]; - #endif - } --- -2.26.2.windows.1 - diff --git a/ports/nlopt/CONTROL b/ports/nlopt/CONTROL deleted file mode 100644 index 8d1344934..000000000 --- a/ports/nlopt/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nlopt -Version: 2.6.2-1 -Homepage: https://github.com/stevengj/nlopt -Description: a library for nonlinear local and global optimization, for functions with and without gradient information. diff --git a/ports/nlopt/portfile.cmake b/ports/nlopt/portfile.cmake index 157a3ccac..114ee72e5 100644 --- a/ports/nlopt/portfile.cmake +++ b/ports/nlopt/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevengj/nlopt - REF v2.6.2 - SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b + REF v2.7.0 + SHA512 3c41cab357b50adf50fe2d6225409ade8c5e8ee3576e3680ab29dded29ed7d328bc3d51d3a50054630159c319dca69e47ff08dc5df891b180b7d7e8fcbc27694 HEAD_REF master - PATCHES - 0001-suppress-MS-compiler-complaint-about-negating-unsign.patch ) vcpkg_configure_cmake( diff --git a/ports/nlopt/vcpkg.json b/ports/nlopt/vcpkg.json new file mode 100644 index 000000000..709709713 --- /dev/null +++ b/ports/nlopt/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "nlopt", + "version-string": "2.7.0", + "description": "a library for nonlinear local and global optimization, for functions with and without gradient information.", + "homepage": "https://github.com/stevengj/nlopt" +} |