From c31af9a2c15fa28df017c050373f3dd747999521 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Sun, 26 Jul 2015 11:08:11 +0200
Subject: [PATCH 10/47] Add min required cmake version; fix clashes on target
 names

CCMAIL: kde-buildsystem@kde.org
---
 CMakeLists.txt                |  1 +
 includes/tests/CMakeLists.txt | 12 ++++++------
 kimap/tests/CMakeLists.txt    |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46f143462..0840dfd0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 2.8.9)
 project(kdepimlibs)
 
 # where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
diff --git a/includes/tests/CMakeLists.txt b/includes/tests/CMakeLists.txt
index e4ee625d7..f314c6160 100644
--- a/includes/tests/CMakeLists.txt
+++ b/includes/tests/CMakeLists.txt
@@ -86,12 +86,12 @@ add_includes( Mailtransport )
 add_includes( Syndication )
 
 add_definitions( -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_KEYWORDS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_STRICT_ITERATORS )
-kde4_add_executable( headertest header_compile.cpp )
-target_link_libraries( headertest ${QT_QTCORE_LIBRARY} )
-add_dependencies( headertest akonadi-calendar ) # ensure calendarsettings.h is generated in parallel builds
-add_dependencies( headertest kabc ) # ensure addressee.h is generated in parallel builds
-add_dependencies( headertest kcal )
-add_dependencies( headertest mailtransport ) # ensure transportbase.h is generated in parallel builds
+kde4_add_executable( headercompiletest header_compile.cpp )
+target_link_libraries( headercompiletest ${QT_QTCORE_LIBRARY} )
+add_dependencies( headercompiletest akonadi-calendar ) # ensure calendarsettings.h is generated in parallel builds
+add_dependencies( headercompiletest kabc ) # ensure addressee.h is generated in parallel builds
+add_dependencies( headercompiletest kcal )
+add_dependencies( headercompiletest mailtransport ) # ensure transportbase.h is generated in parallel builds
 
 endif()
 
diff --git a/kimap/tests/CMakeLists.txt b/kimap/tests/CMakeLists.txt
index 9d2e7c15e..91f7339cf 100644
--- a/kimap/tests/CMakeLists.txt
+++ b/kimap/tests/CMakeLists.txt
@@ -11,11 +11,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 remove_definitions(-DQT_USE_QSTRINGBUILDER)
 MACRO(KIMAP_UNIT_TESTS)
   FOREACH(_testname ${ARGN})
-    kde4_add_unit_test(${_testname} TESTNAME kimap-${_testname} NOGUI ${_testname}.cpp)
+    kde4_add_unit_test(kimap-${_testname} TESTNAME kimap-${_testname} NOGUI ${_testname}.cpp)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-    target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}
+    target_link_libraries(kimap-${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}
                           kimap kimaptest kmime)
-    set_target_properties(${_testname} PROPERTIES COMPILE_FLAGS -DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
+    set_target_properties(kimap-${_testname} PROPERTIES COMPILE_FLAGS -DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
   ENDFOREACH(_testname)
 ENDMACRO(KIMAP_UNIT_TESTS)
 
-- 
2.14.1