aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Novichkov <admin@wohlnet.ru>2019-09-23 02:15:13 +0300
committerVitaly Novichkov <admin@wohlnet.ru>2019-09-23 02:15:13 +0300
commit7c1906ac803e76b6ee0320056ef3a251c8ab7b32 (patch)
tree317ba43757eeb74ff2d74f524c7421aeb6b95cee
parent28f68718f8eb828bb240e6e57341759e8423e4c5 (diff)
parent62a018a1338b807d325d44a512499cf31563ab26 (diff)
downloadlibADLMIDI-7c1906ac803e76b6ee0320056ef3a251c8ab7b32.tar.gz
libADLMIDI-7c1906ac803e76b6ee0320056ef3a251c8ab7b32.tar.bz2
libADLMIDI-7c1906ac803e76b6ee0320056ef3a251c8ab7b32.zip
Merge branch 'master' into wip-new-embedded-banks
-rw-r--r--CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a2773f..9993fc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,7 +226,11 @@ set(libADLMIDI_SOURCES
# === Static library ====
if(libADLMIDI_STATIC OR WITH_VLC_PLUGIN)
add_library(ADLMIDI_static STATIC ${libADLMIDI_SOURCES})
- set_target_properties(ADLMIDI_static PROPERTIES OUTPUT_NAME ADLMIDI)
+ if(libADLMIDI_SHARED)
+ set_target_properties(ADLMIDI_static PROPERTIES OUTPUT_NAME ADLMIDI-static)
+ else()
+ set_target_properties(ADLMIDI_static PROPERTIES OUTPUT_NAME ADLMIDI)
+ endif()
target_include_directories(ADLMIDI_static PUBLIC ${libADLMIDI_SOURCE_DIR}/include)
set_legacy_standard(ADLMIDI_static)
set_visibility_hidden(ADLMIDI_static)