aboutsummaryrefslogtreecommitdiff
path: root/utils/vlc_codec/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'utils/vlc_codec/CMakeLists.txt')
-rw-r--r--utils/vlc_codec/CMakeLists.txt13
1 files changed, 5 insertions, 8 deletions
diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt
index 2973b13..aecf582 100644
--- a/utils/vlc_codec/CMakeLists.txt
+++ b/utils/vlc_codec/CMakeLists.txt
@@ -3,7 +3,8 @@ project(adlmidi_vlc_plugin C)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-include(../../cmake/FindLIBVLC.cmake)
+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}")
set(adlmidi_vlc_src)
@@ -21,16 +22,15 @@ target_include_directories(adlmidi_vlc_plugin PRIVATE
${LIBVLC_INCLUDE_DIR}/vlc/plugins
${LIBVLC_INCLUDE_DIR}/vlc)
-set(ADLMIDIVLC_LIBS ADLMIDI_IF_STATIC ${LIBVLCCORE_LIBRARY} m)
+target_link_libraries(adlmidi_vlc_plugin PRIVATE ADLMIDI_static ${LIBVLCCORE_LIBRARY} m)
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_COMPILER_IS_GNUCXX)
+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)
- list(APPEND ADLMIDIVLC_LIBS stdc++)
+ target_link_libraries(adlmidi_vlc_plugin PRIVATE stdc++)
endif()
-target_link_libraries(adlmidi_vlc_plugin ${ADLMIDIVLC_LIBS})
# target_link_libraries(adlmidi_vlc_plugin INTERFACE "-export-symbol-regex ^vlc_entry")
if(NOT VLC_PLUGIN_NOINSTALL)
@@ -38,6 +38,3 @@ if(NOT VLC_PLUGIN_NOINSTALL)
else()
install(TARGETS adlmidi_vlc_plugin DESTINATION "${CMAKE_INSTALL_LIBDIR}/vlc-codec/")
endif()
-
-add_dependencies(adlmidi_vlc_plugin ADLMIDI_static)
-