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

[itpp] Fix runtime errors #42881

Merged
merged 4 commits into from
Dec 23, 2024
Merged

[itpp] Fix runtime errors #42881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08efa7d
fix running error
jimwang118 Dec 23, 2024
e69df9b
update version
jimwang118 Dec 23, 2024
dbf27bb
format
jimwang118 Dec 23, 2024
e49352d
update version
jimwang118 Dec 23, 2024
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
14 changes: 14 additions & 0 deletions ports/itpp/fix-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/itpp/base/mat.cpp b/itpp/base/mat.cpp
index 9f2a20e..11b0a58 100644
--- a/itpp/base/mat.cpp
+++ b/itpp/base/mat.cpp
@@ -173,8 +173,7 @@ cmat operator*(const cmat &m1, const cmat &m2)
template<>
mat operator*(const mat &m1, const mat &m2)
{
- it_assert_debug(m1.rows() == m2.cols(),
- "Mat<>::operator*(): Wrong sizes");
+ it_assert_debug(m1.cols() == m2.rows(), "cmat::operator*(): Wrong sizes");
mat r(m1.rows(), m2.cols());
double *tr = r._data();
const double *t1;
3 changes: 2 additions & 1 deletion ports/itpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ vcpkg_from_sourceforge(
fix-uwp.patch
fix-linux.patch
rename-version.patch
fix-build.patch
)
file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")

Expand All @@ -33,6 +34,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_copy_pdbs()

file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

vcpkg_fixup_pkgconfig()
2 changes: 1 addition & 1 deletion ports/itpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "itpp",
"version-semver": "4.3.1",
"port-version": 11,
"port-version": 12,
"description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.",
"homepage": "http://itpp.sourceforge.net",
"dependencies": [
Expand Down
10 changes: 5 additions & 5 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3798,7 +3798,7 @@
},
"itpp": {
"baseline": "4.3.1",
"port-version": 11
"port-version": 12
},
"itsy-bitsy": {
"baseline": "2022-08-02",
Expand Down Expand Up @@ -6580,10 +6580,6 @@
"baseline": "1.5.1",
"port-version": 1
},
"orange-math": {
"baseline": "1.0.1",
"port-version": 0
},
"omniorb": {
"baseline": "4.3.0",
"port-version": 3
Expand Down Expand Up @@ -6824,6 +6820,10 @@
"baseline": "0.12+20221121",
"port-version": 1
},
"orange-math": {
"baseline": "1.0.1",
"port-version": 0
},
"orc": {
"baseline": "2.0.0",
"port-version": 0
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/itpp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "90c2b246877a97ce4ee4b4f5b7aa55714ac715fd",
"version-semver": "4.3.1",
"port-version": 12
},
{
"git-tree": "deb799807d61211af72ccc732eea3950b2d52b4c",
"version-semver": "4.3.1",
Expand Down
Loading