Browse Source

Fix attempt of cmake link directories

pull/271/head
Jean Pierre Cimalando 4 years ago
parent
commit
e248d6cb8a
1 changed files with 6 additions and 3 deletions
  1. +6
    -3
      cmake/DPF-plugin.cmake

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

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


link_directories(${JACK_LIBRARY_DIRS})

dpf__create_dummy_source_list(_no_srcs) dpf__create_dummy_source_list(_no_srcs)


dpf__add_executable("${NAME}-jack" ${_no_srcs}) dpf__add_executable("${NAME}-jack" ${_no_srcs})
@@ -189,7 +191,6 @@ function(dpf__build_jack NAME DGL_LIBRARY)


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


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


link_directories(${LIBLO_LIBRARY_DIRS})

dpf__create_dummy_source_list(_no_srcs) dpf__create_dummy_source_list(_no_srcs)


dpf__add_module("${NAME}-dssi" ${_no_srcs}) dpf__add_module("${NAME}-dssi" ${_no_srcs})
@@ -243,7 +246,6 @@ function(dpf__build_dssi NAME DGL_LIBRARY)


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


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


link_directories(${CAIRO_LIBRARY_DIRS})

dpf__add_static_library(dgl-cairo STATIC dpf__add_static_library(dgl-cairo STATIC
"${DPF_ROOT_DIR}/dgl/src/Application.cpp" "${DPF_ROOT_DIR}/dgl/src/Application.cpp"
"${DPF_ROOT_DIR}/dgl/src/Color.cpp" "${DPF_ROOT_DIR}/dgl/src/Color.cpp"
@@ -348,7 +352,6 @@ function(dpf__add_dgl_cairo)


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


# dpf__add_dgl_opengl # dpf__add_dgl_opengl


Loading…
Cancel
Save