mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 06:59:07 +08:00
[fluidsynth/redis-plus-plus] Update to the latest released version (#12974)
This commit is contained in:
NancyLi1013
GitHub
parent
48309ace3e
commit
2f9d4a1785
@ -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
|
||||
@ -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)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO FluidSynth/fluidsynth
|
||||
REF 37c9ae2bf431a764032f023b3b2c0c0b86b7c272 #v2.1.0
|
||||
SHA512 1eea26b7d71fd09e748df0989f7df42ab57a74d8d853a835da734120ee1198c0b8d73a39b8640aef8ef0c1788c9a329671de899882601da55ec20ab6ca3ff778
|
||||
REF 2393aef3bd0b4e78084cfe16735d402bc1497edd #v2.1.4
|
||||
SHA512 181914f883982d931dfa4d8c0d0391fb91fbf3448e1eb1ea1541c938d874d7611066e7e289859d83b610a85ba089463e0a93f77db5a6253349f6b328a7373dc6
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
force-x86-gentables.patch
|
||||
@ -16,13 +16,11 @@ vcpkg_configure_cmake(
|
||||
vcpkg_install_cmake()
|
||||
|
||||
# Copy fluidsynth.exe to tools dir
|
||||
file(COPY ${CURRENT_PACKAGES_DIR}/bin/fluidsynth.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/fluidsynth)
|
||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/fluidsynth)
|
||||
vcpkg_copy_tools(TOOL_NAMES fluidsynth AUTO_CLEAN)
|
||||
|
||||
# Remove unnecessary files
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fluidsynth.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fluidsynth.exe)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
|
||||
@ -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
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index fb160b5..6235d89 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -34,7 +34,7 @@ set_target_properties(${SHARED_LIB} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
|
||||
set_target_properties(${STATIC_LIB} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
||||
set_target_properties(${SHARED_LIB} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
||||
|
||||
-add_subdirectory(test)
|
||||
+#add_subdirectory(test)
|
||||
|
||||
# Install static lib.
|
||||
install(TARGETS ${STATIC_LIB}
|
||||
@ -1,17 +1,19 @@
|
||||
#Blocked by ninja: error: build.ninja:348: multiple rules generate lib/redis++.lib [-w dupbuild=err]
|
||||
vcpkg_fail_port_install(ON_TARGET "Windows")
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO sewenew/redis-plus-plus
|
||||
REF d35267580568517f09bdf70cb582e5284c25401a
|
||||
SHA512 f065b97d438772300e30485a7550bc0fff00005f1056cf9c23216ea388fa088303869ccf2eaa70ee8b06cc0fc2406c9c6faddd5ad08759ee2d0665ac91761914
|
||||
REF b08b36a9a91de00636e583307610f49af7876f50 # 1.1.2
|
||||
SHA512 6dcead9fca9e7082ace28dcd72a1b325e229297080eea3e5a28ef5e6b9e4a7d1bcb3568997a5e7a031d7937a025a017ed92d7869db5829ba6113783c84bc5a68
|
||||
HEAD_REF master
|
||||
PATCHES disable-build-test.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJIA
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-DREDIS_PLUS_PLUS_BUILD_TEST=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
@ -423,7 +423,6 @@ flint:x64-linux=fail
|
||||
flint:x64-osx=fail
|
||||
fltk:arm-uwp=fail
|
||||
fltk:x64-uwp=fail
|
||||
fluidsynth:x64-linux=fail
|
||||
fluidsynth:x64-osx=fail
|
||||
fmem:arm-uwp=fail
|
||||
fmem:x64-uwp=fail
|
||||
|
||||
Loading…
Reference in New Issue
Block a user