diff options
| author | Wohlstand <admin@wohlnet.ru> | 2018-04-12 20:02:58 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2018-04-12 20:02:58 +0300 |
| commit | ccfb31ab7cd966aeddb106f7a1c3efec6834dccc (patch) | |
| tree | b7a8e04679051bc4089c377f46114dd25146ffb5 | |
| parent | 3becc34e84bf7cbc99f98ffdd937b8ae8624c507 (diff) | |
| download | libADLMIDI-ccfb31ab7cd966aeddb106f7a1c3efec6834dccc.tar.gz libADLMIDI-ccfb31ab7cd966aeddb106f7a1c3efec6834dccc.tar.bz2 libADLMIDI-ccfb31ab7cd966aeddb106f7a1c3efec6834dccc.zip | |
Fixed the VLC plugin support built via CMake!
TODO: Implement install support
| -rw-r--r-- | CMakeLists.txt | 23 | ||||
| -rw-r--r-- | cmake/FindLIBVLC.cmake | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7db29ab..cff7665 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -430,25 +430,23 @@ endif() if(WITH_VLC_PLUGIN) include(cmake/FindLIBVLC.cmake) - include_directories(${LIBVLC_INCLUDE_DIR}/vlc/plugins) - include_directories(${LIBVLC_INCLUDE_DIR}/vlc) - message("Found ${LIBVLC_LIBRARY} of version ${LIBVLC_VERSION} with includes ${LIBVLC_INCLUDE_DIR}") + message("Found ${LIBVLCCORE_LIBRARY} of version ${LIBVLC_VERSION} with includes ${LIBVLC_INCLUDE_DIR}") set(adlmidi_vlc_src) list(APPEND adlmidi_vlc_src ${libADLMIDI_SOURCE_DIR}/utils/vlc_codec/libadlmidi.c) add_library(adlmidi_plugin MODULE ${adlmidi_vlc_src}) - target_compile_options(adlmidi_plugin PUBLIC "-DVLC_MODULE_COPYRIGHT=\"Copyright \(c\) Vitaly Novichkov\"") - target_compile_options(adlmidi_plugin PUBLIC "-DVLC_MODULE_LICENSE=\"GPLv3\"") - target_compile_options(adlmidi_plugin PUBLIC "-DMODULE_STRING=\"adlmidi\"") - #target_link_options() - #target_compile_definitions(adlmidi_plugin - # PUBLIC -DVLC_MODULE_COPYRIGHT="Copyright \(c\) Vitaly Novichkov" -DVLC_MODULE_LICENSE="GPLv3" -DMODULE_STRING="adlmidi") + target_compile_options(adlmidi_plugin PUBLIC + "-DVLC_MODULE_COPYRIGHT=\"Copyright \(c\) Vitaly Novichkov\"" + "-DVLC_MODULE_LICENSE=\"GPLv3\"" + "-DMODULE_STRING=\"adlmidi\"" + ${VLCPLUGIN_DEFINITIONS}) + target_include_directories(adlmidi_plugin PRIVATE + ${LIBVLC_INCLUDE_DIR}/vlc/plugins + ${LIBVLC_INCLUDE_DIR}/vlc) target_link_libraries(adlmidi_plugin ADLMIDI vlccore m stdc++) - target_link_libraries(adlmidi_plugin INTERFACE "-export-symbol-regex ^vlc_entry") - #target_compile_definitions(adlmidi_plugin -DVLC_MODULE_LICENSE="GPLv3") - #target_compile_definitions(adlmidi_plugin -DMODULE_STRING="adlmidi") + # target_link_libraries(adlmidi_plugin INTERFACE "-export-symbol-regex ^vlc_entry") if(libADLMIDI_SHARED) add_dependencies(adlmidi_plugin ADLMIDI_shared) @@ -476,6 +474,7 @@ install(FILES message("==== libADLMIDI options ====") message("WITH_MIDIPLAY = ${WITH_MIDIPLAY}") +message("WITH_VLC_PLUGIN = ${WITH_VLC_PLUGIN}") message("MIDIPLAY_WAVE_ONLY = ${MIDIPLAY_WAVE_ONLY}") message("WITH_ADLMIDI2 = ${WITH_ADLMIDI2}") message("WITH_OLD_UTILS = ${WITH_OLD_UTILS}") diff --git a/cmake/FindLIBVLC.cmake b/cmake/FindLIBVLC.cmake index abbfb6c..93b3e35 100644 --- a/cmake/FindLIBVLC.cmake +++ b/cmake/FindLIBVLC.cmake @@ -24,6 +24,8 @@ if (NOT WIN32) find_package(PkgConfig) pkg_check_modules(PC_LIBVLC libvlc) set(LIBVLC_DEFINITIONS ${PC_LIBVLC_CFLAGS_OTHER}) + pkg_check_modules(PC_VLCPLUGIN vlc-plugin) + set(VLCPLUGIN_DEFINITIONS ${PC_VLCPLUGIN_CFLAGS_OTHER}) endif (NOT WIN32) #Put here path to custom location |