diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-05-21 21:00:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 21:00:24 -0700 |
| commit | 33af90d42af68ef343edb00a69b1e11548a9e2e1 (patch) | |
| tree | c338f44bd8a960e8eafc52b91f6a1f666a927512 /ports/nlopt | |
| parent | e16f9c29a05aa178ce8a476a293723ab92f08f89 (diff) | |
| download | vcpkg-33af90d42af68ef343edb00a69b1e11548a9e2e1.tar.gz vcpkg-33af90d42af68ef343edb00a69b1e11548a9e2e1.zip | |
[many ports] Updates 2019.05.19 (#6524)
Diffstat (limited to 'ports/nlopt')
| -rw-r--r-- | ports/nlopt/0001_export_symbols.patch | 25 | ||||
| -rw-r--r-- | ports/nlopt/CONTROL | 2 | ||||
| -rw-r--r-- | ports/nlopt/portfile.cmake | 12 |
3 files changed, 5 insertions, 34 deletions
diff --git a/ports/nlopt/0001_export_symbols.patch b/ports/nlopt/0001_export_symbols.patch deleted file mode 100644 index 8db70a139..000000000 --- a/ports/nlopt/0001_export_symbols.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a8ab743870873066a66b30d68907ccc4ade250a5 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka <me@mixaill.tk> -Date: Mon, 4 Sep 2017 01:25:38 +0300 -Subject: [PATCH] export symbols - ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f630c18..c266b39 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,8 @@ endif () - - project (nlopt) - -+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -+ - list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - - option (WITH_CXX "enable cxx routines" OFF) --- -2.12.2.windows.2 - diff --git a/ports/nlopt/CONTROL b/ports/nlopt/CONTROL index c80774878..f6d91c785 100644 --- a/ports/nlopt/CONTROL +++ b/ports/nlopt/CONTROL @@ -1,3 +1,3 @@ Source: nlopt -Version: 2.4.2-1226c127 +Version: 2.6.1 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 f9d204b33..301c92e30 100644 --- a/ports/nlopt/portfile.cmake +++ b/ports/nlopt/portfile.cmake @@ -1,19 +1,15 @@ include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevengj/nlopt - REF 1226c1276dacf3687464c65eb165932281493a35 - SHA512 889f60cd6970b17296871396366bd0d868011d71ca4b88cb6da906283f928e5b443ab18c5af48a0701c8bf68b6d66288a3e4f248e0ab8183251aa7c3b0cfd652 + REF v2.6.1 + SHA512 e9b8ee75536a568e75150dc0a169d951b670d54ca9d2797f9db6f2751811d9d21be367fa6794a0bc76370715caf5356b368c9c12ad416f3cfb74ae8fa8eabd5c HEAD_REF master ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_export_symbols.patch) - - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA |