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:
omartijn 2022-08-31 22:58:30 +02:00 committed by GitHub
parent 1623a385d3
commit e126661e3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions

View File

@ -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

View File

@ -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)"

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "75f1c1ef95024543bf7298ba4389eafe67b9f473",
"version": "2.3.3",
"port-version": 5
},
{
"git-tree": "101bbdad9205db5b4249eae8b47bf8c5f73493a8",
"version": "2.3.3",

View File

@ -198,7 +198,7 @@
},
"asiosdk": {
"baseline": "2.3.3",
"port-version": 4
"port-version": 5
},
"asmjit": {
"baseline": "2021-10-26",