From 9b27937a8da1a3d5a334a2016cb964e54887dd71 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 09:41:11 +0100 Subject: Revert "Put back "find_library" of SDL2" This reverts commit c43c8b1293f1766abfef5689c8d21fb0fd124f6f. --- examples/sdl2_audio/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'examples/sdl2_audio') diff --git a/examples/sdl2_audio/CMakeLists.txt b/examples/sdl2_audio/CMakeLists.txt index 6061b92..45fd654 100644 --- a/examples/sdl2_audio/CMakeLists.txt +++ b/examples/sdl2_audio/CMakeLists.txt @@ -3,9 +3,8 @@ project(adlmidi_vlc_plugin C) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -find_library(SDL2_LIBRARY SDL2 REQUIRED) +find_package(SDL2 REQUIRED) include_directories(${SDL2_INCLUDE_DIR}) -message("Found ${SDL2_LIBRARY}") add_executable(adlmidi_sdl2_demo sdl2_sample.c) -- cgit v1.2.3 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 --- examples/sdl2_audio/CMakeLists.txt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'examples/sdl2_audio') diff --git a/examples/sdl2_audio/CMakeLists.txt b/examples/sdl2_audio/CMakeLists.txt index 45fd654..04e39e3 100644 --- a/examples/sdl2_audio/CMakeLists.txt +++ b/examples/sdl2_audio/CMakeLists.txt @@ -4,18 +4,17 @@ project(adlmidi_vlc_plugin C) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) find_package(SDL2 REQUIRED) -include_directories(${SDL2_INCLUDE_DIR}) +string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES) add_executable(adlmidi_sdl2_demo sdl2_sample.c) +target_include_directories(adlmidi_sdl2_demo PRIVATE ${SDL2_INCLUDE_DIRS}) +target_link_libraries(adlmidi_sdl2_demo PRIVATE ADLMIDI_IF ${SDL2_LIBRARIES}) -if(WIN32) - if(MSVC) - target_link_libraries(adlmidi_sdl2_demo ADLMIDI_IF ${SDL2_LIBRARY}) - else() - target_link_libraries(adlmidi_sdl2_demo ADLMIDI_IF ${SDL2_LIBRARY} pthread) - endif() -else() - target_link_libraries(adlmidi_sdl2_demo ADLMIDI_IF ${SDL2_LIBRARY} pthread dl m stdc++) +if(NOT MSVC) + target_link_libraries(adlmidi_sdl2_demo PRIVATE pthread) +endif() +if(NOT WIN32) + target_link_libraries(adlmidi_sdl2_demo PRIVATE dl m stdc++) endif() if(MSDOS OR DJGPP) @@ -34,4 +33,3 @@ endif() install(TARGETS adlmidi_sdl2_demo RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - -- 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 --- examples/sdl2_audio/CMakeLists.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'examples/sdl2_audio') diff --git a/examples/sdl2_audio/CMakeLists.txt b/examples/sdl2_audio/CMakeLists.txt index 04e39e3..a5988d7 100644 --- a/examples/sdl2_audio/CMakeLists.txt +++ b/examples/sdl2_audio/CMakeLists.txt @@ -8,7 +8,7 @@ string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES) add_executable(adlmidi_sdl2_demo sdl2_sample.c) target_include_directories(adlmidi_sdl2_demo PRIVATE ${SDL2_INCLUDE_DIRS}) -target_link_libraries(adlmidi_sdl2_demo PRIVATE ADLMIDI_IF ${SDL2_LIBRARIES}) +target_link_libraries(adlmidi_sdl2_demo PRIVATE ADLMIDI ${SDL2_LIBRARIES}) if(NOT MSVC) target_link_libraries(adlmidi_sdl2_demo PRIVATE pthread) @@ -21,14 +21,8 @@ if(MSDOS OR DJGPP) set_target_properties(adlmidi_sdl2_demo PROPERTIES OUTPUT_NAME adlmidi) endif() -if(libADLMIDI_SHARED) - add_dependencies(adlmidi_sdl2_demo ADLMIDI_shared) +if(TARGET ADLMIDI_shared) set_target_properties(adlmidi_sdl2_demo PROPERTIES COMPILE_FLAGS "-Wl,-rpath='$$ORIGIN/../lib'") -else() - if(NOT libADLMIDI_STATIC) - message(FATAL_ERROR "libADLMIDI is required to be built!") - endif() - add_dependencies(adlmidi_sdl2_demo ADLMIDI_static) endif() install(TARGETS adlmidi_sdl2_demo -- cgit v1.2.3