-
Notifications
You must be signed in to change notification settings - Fork 7k
[ensmallen] Fix usage #38515
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
[ensmallen] Fix usage #38515
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
70ecf3b
[ensmallen] Fix usage
Thomas1664 5a5c28a
version
Thomas1664 2a032e2
Merge branch 'master' of https://github.com/microsoft/vcpkg into ensm…
Thomas1664 4755f30
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal 0ba9b4e
Match the product code declaration of OpenMP
BillyONeal e402194
Use FindOpenMP.cmake
BillyONeal 37c9b89
Add openmp support as a feature
Thomas1664 dde05ce
version
Thomas1664 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Dependencies of armadillo, not direct dependencies |
||
{ | ||
"name": "vcpkg-cmake", | ||
"host": true | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.