# HG changeset patch # User nemo # Date 1316540272 14400 # Node ID 94abd65e7d4f30235e8d4e27f2f67cb484a1eeaf # Parent add1cae1add6f8a6e41df6737d5950b36d902071 Revert koda's c24fdd9a0458 until it stops breaking my builds :-p diff -r add1cae1add6 -r 94abd65e7d4f QTfrontend/CMakeLists.txt --- a/QTfrontend/CMakeLists.txt Tue Sep 20 13:27:07 2011 -0400 +++ b/QTfrontend/CMakeLists.txt Tue Sep 20 13:37:52 2011 -0400 @@ -1,6 +1,5 @@ # Configure for Qt4 set(QT_MIN_VERSION "4.5.0") -include(CheckLibraryExists) set(QT_USE_QTCORE TRUE) set(QT_USE_QTGUI TRUE) diff -r add1cae1add6 -r 94abd65e7d4f hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Tue Sep 20 13:27:07 2011 -0400 +++ b/hedgewars/CMakeLists.txt Tue Sep 20 13:37:52 2011 -0400 @@ -152,9 +152,6 @@ 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) @@ -186,6 +183,8 @@ 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})