rtmidi, fix build for 32bit (#7066)

This commit is contained in:
Schrijvers Luc
2022-07-21 15:10:58 +02:00
committed by GitHub
parent acca3fc9d6
commit dd72a66102
2 changed files with 38 additions and 23 deletions

View File

@@ -1,4 +1,4 @@
From 75d2ff6da72f1cfdb6f0c725b0661b01116f6443 Mon Sep 17 00:00:00 2001
From 84b2863754b678df74282b32a24d77e44ce69928 Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Sun, 13 Mar 2022 23:56:17 +0600
Subject: Add Haiku MidiKit2 backend
@@ -63,7 +63,7 @@ index 616fdaf..62801c3 100644
# Export library target (build-tree).
export(EXPORT RtMidiTargets
diff --git a/RtMidi.cpp b/RtMidi.cpp
index 6a1c89e..66fd061 100644
index 6a1c89e..4a0099e 100644
--- a/RtMidi.cpp
+++ b/RtMidi.cpp
@@ -40,6 +40,13 @@
@@ -528,5 +528,28 @@ index efbf977..0325876 100644
};
--
2.30.2
2.36.1
From 5b2e8f5a7286229aac9c8154dbfa565c69d8fe31 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Thu, 21 Jul 2022 14:55:31 +0200
Subject: Fix install path for 32bit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62801c3..1fdeff2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,7 +265,7 @@ export(PACKAGE RtMidi)
# Set installation path for CMake files.
if (HAIKU)
- set(RTMIDI_CMAKE_DESTINATION lib/cmake/rtmidi)
+ set(RTMIDI_CMAKE_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rtmidi)
else()
set(RTMIDI_CMAKE_DESTINATION share/rtmidi)
endif()
--
2.36.1