From 8e3b19e0dc9c548a434ad69870d28ff2336ed4ba Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 28 Jan 2007 21:21:54 +0000 Subject: -temporarily build all tests unconditionally, otherwise the build breaks for cmake < 2.4.5 and we can't raise the required version number of cmake without announcing it some time before or at least after doing it and that only for a bit more convenience Thiago: can you please revert your commit which removed the IF(KDE4_BUILD_TESTS) ? Thanks Alex svn path=/trunk/KDE/kdelibs/; revision=628024 --- modules/KDE4Macros.cmake | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'modules') diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 7343e276..7bcf38fa 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -673,20 +673,22 @@ endmacro (KDE4_ADD_KDEINIT_EXECUTABLE) macro (KDE4_ADD_TEST _target_NAME) - MATH(EXPR cmake_version "${CMAKE_MAJOR_VERSION} * 10000 + ${CMAKE_MINOR_VERSION} * 100 + ${CMAKE_PATCH_VERSION}") + message(STATUS "temporarily compiling test ${_target_NAME} unconditionally, will be fixed soon") + + math(EXPR cmake_version "${CMAKE_MAJOR_VERSION} * 10000 + ${CMAKE_MINOR_VERSION} * 100 + ${CMAKE_PATCH_VERSION}") set(_add_executable_param) - set(_go) - if (KDE4_BUILD_TESTS) - set(_go TRUE) - else (KDE4_BUILD_TESTS) +# set(_go) +# if (KDE4_BUILD_TESTS) +# set(_go TRUE) +# else (KDE4_BUILD_TESTS) if (cmake_version GREATER 20403) - set(_go TRUE) +# set(_go TRUE) set(_add_executable_param EXCLUDE_FROM_ALL) endif (cmake_version GREATER 20403) - endif (KDE4_BUILD_TESTS) +# endif (KDE4_BUILD_TESTS) - if (_go) +# if (_go) kde4_get_automoc_files(_automoc_FILES ${ARGN}) add_executable(${_target_NAME} ${_add_executable_param} ${ARGN} ${_automoc_FILES}) @@ -701,7 +703,8 @@ macro (KDE4_ADD_TEST _target_NAME) target_link_libraries(${_target_NAME} ${QT_QTMAIN_LIBRARY}) endif (WIN32) - endif (_go) +# endif (_go) + endmacro (KDE4_ADD_TEST) -- cgit v1.2.1