widelands-dev team mailing list archive

[Kiscsirke <csirkeee@xxxxxxxxx>]

Kiscsirke has proposed merging lp:~csirkeee/widelands/bug1150517_2 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~csirkeee/widelands/bug1150517_2/+merge/152987

Added CMake requirement for latest version of SDL_mixer, because as we found out in bug 1150517, lower versions cause double free.

I only put this up for review because I haven't touched CMakeLists before, if noone objects in a few days, will merge.
-- 
https://code.launchpad.net/~csirkeee/widelands/bug1150517_2/+merge/152987
Your team Widelands Developers is requested to review the proposed merge of lp:~csirkeee/widelands/bug1150517_2 into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-01 22:54:23 +0000
+++ CMakeLists.txt	2013-03-12 19:06:25 +0000
@@ -433,7 +433,7 @@
   message(FATAL_ERROR "Required package SDL_image not found, please install and re-run cmake")
 endif (NOT SDLIMAGE_FOUND)
 
-find_package(SDL_mixer REQUIRED)
+find_package(SDL_mixer 1.2.12 REQUIRED)
 include_directories(${SDLMIXER_INCLUDE_DIR})
 if (NOT SDLMIXER_FOUND)
   message(FATAL_ERROR "Required package SDL_mixer not found, please install and re-run cmake")