diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-11-04 18:47:59 +0100 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-11-04 18:47:59 +0100 |
| commit | c8479f678a57ae85eccb4714564b6449c14a1d2d (patch) | |
| tree | 417a4ffd8e52e642730c037fc5c3b813f48c101b | |
| parent | 74587630c371c63683b46641e1fe03ff0dc25c4e (diff) | |
Revert partialy previous commit. Drop of SDL_ttf FIND cant be done since it does not use PkgConfig.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 85cc49f..b4d00b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,7 +189,8 @@ IF ( NOT BUILD_SERVER ) INCLUDE_DIRECTORIES ( ${SDL_INCLUDE_DIRS} ) pkg_check_modules(SDLIMAGE REQUIRED SDL_image) INCLUDE_DIRECTORIES ( ${SDLIMAGE_INCLUDE_DIRS} ) - pkg_check_modules(SDLTTF REQUIRED SDL_image) + #pkg_check_modules(SDLTTF REQUIRED SDL_ttf) # WTF NO PkgConfig module?! + FIND_PACKAGE ( SDL_ttf REQUIRED ) IF ( WITH_AUDIO ) pkg_check_modules(SDLMIXER REQUIRED SDL_mixer) INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIRS} ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2feedd0..f18ed35 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,11 +17,13 @@ ELSE ( BUILD_SERVER ) ${SDL_LIBRARIES} ${SDLIMAGE_LIBRARIES} ${SDLMIXER_LIBRARIES} + ${SDLTTF_LIBRARY} ) ELSE ( WITH_AUDIO ) LINK_LIBRARIES ( ${SDL_LIBRARIES} ${SDLIMAGE_LIBRARIES} + ${SDLTTF_LIBRARY} ) ENDIF ( WITH_AUDIO ) LINK_LIBRARIES ( |