# HG changeset patch # User sheepluva # Date 1316468960 -7200 # Node ID a0f38ad66163bc3eef30a8362af0e84897e46842 # Parent e529b28d10e93e6c1cbe23175e51b7f10993358b# Parent c24fdd9a045835fabfba53c112037228c5f37a55 also merge 0.9.16 in to make koda happy diff -r e529b28d10e9 -r a0f38ad66163 .hgtags --- a/.hgtags Mon Sep 19 23:25:13 2011 +0200 +++ b/.hgtags Mon Sep 19 23:49:20 2011 +0200 @@ -44,3 +44,4 @@ 0000000000000000000000000000000000000000 0.9.9.1 718f98a9df122d73f3ba9add4d1654865199de31 Hedgewars-iOS-1.3 cba92708277b6d0aeabfff2b878845b7d848bdcd Hedgewars-iOS-1.3.1 +74bc72746bec68806344f4ba7be0d1bc6e05d380 0.9.16-release diff -r e529b28d10e9 -r a0f38ad66163 QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Mon Sep 19 23:25:13 2011 +0200 +++ b/QTfrontend/CMakeLists.txt Mon Sep 19 23:49:20 2011 +0200 @@ -1,5 +1,6 @@ # Configure for Qt4 set(QT_MIN_VERSION "4.5.0") +include(CheckLibraryExists) set(QT_USE_QTCORE TRUE) set(QT_USE_QTGUI TRUE) diff -r e529b28d10e9 -r a0f38ad66163 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Mon Sep 19 23:25:13 2011 +0200 +++ b/hedgewars/CMakeLists.txt Mon Sep 19 23:49:20 2011 +0200 @@ -152,6 +152,9 @@ MAIN_DEPENDENCY ${hwengine_project} DEPENDS ${engine_sources} ) + + add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars") + add_dependencies(${engine_output_name} ENGINECLEAN) ELSE() #let's build sdlmain, which is absent from the framework find_package(SDL REQUIRED) @@ -183,8 +186,6 @@ add_custom_target(${engine_output_name} ALL DEPENDS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}") -add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars") -add_dependencies(${engine_output_name} ENGINECLEAN) install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})