diff options
| author | Vitaly Novichkov <Wohlstand@users.noreply.github.com> | 2018-12-14 02:05:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-14 02:05:39 +0300 |
| commit | 2ecbf2805699c218286321d2d2bf41dbe09113f1 (patch) | |
| tree | b9e48346b441dd29b9116d49cdefb708bc45e9ed /utils/vlc_codec | |
| parent | c43c8b1293f1766abfef5689c8d21fb0fd124f6f (diff) | |
| parent | 10603bc5db691f0763891bb255cc23a95818cec5 (diff) | |
| download | libADLMIDI-2ecbf2805699c218286321d2d2bf41dbe09113f1.tar.gz libADLMIDI-2ecbf2805699c218286321d2d2bf41dbe09113f1.tar.bz2 libADLMIDI-2ecbf2805699c218286321d2d2bf41dbe09113f1.zip | |
Merge pull request #197 from Flamefire/CMake
Improve CMake
Diffstat (limited to 'utils/vlc_codec')
| -rw-r--r-- | utils/vlc_codec/CMakeLists.txt | 13 |
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) - |