|
| 1 | +diff --git a/trunk/src/CMakeLists.txt b/trunk/src/CMakeLists.txt |
| 2 | +index 5be7af8..8a260bb 100644 |
| 3 | +--- a/trunk/src/CMakeLists.txt |
| 4 | ++++ b/trunk/src/CMakeLists.txt |
| 5 | +@@ -165,7 +165,13 @@ source_group("Header Files" FILES ${BOMBERMAAAN_HEADERS} ${BOMBERMAAAN_DX_HEADER |
| 6 | + source_group("Source Files" FILES ${BOMBERMAAAN_SOURCES} ${BOMBERMAAAN_DX_SOURCES} ${BOMBERMAAAN_NET_SOURCES} ${WINREPLACE_SOURCES}) |
| 7 | + |
| 8 | + find_package(SDL2 REQUIRED) |
| 9 | +-find_package(SDL2_mixer REQUIRED) |
| 10 | ++find_package(SDL2_mixer QUIET) |
| 11 | ++if(NOT SDL2_mixer_FOUND) |
| 12 | ++ find_library(SDL2_MIXER_LIBRARIES NAMES SDL2_mixer) |
| 13 | ++ if(NOT SDL2_MIXER_LIBRARIES) |
| 14 | ++ MESSAGE(FATAL_ERROR "SDL2_mixer libraries missing !") |
| 15 | ++ endif() |
| 16 | ++endif() |
| 17 | + |
| 18 | + if(USE_ALLEGRO) |
| 19 | + find_package(Allegro4 REQUIRED) |
| 20 | +@@ -182,7 +188,7 @@ if(CRASH_REPORT) |
| 21 | + endif() |
| 22 | + |
| 23 | + set(BOMBERMAAAN_INCLUDE_DIRS |
| 24 | +- ${SDL2_INCLUDE_DIR} |
| 25 | ++ ${SDL2_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS} |
| 26 | + ${SDL2_MIXER_INCLUDE_DIR} |
| 27 | + ) |
| 28 | + |
| 29 | +@@ -207,8 +213,8 @@ include_directories( |
| 30 | + ) |
| 31 | + |
| 32 | + set(BOMBERMAAAN_LIBRARIES |
| 33 | +- SDL2::SDL2 |
| 34 | +- SDL2_mixer::SDL2_mixer |
| 35 | ++ $<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,${SDL2_LIBRARIES}> |
| 36 | ++ $<IF:$<TARGET_EXISTS:SDL2_mixer::SDL2_mixer>,SDL2_mixer::SDL2_mixer,${SDL2_MIXER_LIBRARIES}> |
| 37 | + tinyxml |
| 38 | + ) |
| 39 | + |
0 commit comments