Skip to content
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.

Sign up for GitHub

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

[muparser] update to 2.3.5 #42789

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −10
Open

[muparser] update to 2.3.5 #42789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions ports/muparser/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO beltoforion/muparser
REF 59e0ce1e0d35d42713af67788f19797945d81364 # v2.3.4
SHA512 4d0261b9c155b2697ce7222d87ff19be781919e93154bf69455ce36432f66abe2a1ea80a59f7526990f7859f78259014ef56702aa5c7db2ac8c28c8e9491e1f5
REF "v${VERSION}"
SHA512 48610dd112b5c8e1ea7615e29c9f9ca185091392b651794de039c14edfad4c62a6ae1d087393fdfd8d03a99f94a6e71275b86ddc8027234d322030bc7c25223e
HEAD_REF master
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
openmp ENABLE_OPENMP
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
OPTIONS ${FEATURE_OPTIONS}
-DENABLE_SAMPLES=OFF
-DENABLE_OPENMP=OFF
-DENABLE_WIDE_CHAR=OFF
)

Expand All @@ -20,9 +24,6 @@ vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/muparser")
vcpkg_fixup_pkgconfig()

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDef.h" "#if defined(_UNICODE)" "#if 0")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserDLL.h" "#ifndef _UNICODE" "#if 1")

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/muParserFixes.h" "#ifndef MUPARSER_STATIC" "#if 0")
else()
Expand Down
9 changes: 7 additions & 2 deletions ports/muparser/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "muparser",
"version": "2.3.4",
"version": "2.3.5",
"description": "Fast math parser library",
"homepage": "https://github.com/beltoforion/muparser",
"license": "BSD-2-Clause",
Expand All @@ -14,5 +14,10 @@
"name": "vcpkg-cmake-config",
"host": true
}
]
],
"features": {
"openmp": {
"description": "Enable OpenMP for multithreading"
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6205,7 +6205,7 @@
"port-version": 5
},
"muparser": {
"baseline": "2.3.4",
"baseline": "2.3.5",
"port-version": 0
},
"murmur3": {
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/muparser.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cbb068f60126bf3db24e867abb1b6daad94fdb0f",
"version": "2.3.5",
"port-version": 0
},
{
"git-tree": "7a10458552dd11fbd4d72ff5e978f5f55a82e2f3",
"version": "2.3.4",
Expand Down