diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2021-07-14 04:15:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 13:15:39 -0700 |
| commit | 932df5b8ede16b73fc5508445140d5b360ea0c68 (patch) | |
| tree | 4690d3f402cd7e0ce059a820927d309b6fb585c2 | |
| parent | 9f7d6142eb5866c8da81d515a0746f65f77df03c (diff) | |
| download | vcpkg-932df5b8ede16b73fc5508445140d5b360ea0c68.tar.gz vcpkg-932df5b8ede16b73fc5508445140d5b360ea0c68.zip | |
[ensmallen] Update to the 2.17.0 (#18877)
* [ensmallen] Update to the 2.17.0
* update version
* delete PREFER_NINJA
* update version
| -rw-r--r-- | ports/ensmallen/CONTROL | 5 | ||||
| -rw-r--r-- | ports/ensmallen/portfile.cmake | 13 | ||||
| -rw-r--r-- | ports/ensmallen/vcpkg.json | 19 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/e-/ensmallen.json | 5 |
5 files changed, 31 insertions, 13 deletions
diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL deleted file mode 100644 index 10d51ce79..000000000 --- a/ports/ensmallen/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ensmallen -Version: 2.14.2 -Homepage: https://github.com/mlpack/ensmallen -Description: A header-only C++ library for mathematical optimization. -Build-Depends: blas, lapack, armadillo diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake index 76be857ea..2e1a71e1e 100644 --- a/ports/ensmallen/portfile.cmake +++ b/ports/ensmallen/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mlpack/ensmallen
- REF 8d9c03715346f2048e61e3e370a6a6c7a5e55d3b # 2.14.2 - SHA512 2aebdd485265f8f6adcf9eb00c78e5f79f5d19e62566bdfcd024c44443d5658a7b92ea4ca62c29041f1b512cf67f8148fdc8b6894c9aa4c69ef305580916e24a
+ REF 9bd4bc25275066fa03173f65e1cbd789472e8f9b # 2.17.0 + SHA512 8b665e6307e73ad3273eb28c17ec62e8d0d968623d41b5460771be41a74f6a8088ddadb1764b9b4dc496dbceae6e791895cee0997de8614dc9a7426b6db663e0
HEAD_REF master
)
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
OPTIONS
-DBUILD_TESTS=OFF
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ensmallen TARGET_PATH share/ensmallen)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ensmallen)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYRIGHT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/ensmallen/vcpkg.json b/ports/ensmallen/vcpkg.json new file mode 100644 index 000000000..f5648353c --- /dev/null +++ b/ports/ensmallen/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ensmallen", + "version-semver": "2.17.0", + "description": "A header-only C++ library for mathematical optimization", + "homepage": "https://github.com/mlpack/ensmallen", + "dependencies": [ + "armadillo", + "blas", + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 794f7bb59..1d13df614 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1869,7 +1869,7 @@ "port-version": 0 }, "ensmallen": { - "baseline": "2.14.2", + "baseline": "2.17.0", "port-version": 0 }, "entityx": { diff --git a/versions/e-/ensmallen.json b/versions/e-/ensmallen.json index 488a414f7..0f5add203 100644 --- a/versions/e-/ensmallen.json +++ b/versions/e-/ensmallen.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "98fdc863799d6cadd208a558f158894df03fdcaf", + "version-semver": "2.17.0", + "port-version": 0 + }, + { "git-tree": "9d153b1e8d36e03fedd90ef42d8477380cf264a4", "version-string": "2.14.2", "port-version": 0 |