From 68d5c8d63c4901b1894af89f417285b32727935f Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:13:36 +0100 Subject: Fix SDL2 handling --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 888893e..4ea5e0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -246,7 +246,10 @@ if(WITH_OLD_UTILS) endif() if(WITH_HQ_RESAMPLER) - find_library(ZITA_RESAMPLER_LIBRARY "zita-resampler" REQUIRED) + find_library(ZITA_RESAMPLER_LIBRARY "zita-resampler") + if(NOT ZITA_RESAMPLER_LIBRARY) + message(FATAL_ERROR "zita-resampler library not found") + endif() endif() if(WITH_EMBEDDED_BANKS AND WITH_GENADLDATA) @@ -346,4 +349,3 @@ message("WITH_VLC_PLUGIN = ${WITH_VLC_PLUGIN}") message("WITH_OLD_UTILS = ${WITH_OLD_UTILS}") message("WITH_XMI2MID = ${WITH_XMI2MID}") message("EXAMPLE_SDL2_AUDIO = ${EXAMPLE_SDL2_AUDIO}") - -- cgit v1.2.3 From 613b7127cfc84ecb0dbfcbee12f0c9776ab20cb5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:18:42 +0100 Subject: Fix compile definitions No "-D" needed --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ea5e0d..4dcad04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,7 @@ function(set_visibility_hidden destTarget) else() target_compile_options(${destTarget} PRIVATE -fvisibility=hidden) endif() - target_compile_definitions(${destTarget} PRIVATE -DLIBADLMIDI_VISIBILITY) + target_compile_definitions(${destTarget} PRIVATE LIBADLMIDI_VISIBILITY=) endif() endfunction() #=========================================================================================== @@ -204,7 +204,7 @@ if(libADLMIDI_SHARED) set_visibility_hidden(ADLMIDI_shared) list(APPEND libADLMIDI_INSTALLS ADLMIDI_shared) if(WIN32) - target_compile_definitions(ADLMIDI_shared PRIVATE "-DADLMIDI_BUILD_DLL") + target_compile_definitions(ADLMIDI_shared PRIVATE ADLMIDI_BUILD_DLL) if(CMAKE_COMPILER_IS_GNUCXX) set_property(TARGET ADLMIDI_shared APPEND_STRING PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++") set_property(TARGET ADLMIDI_shared APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive") @@ -278,11 +278,11 @@ endif() if(WITH_HQ_RESAMPLER) if(libADLMIDI_SHARED) - target_compile_definitions(ADLMIDI_shared PRIVATE -DADLMIDI_ENABLE_HQ_RESAMPLER) + target_compile_definitions(ADLMIDI_shared PRIVATE ADLMIDI_ENABLE_HQ_RESAMPLER) target_link_libraries(ADLMIDI_shared PUBLIC "${ZITA_RESAMPLER_LIBRARY}") endif() if(libADLMIDI_STATIC OR WITH_VLC_PLUGIN) - target_compile_definitions(ADLMIDI_static PRIVATE -DADLMIDI_ENABLE_HQ_RESAMPLER) + target_compile_definitions(ADLMIDI_static PRIVATE ADLMIDI_ENABLE_HQ_RESAMPLER) target_link_libraries(ADLMIDI_static PUBLIC "${ZITA_RESAMPLER_LIBRARY}") endif() endif() -- cgit v1.2.3 From 24d7bc8fa17765695752eddfb51865d983dc5cf8 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:31:29 +0100 Subject: Optimize targets and related checks --- CMakeLists.txt | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dcad04..c5a5f17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,17 +224,11 @@ if(NOT libADLMIDI_STATIC AND NOT libADLMIDI_SHARED) You must enable at least one of them!") endif() -add_library(ADLMIDI_IF INTERFACE) - -if(libADLMIDI_STATIC OR WITH_VLC_PLUGIN) - add_library(ADLMIDI_IF_STATIC INTERFACE) - target_link_libraries(ADLMIDI_IF_STATIC INTERFACE ADLMIDI_static) -endif() - +add_library(ADLMIDI INTERFACE) if(libADLMIDI_SHARED) - target_link_libraries(ADLMIDI_IF INTERFACE ADLMIDI_shared) + target_link_libraries(ADLMIDI INTERFACE ADLMIDI_shared) else() - target_link_libraries(ADLMIDI_IF INTERFACE ADLMIDI_static) + target_link_libraries(ADLMIDI INTERFACE ADLMIDI_static) endif() if(WITH_OLD_UTILS) @@ -250,6 +244,14 @@ if(WITH_HQ_RESAMPLER) if(NOT ZITA_RESAMPLER_LIBRARY) message(FATAL_ERROR "zita-resampler library not found") endif() + if(TARGET ADLMIDI_shared) + target_compile_definitions(ADLMIDI_shared PRIVATE ADLMIDI_ENABLE_HQ_RESAMPLER) + target_link_libraries(ADLMIDI_shared PUBLIC "${ZITA_RESAMPLER_LIBRARY}") + endif() + if(TARGET ADLMIDI_static) + target_compile_definitions(ADLMIDI_static PRIVATE ADLMIDI_ENABLE_HQ_RESAMPLER) + target_link_libraries(ADLMIDI_static PUBLIC "${ZITA_RESAMPLER_LIBRARY}") + endif() endif() if(WITH_EMBEDDED_BANKS AND WITH_GENADLDATA) @@ -276,17 +278,6 @@ if(WITH_VLC_PLUGIN) add_subdirectory(utils/vlc_codec) endif() -if(WITH_HQ_RESAMPLER) - if(libADLMIDI_SHARED) - target_compile_definitions(ADLMIDI_shared PRIVATE ADLMIDI_ENABLE_HQ_RESAMPLER) - target_link_libraries(ADLMIDI_shared PUBLIC "${ZITA_RESAMPLER_LIBRARY}") - endif() - if(libADLMIDI_STATIC OR WITH_VLC_PLUGIN) - target_compile_definitions(ADLMIDI_static PRIVATE ADLMIDI_ENABLE_HQ_RESAMPLER) - target_link_libraries(ADLMIDI_static PUBLIC "${ZITA_RESAMPLER_LIBRARY}") - endif() -endif() - install(TARGETS ${libADLMIDI_INSTALLS} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- cgit v1.2.3 From 2fd13442097f92350ee481361f73015c918d91b5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:35:38 +0100 Subject: Improve compiler checks --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index c5a5f17..77454ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ endfunction() function(set_visibility_hidden destTarget) if(CMAKE_C_COMPILER_ID MATCHES "^(GNU|Clang)$" AND NOT DJGPP) - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2) + if(CMAKE_VERSION VERSION_GREATER 3.2) target_compile_options(${destTarget} PRIVATE $<$:-fvisibility-inlines-hidden> -fvisibility=hidden) else() -- cgit v1.2.3