diff options
| author | Debian Multimedia Maintainers <debian-multimedia@lists.debian.org> | 2021-09-21 14:19:01 +0200 |
|---|---|---|
| committer | IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> | 2021-09-21 14:19:01 +0200 |
| commit | b7d8158fde01d8230a631ada94f894c167b2a88a (patch) | |
| tree | ccb8a2474c42988f7b4d21cd7ea88bb896a8c4d7 | |
| parent | 21a6fff6a534ad6a9994da8d59f320655f91508c (diff) | |
treat kFreeBSD and the hurd the same as LINUX
Origin: Debian
Forwarded: https://github.com/Ableton/link/pull/103
Last-Update: 2021-09-10
Last-Update: 2021-09-10
Gbp-Pq: Name kfreebsd_hurd.patch
| -rw-r--r-- | AbletonLinkConfig.cmake | 2 | ||||
| -rw-r--r-- | examples/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | include/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | include/ableton/platforms/linux/Clock.hpp | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/AbletonLinkConfig.cmake b/AbletonLinkConfig.cmake index c34d8e3..2190e75 100644 --- a/AbletonLinkConfig.cmake +++ b/AbletonLinkConfig.cmake @@ -31,7 +31,7 @@ elseif(WIN32) INTERFACE_COMPILE_DEFINITIONS LINK_PLATFORM_WINDOWS=1 ) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "GNU") set_property(TARGET Ableton::Link APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS LINK_PLATFORM_LINUX=1 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b85107f..14a1700 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -71,7 +71,7 @@ elseif(WIN32) linkaudio/AudioPlatform_Wasapi.cpp ) endif() -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "GNU") if(LINK_BUILD_JACK) set(linkhut_audio_SOURCES linkaudio/AudioPlatform_Jack.hpp @@ -96,7 +96,7 @@ source_group("Audio Sources" FILES ${linkhut_audio_SOURCES}) # function(configure_linkhut_executable target) - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "GNU") target_link_libraries(${target} atomic pthread) endif() @@ -109,7 +109,7 @@ function(configure_linkhut_audio_sources target) target_compile_definitions(${target} PRIVATE -DLINKHUT_AUDIO_PLATFORM_COREAUDIO=1 ) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "GNU") if(LINK_BUILD_JACK) target_link_libraries(${target} jack) target_compile_definitions(${target} PRIVATE diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 0d9c71e..5f72284 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -102,7 +102,7 @@ elseif(UNIX) ${link_platform_DIR}/darwin/Darwin.hpp ${link_platform_DIR}/stl/Random.hpp ) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "GNU") set(link_platform_HEADERS ${link_platform_HEADERS} ${link_platform_DIR}/linux/Clock.hpp diff --git a/include/ableton/platforms/linux/Clock.hpp b/include/ableton/platforms/linux/Clock.hpp index 0cc4d9a..accfe47 100644 --- a/include/ableton/platforms/linux/Clock.hpp +++ b/include/ableton/platforms/linux/Clock.hpp @@ -32,6 +32,10 @@ namespace platforms #undef linux #endif +#if defined(__FreeBSD_kernel__) +#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC +#endif + namespace linux { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ebdd4b..2f4f94f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -75,7 +75,7 @@ source_group("Test Utils" FILES # |___/ function(configure_link_test_executable target) - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "GNU") target_link_libraries(${target} atomic pthread) endif() target_link_libraries(${target} Catch::Catch Ableton::Link) |