diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-03-11 08:15:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 17:15:34 -0700 |
| commit | f41d64c18f4c2a8c417e1112b550549df4e82adb (patch) | |
| tree | d004f1a6d4fb56de394d904bccc9ae9d3f5ea874 /ports/ensmallen | |
| parent | 330ef69f9edb488bfb18947e4d3cb6d681ddc4b9 (diff) | |
| download | vcpkg-f41d64c18f4c2a8c417e1112b550549df4e82adb.tar.gz vcpkg-f41d64c18f4c2a8c417e1112b550549df4e82adb.zip | |
[mlpack ensmallen] Update to latest revision (#10070)
Diffstat (limited to 'ports/ensmallen')
| -rw-r--r-- | ports/ensmallen/CONTROL | 3 | ||||
| -rw-r--r-- | ports/ensmallen/disable_tests.patch | 15 | ||||
| -rw-r--r-- | ports/ensmallen/portfile.cmake | 15 |
3 files changed, 9 insertions, 24 deletions
diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL index 024a7617b..2a93222c6 100644 --- a/ports/ensmallen/CONTROL +++ b/ports/ensmallen/CONTROL @@ -1,5 +1,6 @@ Source: ensmallen -Version: 1.15.1 +Version: 2.11.2 +Homepage: https://github.com/mlpack/ensmallen Description: A header-only C++ library for mathematical optimization. Build-Depends: openblas (!osx), clapack (!osx), armadillo diff --git a/ports/ensmallen/disable_tests.patch b/ports/ensmallen/disable_tests.patch deleted file mode 100644 index 80dd7e869..000000000 --- a/ports/ensmallen/disable_tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1577be5..b0171b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -57,6 +57,7 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/include/ensmallen_bits"
- install(FILES ${CMAKE_SOURCE_DIR}/include/ensmallen.hpp
- DESTINATION "${CMAKE_INSTALL_PREFIX}/include")
-
--enable_testing()
--
--add_subdirectory(tests)
-+# Disable tests
-+#enable_testing()
-+#
-+#add_subdirectory(tests)
diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake index edded904a..065d12981 100644 --- a/ports/ensmallen/portfile.cmake +++ b/ports/ensmallen/portfile.cmake @@ -1,21 +1,20 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mlpack/ensmallen
- REF 8bea8d214b40be3cb42e817328c0791541fbcd6c - SHA512 b075b763c136c1d2d5088c533a8557e3d425da7bcfeb3748063c1e3225e58969eddfc5bd786cb02f29f71ea5e3288327481a0961f64b1d2ff1251a0f59c07779
+ REF ba0897d57f52db9578e5e44426eb3220d5bd917f # v2.11.2 + SHA512 715c87b407487c1b5f1b2e95c23151c80d84bda8e5bd879f71e41871bc9a10bb157acf67fa2814b180da4c426a842bf84f29ce0d3bd3a2df4bfab382f5bb04d3
HEAD_REF master
- PATCHES
- disable_tests.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ OPTIONS
+ -DBUILD_TESTS=OFF
)
vcpkg_install_cmake()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+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/ensmallen RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
|