mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 20:32:47 +08:00
The find script for asio sdk failed on multiple inclusion (#26583)
Since it first tries to locate the directory and then unconditionally adds a subdirectory to it, running this script twice resulted in an incorrect path (the last node was added multiple times). We now check whether the script already ran and then abort. Co-authored-by: Martijn Otto <martijn@resolume.com>
This commit is contained in:
parent
1623a385d3
commit
e126661e3d
@ -3,6 +3,13 @@ else(WIN32)
|
||||
message(FATAL_ERROR "Findasiosdk.cmake: Unsupported platform ${CMAKE_SYSTEM_NAME}" )
|
||||
endif(WIN32)
|
||||
|
||||
# if this script is invoked multiple times, we end up adding
|
||||
# "asiosdk" to the directory multiple times, leading to incorrect
|
||||
# include paths
|
||||
if (ASIOSDK_ROOT_DIR)
|
||||
return()
|
||||
endif()
|
||||
|
||||
find_path(
|
||||
ASIOSDK_ROOT_DIR
|
||||
asiosdk
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "asiosdk",
|
||||
"version": "2.3.3",
|
||||
"port-version": 4,
|
||||
"port-version": 5,
|
||||
"description": "ASIO is a low latency audio API from Steinberg.",
|
||||
"homepage": "https://www.steinberg.net/en/company/developers.html",
|
||||
"supports": "windows & !(arm | uwp)"
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "75f1c1ef95024543bf7298ba4389eafe67b9f473",
|
||||
"version": "2.3.3",
|
||||
"port-version": 5
|
||||
},
|
||||
{
|
||||
"git-tree": "101bbdad9205db5b4249eae8b47bf8c5f73493a8",
|
||||
"version": "2.3.3",
|
||||
|
@ -198,7 +198,7 @@
|
||||
},
|
||||
"asiosdk": {
|
||||
"baseline": "2.3.3",
|
||||
"port-version": 4
|
||||
"port-version": 5
|
||||
},
|
||||
"asmjit": {
|
||||
"baseline": "2021-10-26",
|
||||
|
Loading…
Reference in New Issue
Block a user