Merge lp:~qcumber-some/widelands/cmake_fail_on_sdl_accessories into lp:widelands

Proposed by Jens Beyer
Status: Merged
Merged at revision: 6367
Proposed branch: lp:~qcumber-some/widelands/cmake_fail_on_sdl_accessories
Merge into: lp:widelands
Diff against target: 37 lines (+15/-0)
1 file modified
CMakeLists.txt (+15/-0)
To merge this branch: bzr merge lp:~qcumber-some/widelands/cmake_fail_on_sdl_accessories
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+100300@code.launchpad.net

Description of the change

This change issues errors in cmake if one of the SDL_* accessory packages are missing.

I propose this change for inclusion after Build17 (as I could not test with missing all packages), but it should be pretty safe anyway.

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

not critical enough for build 17 I'd say. Is it okay for you to have
this merged after build 17?

Revision history for this message
Jens Beyer (qcumber-some) wrote :

As I said, I propose for inclusion after Build17 :-)

Revision history for this message
SirVer (sirver) wrote :

Sorry.. seems like reading is not my strong point :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-03-15 18:30:11 +0000
3+++ CMakeLists.txt 2012-03-31 18:38:24 +0000
4@@ -401,18 +401,33 @@
5
6 find_package(SDL_image REQUIRED)
7 include_directories(${SDLIMAGE_INCLUDE_DIR})
8+if (NOT SDLIMAGE_FOUND)
9+ message(FATAL_ERROR "Required package SDL_image not found, please install and re-run cmake")
10+endif (NOT SDLIMAGE_FOUND)
11
12 find_package(SDL_mixer REQUIRED)
13 include_directories(${SDLMIXER_INCLUDE_DIR})
14+if (NOT SDLMIXER_FOUND)
15+ message(FATAL_ERROR "Required package SDL_mixer not found, please install and re-run cmake")
16+endif (NOT SDLMIXER_FOUND)
17
18 find_package(SDL_net REQUIRED)
19 include_directories(${SDLNET_INCLUDE_DIR})
20+if (NOT SDLNET_FOUND)
21+ message(FATAL_ERROR "Required package SDL_net not found, please install and re-run cmake")
22+endif (NOT SDLNET_FOUND)
23
24 find_package(SDL_ttf REQUIRED)
25 include_directories(${SDLTTF_INCLUDE_DIR})
26+if (NOT SDLTTF_FOUND)
27+ message(FATAL_ERROR "Required package SDL_ttf not found, please install and re-run cmake")
28+endif (NOT SDLTTF_FOUND)
29
30 find_package(SDL_gfx REQUIRED)
31 include_directories(${SDLGFX_INCLUDE_DIR})
32+if (NOT SDLGFX_FOUND)
33+ message(FATAL_ERROR "Required package SDL_gfx not found, please install and re-run cmake")
34+endif (NOT SDLGFX_FOUND)
35
36 find_package(Lua51 REQUIRED)
37 include_directories(${LUA_INCLUDE_DIR})

Subscribers

People subscribed via source and target branches

to status/vote changes: