Browse Source

Merge pull request #271 from jpcima/cmake-link-directories

Cmake link directories
pull/263/merge
JP Cimalando GitHub 4 years ago
parent
commit
26bcd30edf
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      cmake/DPF-plugin.cmake

+ 6
- 6
cmake/DPF-plugin.cmake View File

@@ -177,6 +177,8 @@ function(dpf__build_jack NAME DGL_LIBRARY)
return()
endif()

link_directories(${JACK_LIBRARY_DIRS})

dpf__create_dummy_source_list(_no_srcs)

dpf__add_executable("${NAME}-jack" ${_no_srcs})
@@ -188,9 +190,7 @@ function(dpf__build_jack NAME DGL_LIBRARY)
OUTPUT_NAME "${NAME}")

target_include_directories("${NAME}-jack" PRIVATE ${JACK_INCLUDE_DIRS})
target_link_directories("${NAME}-jack" PRIVATE ${JACK_LIBRARY_DIRS})
target_link_libraries("${NAME}-jack" PRIVATE ${JACK_LIBRARIES})
link_directories(${JACK_LIBRARY_DIRS})
endfunction()

# dpf__build_ladspa
@@ -224,6 +224,8 @@ function(dpf__build_dssi NAME DGL_LIBRARY)
return()
endif()

link_directories(${LIBLO_LIBRARY_DIRS})

dpf__create_dummy_source_list(_no_srcs)

dpf__add_module("${NAME}-dssi" ${_no_srcs})
@@ -243,9 +245,7 @@ function(dpf__build_dssi NAME DGL_LIBRARY)
OUTPUT_NAME "${NAME}_ui")

target_include_directories("${NAME}-dssi-ui" PRIVATE ${LIBLO_INCLUDE_DIRS})
target_link_directories("${NAME}-dssi-ui" PRIVATE ${LIBLO_LIBRARY_DIRS})
target_link_libraries("${NAME}-dssi-ui" PRIVATE ${LIBLO_LIBRARIES})
link_directories(${LIBLO_LIBRARY_DIRS})
endif()
endfunction()

@@ -323,6 +323,8 @@ function(dpf__add_dgl_cairo)
find_package(PkgConfig)
pkg_check_modules(CAIRO "cairo" REQUIRED)

link_directories(${CAIRO_LIBRARY_DIRS})

dpf__add_static_library(dgl-cairo STATIC
"${DPF_ROOT_DIR}/dgl/src/Application.cpp"
"${DPF_ROOT_DIR}/dgl/src/Color.cpp"
@@ -349,9 +351,7 @@ function(dpf__add_dgl_cairo)
target_compile_definitions(dgl-cairo-definitions INTERFACE "DGL_CAIRO" "HAVE_CAIRO")

target_include_directories(dgl-cairo PUBLIC ${CAIRO_INCLUDE_DIRS})
target_link_directories(dgl-cairo PRIVATE ${CAIRO_LIBRARY_DIRS})
target_link_libraries(dgl-cairo PRIVATE dgl-cairo-definitions ${CAIRO_LIBRARIES})
link_directories(${CAIRO_LIBRARY_DIRS})
endfunction()

# dpf__add_dgl_opengl


Loading…
Cancel
Save