diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-14 21:43:39 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-14 21:43:39 +0200 |
| commit | 99bb4f324442acb1e0c9b1227c563c1173604ef2 (patch) | |
| tree | 3c413c3f8c2aef9c6b8846cc3fe101f7c33e9eef | |
| parent | 1321aa7597c1331e8c5d8895a78423df5861ebe6 (diff) | |
Few fixes for cmake
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ff20c28..33b5b61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,14 +84,15 @@ SET ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Tuxanci is first tux shooter inspired b SET ( CPACK_PACKAGE_VENDOR "Tomas Chvatal <scarabeus@gentoo.org>" ) SET ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENCE" ) SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README" ) -SET ( CPACK_GENERATOR "TBZ2" ) -SET ( CPACK_SOURCE_GENERATOR "TBZ2" ) +SET ( CPACK_GENERATOR "TGZ" ) +SET ( CPACK_SOURCE_GENERATOR "TGZ" ) SET ( CPACK_PACKAGE_VERSION_MAJOR "0" ) SET ( CPACK_PACKAGE_VERSION_MINOR "22" ) SET ( CPACK_PACKAGE_VERSION_PATCH "0" ) SET ( CPACK_STRIP_FILES "src/tuxanci" ) SET(CPACK_SOURCE_IGNORE_FILES ".git" + "build/" "packaging/" "tuxanci.1" ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 468a0f9..fed8130 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,16 +4,16 @@ # LINKING ( for binary ) ############################################################################### IF ( WITH_SERVER ) - LINK_LIBRARIES ( ${ZIP_LIBRARY} ${CMAKE_DL_LIBS} ) + LINK_LIBRARIES ( ${ZIP_LIBRARIES} ${CMAKE_DL_LIBS} ) ELSE ( WITH_SERVER ) IF ( WITH_OPENGL ) LINK_LIBRARIES ( ${OPENGL_LIBRARIES} ) ENDIF ( WITH_OPENGL ) IF ( WITH_AUDIO ) - LINK_LIBRARIES ( ${ZIP_LIBRARY} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} + LINK_LIBRARIES ( ${ZIP_LIBRARIES} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ${SDLMIXER_LIBRARY} ) ELSE ( WITH_AUDIO ) - LINK_LIBRARIES ( ${ZIP_LIBRARY} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} + LINK_LIBRARIES ( ${ZIP_LIBRARIES} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ) ENDIF ( WITH_AUDIO ) LINK_LIBRARIES ( ${FONTCONFIG_LIBRARIES} SDLmain ) |