From 52ddcfa70fa20db760935d2c5a55ce1c99f3332c Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Fri, 6 Sep 2024 23:47:28 +0200 Subject: [PATCH] Tmp --- .github/workflows/ccpp.yml | 2 -- CMakeLists.txt | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 5bf779e..4761770 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -99,8 +99,6 @@ jobs: - name: configure if: ${{ matrix.config.enabled == 1 }} run: ${{ matrix.config.config }} - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - name: make if: ${{ matrix.config.enabled == 1 }} run: ${{ matrix.config.build }} diff --git a/CMakeLists.txt b/CMakeLists.txt index b491031..bf951be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,6 +195,7 @@ if(LIBLO_FOUND) maketest(liblo) target_include_directories(liblo PRIVATE ${LIBLO_INCLUDE_DIRS}) target_link_libraries(liblo PRIVATE ${RTOSC_LIBLO_LIBRARIES}) + target_link_directories(liblo PRIVATE ${LIBLO_LIBRARY_DIRS}) endif() maketestcpp(version) @@ -215,8 +216,9 @@ maketestcpp(path-search) maketestcpp(performance) if(LIBLO_FOUND) target_include_directories(performance PRIVATE ${LIBLO_INCLUDE_DIRS}) - target_link_libraries(performance PRIVATE ${RTOSC_LIBLO_LIBRARIES}) target_compile_definitions(performance PRIVATE HAVE_LIBLO) + target_link_libraries(performance PRIVATE ${RTOSC_LIBLO_LIBRARIES}) + target_link_directories(performance PRIVATE ${LIBLO_LIBRARY_DIRS}) endif() maketestcpp(undo-test) @@ -235,6 +237,7 @@ if(LIBLO_FOUND) target_include_directories(lo-server PRIVATE ${LIBLO_INCLUDE_DIRS}) target_include_directories(lo-server PRIVATE ${CMAKE_SOURCE_DIR}/include) target_link_libraries(lo-server PRIVATE ${RTOSC_LIBLO_LIBRARIES}) + target_link_directories(performance PRIVATE ${LIBLO_LIBRARY_DIRS}) set(RTOSC_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test CACHE INTERNAL "") set(RTOSC_TEST_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "") endif()