-
Notifications
You must be signed in to change notification settings - Fork 6.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fluidsynth/redis-plus-plus] Update to the latest released version (#…
- Loading branch information
1 parent
48309ac
commit 2f9d4a1
Showing
7 changed files
with
50 additions
and
60 deletions.
There are no files selected for viewing
This file contains 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,5 +1,5 @@ | ||
Source: fluidsynth | ||
Version: 2.1.0 | ||
Version: 2.1.4 | ||
Homepage: https://github.com/FluidSynth/fluidsynth | ||
Description: FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont. | ||
Build-Depends: glib |
This file contains 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,34 +1,38 @@ | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index f731632..226f408 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -368,10 +368,23 @@ endif ( MACOSX_FRAMEWORK ) | ||
# ******* Auto Generated Lookup Tables ****** | ||
|
||
include(ExternalProject) | ||
-ExternalProject_Add(gentables | ||
- DOWNLOAD_COMMAND "" | ||
- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables | ||
- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables | ||
- INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/" | ||
-) | ||
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) | ||
+ ExternalProject_Add(gentables | ||
+ DOWNLOAD_COMMAND "" | ||
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables | ||
+ BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables | ||
+ CONFIGURE_COMMAND | ||
+ "${CMAKE_COMMAND}" "${CMAKE_CURRENT_SOURCE_DIR}/gentables" -G "${CMAKE_GENERATOR}" -A Win32 -B "${CMAKE_CURRENT_BINARY_DIR}/gentables" | ||
+ BUILD_COMMAND | ||
+ "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/gentables" | ||
+ INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/" | ||
+ ) | ||
+else() | ||
+ ExternalProject_Add(gentables | ||
+ DOWNLOAD_COMMAND "" | ||
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables | ||
+ BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables | ||
+ INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/" | ||
+ ) | ||
+endif() | ||
add_dependencies(libfluidsynth-OBJ gentables) | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index 356bb73..b4c43d7 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -410,14 +410,23 @@ set (GENTAB_BDIR ${CMAKE_CURRENT_BINARY_DIR}/gentables) | ||
# To fix cross-compiling fluidsynth from Win32 to ARM (using vcpkg), we need to pass the current generator | ||
# on to the external project, otherwise (for some unknown reason) the target compiler will be used rather | ||
# than the host compiler. | ||
-ExternalProject_Add(gentables | ||
- DOWNLOAD_COMMAND "" | ||
- SOURCE_DIR ${GENTAB_SDIR} | ||
- BINARY_DIR ${GENTAB_BDIR} | ||
- CONFIGURE_COMMAND | ||
- "${CMAKE_COMMAND}" -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} -G "${CMAKE_GENERATOR}" -B "${GENTAB_BDIR}" "${GENTAB_SDIR}" | ||
- BUILD_COMMAND | ||
- "${CMAKE_COMMAND}" --build "${GENTAB_BDIR}" | ||
- INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/" | ||
-) | ||
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) | ||
+ ExternalProject_Add(gentables | ||
+ DOWNLOAD_COMMAND "" | ||
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables | ||
+ BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables | ||
+ CONFIGURE_COMMAND | ||
+ "${CMAKE_COMMAND}" "${CMAKE_CURRENT_SOURCE_DIR}/gentables" -G "${CMAKE_GENERATOR}" -A Win32 -B "${CMAKE_CURRENT_BINARY_DIR}/gentables" | ||
+ BUILD_COMMAND | ||
+ "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/gentables" | ||
+ INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/" | ||
+ ) | ||
+else() | ||
+ ExternalProject_Add(gentables | ||
+ DOWNLOAD_COMMAND "" | ||
+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gentables | ||
+ BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/gentables | ||
+ INSTALL_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentables/make_tables.exe "${CMAKE_BINARY_DIR}/" | ||
+ ) | ||
+endif() | ||
add_dependencies(libfluidsynth-OBJ gentables) |
This file contains 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 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,5 +1,5 @@ | ||
Source: redis-plus-plus | ||
Version: 1.1.1 | ||
Version: 1.1.2 | ||
Homepage: https://github.com/sewenew/redis-plus-plus | ||
Description: This is a C++ client for Redis. It's based on hiredis, and written in C++ 11. | ||
Build-Depends: hiredis |
This file was deleted.
Oops, something went wrong.
This file contains 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 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