Fix SDL2 handling

4 files changed, 35 insertions, 43 deletions

diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt
index 6a31a33..ea4dd3e 100644
--- a/utils/adlmidi-2/CMakeLists.txt
+++ b/utils/adlmidi-2/CMakeLists.txt
@@ -8,13 +8,8 @@ find_package(OpenMP)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS)
-    find_package(SDL2 REQUIRED)
-    include_directories(${SDL2_INCLUDE_DIR})
-endif()
-
-if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS)
-    set(ADLMIDI2_HAS_PUZZLE_GAME "TRUE")
-    set(ADLMIDI2_VIDEO_OUT_SUPPORT "TRUE")
+    set(ADLMIDI2_HAS_PUZZLE_GAME TRUE)
+    set(ADLMIDI2_VIDEO_OUT_SUPPORT TRUE)
 endif()
 
 
@@ -29,6 +24,14 @@ if(ADLMIDI2_HAS_PUZZLE_GAME)
 endif()
 
 add_executable(adlmidi2 ${adlmidi2_src})
+target_link_libraries(adlmidi2 PRIVATE ADLMIDI_IF)
+
+if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS)
+    find_package(SDL2 REQUIRED)
+    string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
+    target_include_directories(adlmidi2 PRIVATE ${SDL2_INCLUDE_DIRS})
+    target_link_libraries(adlmidi2 PRIVATE ${SDL2_LIBRARIES})
+endif()
 
 if(ADLMIDI2_HAS_PUZZLE_GAME)
     target_compile_definitions(adlmidi2 PUBLIC "-DSUPPORT_PUZZLE_GAME")
@@ -44,15 +47,12 @@ if(MSDOS OR DJGPP)
 endif()
 
 if(WIN32)
-    target_link_libraries(adlmidi2 ADLMIDI_IF winmm)
-elseif(DJGPP OR MSDOS)
-    target_link_libraries(adlmidi2 ADLMIDI_IF)
-else()
-    set(ADLMIDI2_LIBS ADLMIDI_IF ${SDL2_LIBRARY} pthread dl m stdc++)
-    if(OPENBSD_LOCALBASE)
-        list(REMOVE_ITEM ADLMIDI2_LIBS dl)
+    target_link_libraries(adlmidi2 PRIVATE winmm)
+else(NOT DJGPP AND NOT MSDOS)
+    if(NOT OPENBSD_LOCALBASE)
+        target_link_libraries(adlmidi2 PRIVATE dl)
     endif()
-    target_link_libraries(adlmidi2 ${ADLMIDI2_LIBS})
+    target_link_libraries(adlmidi2 PRIVATE pthread m stdc++)
 endif()
 
 if(NOT WITH_CPP_EXTRAS)
@@ -66,7 +66,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
             CMAKE_COMPILER_IS_MINGW)
     if(OPENMP_FOUND)
         target_compile_options(adlmidi2 PUBLIC "-fopenmp")
-        target_link_libraries(adlmidi2 "-fopenmp")
+        target_link_libraries(adlmidi2 PRIVATE "-fopenmp")
     endif()
 else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     message("Turned on C++11 on MSVC")
@@ -87,4 +87,3 @@ endif()
 
 install(TARGETS adlmidi2
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-
diff --git a/utils/gen_adldata/CMakeLists.txt b/utils/gen_adldata/CMakeLists.txt
index 766b9b7..a361501 100644
--- a/utils/gen_adldata/CMakeLists.txt
+++ b/utils/gen_adldata/CMakeLists.txt
@@ -41,7 +41,7 @@ add_executable(gen_adldata
     ${GEN_ADLDATA_SRC}
 )
 if(NOT MSVC)
-    target_link_libraries(gen_adldata pthread m stdc++)
+    target_link_libraries(gen_adldata PRIVATE pthread m stdc++)
 endif()
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
         "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
@@ -50,7 +50,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
         CMAKE_COMPILER_IS_MINGW)
     if(OPENMP_FOUND)
         target_compile_options(gen_adldata PUBLIC "-fopenmp")
-        target_link_libraries(gen_adldata "-fopenmp")
+        target_link_libraries(gen_adldata PRIVATE "-fopenmp")
     endif()
 else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     message("Turned on C++11 on MSVC")
@@ -71,4 +71,3 @@ add_custom_target(gen-adldata-run #OUTPUT ${ADLDATA_DATABASE}
     COMMENT "Running Embedded FM banks database generation"
     VERBATIM
 )
-
diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt
index 8aef37f..6e46885 100644
--- a/utils/midiplay/CMakeLists.txt
+++ b/utils/midiplay/CMakeLists.txt
@@ -3,18 +3,18 @@ project(adlmidiplay CXX)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY)
-    find_package(SDL2 REQUIRED)
-    include_directories(${SDL2_INCLUDE_DIR})
-else()
-    unset(SDL2_LIBRARY)
-endif()
-
 add_executable(adlmidiplay
     adlmidiplay.cpp
     wave_writer.c
 )
 
+if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY)
+    find_package(SDL2 REQUIRED)
+    string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
+    target_include_directories(adlmidiplay PRIVATE ${SDL2_INCLUDE_DIRS})
+    target_link_libraries(adlmidiplay PRIVATE ${SDL2_LIBRARIES})
+endif()
+
 if(MIDIPLAY_WAVE_ONLY)
     target_compile_definitions(adlmidiplay PUBLIC "-DOUTPUT_WAVE_ONLY")
     message("Demo tool will only output WAVE file, no playing support.")
@@ -25,22 +25,17 @@ if(MSDOS OR DJGPP)
     message("Turn on hardware OPL3 support on demo tool")
 endif()
 
+target_link_libraries(adlmidiplay PRIVATE ADLMIDI_IF)
+
 if(WIN32)
-    if(MSVC)
-        target_link_libraries(adlmidiplay ADLMIDI_IF ${SDL2_LIBRARY})
-    else()
-        target_link_libraries(adlmidiplay ADLMIDI_IF ${SDL2_LIBRARY} pthread)
+    if(NOT MSVC)
+        target_link_libraries(adlmidiplay PRIVATE pthread)
     endif()
-else()
-    if(MSDOS OR DJGPP)
-        target_link_libraries(adlmidiplay ADLMIDI_IF)
-    else()
-        set(ADLMIDIPLAY_LIBS ADLMIDI_IF ${SDL2_LIBRARY} pthread dl m stdc++)
-        if(OPENBSD_LOCALBASE)
-            list(REMOVE_ITEM ADLMIDIPLAY_LIBS dl)
-        endif()
-        target_link_libraries(adlmidiplay ${ADLMIDIPLAY_LIBS})
+elseif(NOT MSDOS AND NOT DJGPP)
+    if(NOT OPENBSD_LOCALBASE)
+        target_link_libraries(adlmidiplay PRIVATE dl)
     endif()
+    target_link_libraries(adlmidiplay PRIVATE pthread m stdc++)
 endif()
 
 if(MSDOS OR DJGPP)
@@ -58,4 +53,3 @@ endif()
 
 install(TARGETS adlmidiplay
         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-
diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt
index 2973b13..c6943e4 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)
@@ -40,4 +41,3 @@ else()
 endif()
 
 add_dependencies(adlmidi_vlc_plugin ADLMIDI_static)
-