From c998feb631ae9b51d5cf92ce43f685fa63811ef7 Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 15 Dec 2018 13:12:35 +0100 Subject: Remove explicit link to stdc++ --- utils/vlc_codec/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'utils/vlc_codec/CMakeLists.txt') diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt index 1f37890..59f89fd 100644 --- a/utils/vlc_codec/CMakeLists.txt +++ b/utils/vlc_codec/CMakeLists.txt @@ -24,8 +24,6 @@ target_link_libraries(adlmidi_vlc_plugin PRIVATE ADLMIDI_static ${LIBVLCCORE_LIB if(WIN32 AND CMAKE_COMPILER_IS_GNUCXX) set_property(TARGET adlmidi_vlc_plugin APPEND_STRING PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++") set_property(TARGET adlmidi_vlc_plugin APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive") -elseif(NOT WIN32) - target_link_libraries(adlmidi_vlc_plugin PRIVATE stdc++) endif() # target_link_libraries(adlmidi_vlc_plugin INTERFACE "-export-symbol-regex ^vlc_entry") -- cgit v1.2.3 From a53f2c21566b213f782fe2e47accdf457f80650a Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 15 Dec 2018 13:21:41 +0100 Subject: Set toplevel CMAKE_MODULE_PATH --- utils/vlc_codec/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'utils/vlc_codec/CMakeLists.txt') diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt index 59f89fd..b1f4c02 100644 --- a/utils/vlc_codec/CMakeLists.txt +++ b/utils/vlc_codec/CMakeLists.txt @@ -1,6 +1,5 @@ set(CMAKE_C_STANDARD 99) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../cmake") find_package(LIBVLC REQUIRED) message("Found ${LIBVLCCORE_LIBRARY} of version ${LIBVLC_VERSION} with includes ${LIBVLC_INCLUDE_DIR}") -- cgit v1.2.3 From 16b933429a0b101460bdcd32b2b14935e1169c6d Mon Sep 17 00:00:00 2001 From: Flamefire Date: Sat, 15 Dec 2018 14:11:32 +0100 Subject: Improve FindLIBVLC --- utils/vlc_codec/CMakeLists.txt | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'utils/vlc_codec/CMakeLists.txt') diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt index b1f4c02..22e390f 100644 --- a/utils/vlc_codec/CMakeLists.txt +++ b/utils/vlc_codec/CMakeLists.txt @@ -1,32 +1,22 @@ set(CMAKE_C_STANDARD 99) find_package(LIBVLC REQUIRED) -message("Found ${LIBVLCCORE_LIBRARY} of version ${LIBVLC_VERSION} with includes ${LIBVLC_INCLUDE_DIR}") -set(adlmidi_vlc_src) -list(APPEND adlmidi_vlc_src libadlmidi.c) - -add_library(adlmidi_vlc_plugin MODULE ${adlmidi_vlc_src}) +add_library(adlmidi_vlc_plugin MODULE libadlmidi.c) set_target_properties(adlmidi_vlc_plugin PROPERTIES OUTPUT_NAME adlmidi_plugin) -target_compile_options(adlmidi_vlc_plugin PUBLIC - "-DVLC_MODULE_COPYRIGHT=\"Copyright \(c\) Vitaly Novichkov\"" - "-DVLC_MODULE_LICENSE=\"GPLv3\"" - "-DMODULE_STRING=\"adlmidi\"" - ${VLCPLUGIN_DEFINITIONS}) - -target_include_directories(adlmidi_vlc_plugin PRIVATE - ${LIBVLC_INCLUDE_DIR}/vlc/plugins - ${LIBVLC_INCLUDE_DIR}/vlc) +target_compile_definitions(adlmidi_vlc_plugin PUBLIC + "VLC_MODULE_COPYRIGHT=\"Copyright (c) Vitaly Novichkov\"" + "VLC_MODULE_LICENSE=\"GPLv3\"" + "MODULE_STRING=\"adlmidi\"" +) -target_link_libraries(adlmidi_vlc_plugin PRIVATE ADLMIDI_static ${LIBVLCCORE_LIBRARY} m) +target_link_libraries(adlmidi_vlc_plugin PRIVATE ADLMIDI_static libvlc::plugin m) if(WIN32 AND CMAKE_COMPILER_IS_GNUCXX) set_property(TARGET adlmidi_vlc_plugin APPEND_STRING PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++") set_property(TARGET adlmidi_vlc_plugin APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive") endif() -# target_link_libraries(adlmidi_vlc_plugin INTERFACE "-export-symbol-regex ^vlc_entry") - if(NOT VLC_PLUGIN_NOINSTALL) install(TARGETS adlmidi_vlc_plugin DESTINATION "${VLCPLUGIN_CODEC_INSTALL_PATH}") else() -- cgit v1.2.3