Skip to content

Commit 989b8d3

Browse files
authored
[itpp] Fix runtime errors (microsoft#42881)
1 parent 1e73628 commit 989b8d3

File tree

5 files changed

+23
-3
lines changed

5 files changed

+23
-3
lines changed

ports/itpp/fix-build.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/itpp/base/mat.cpp b/itpp/base/mat.cpp
2+
index 9f2a20e..11b0a58 100644
3+
--- a/itpp/base/mat.cpp
4+
+++ b/itpp/base/mat.cpp
5+
@@ -173,8 +173,7 @@ cmat operator*(const cmat &m1, const cmat &m2)
6+
template<>
7+
mat operator*(const mat &m1, const mat &m2)
8+
{
9+
- it_assert_debug(m1.rows() == m2.cols(),
10+
- "Mat<>::operator*(): Wrong sizes");
11+
+ it_assert_debug(m1.cols() == m2.rows(), "cmat::operator*(): Wrong sizes");
12+
mat r(m1.rows(), m2.cols());
13+
double *tr = r._data();
14+
const double *t1;

ports/itpp/portfile.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ vcpkg_from_sourceforge(
1111
fix-uwp.patch
1212
fix-linux.patch
1313
rename-version.patch
14+
fix-build.patch
1415
)
1516
file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
1617

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

36-
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
37+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
3738

3839
vcpkg_fixup_pkgconfig()

ports/itpp/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "itpp",
33
"version-semver": "4.3.1",
4-
"port-version": 11,
4+
"port-version": 12,
55
"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.",
66
"homepage": "http://itpp.sourceforge.net",
77
"dependencies": [

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3798,7 +3798,7 @@
37983798
},
37993799
"itpp": {
38003800
"baseline": "4.3.1",
3801-
"port-version": 11
3801+
"port-version": 12
38023802
},
38033803
"itsy-bitsy": {
38043804
"baseline": "2022-08-02",

versions/i-/itpp.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "90c2b246877a97ce4ee4b4f5b7aa55714ac715fd",
5+
"version-semver": "4.3.1",
6+
"port-version": 12
7+
},
38
{
49
"git-tree": "deb799807d61211af72ccc732eea3950b2d52b4c",
510
"version-semver": "4.3.1",

0 commit comments

Comments
 (0)