Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ports/ensmallen/dependencies.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ diff --git a/CMake/ensmallen-config.cmake.in b/CMake/ensmallen-config.cmake.in
index 3a9a93c..a067e08 100644
--- a/CMake/ensmallen-config.cmake.in
+++ b/CMake/ensmallen-config.cmake.in
@@ -1,4 +1,6 @@
@@ -1,4 +1,7 @@
@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+find_dependency(Armadillo CONFIG)
+find_dependency(OpenMP)

include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])
check_required_components(ensmallen)
Expand Down
11 changes: 4 additions & 7 deletions ports/ensmallen/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
set(VCPKG_BUILD_TYPE release) # header-only

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mlpack/ensmallen
REF "${VERSION}"
SHA512 9cc058dcb777b7a59c361afcd02d2ce787b08c86a26aefc1d67c42658d67d7b62e8d7b5138c02912c182bc9b0e1e039c4036478985e12e2e35746853a169e067
SHA512 9cc058dcb777b7a59c361afcd02d2ce787b08c86a26aefc1d67c42658d67d7b62e8d7b5138c02912c182bc9b0e1e039c4036478985e12e2e35746853a169e067
HEAD_REF master
PATCHES
dependencies.patch
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTS=OFF
)
vcpkg_cmake_install()

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)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT.txt")
3 changes: 1 addition & 2 deletions ports/ensmallen/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"name": "ensmallen",
"version-semver": "2.19.1",
"port-version": 1,
"description": "A header-only C++ library for mathematical optimization",
"homepage": "http://ensmallen.org/",
"license": "BSD-3-Clause",
"dependencies": [
"armadillo",
"blas",
"lapack",
Comment on lines -9 to -10
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dependencies of armadillo, not direct dependencies

{
"name": "vcpkg-cmake",
"host": true
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2510,7 +2510,7 @@
},
"ensmallen": {
"baseline": "2.19.1",
"port-version": 0
"port-version": 1
},
"entityx": {
"baseline": "1.3.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/ensmallen.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d18fa3d8631e537cc048c343b4471c86aec76047",
"version-semver": "2.19.1",
"port-version": 1
},
{
"git-tree": "9cc70243efdfb4af7cc5e482a6e976d650487e86",
"version-semver": "2.19.1",
Expand Down