File: cmake-policy.diff

package info (click to toggle)
kdepimlibs 4:4.14.10-11
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 35,856 kB
  • sloc: cpp: 269,391; xml: 4,188; ansic: 2,946; yacc: 1,904; perl: 381; ruby: 60; sh: 60; makefile: 13
file content (41 lines) | stat: -rw-r--r-- 1,454 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
Author: Pino Toscano <pino@debian.org>
Description: Update cmake version & policy.
 Set cmake_mininum_required to match kdelibs policy and enable newer cmake
 policies.
 .
 Also fix add_definitions according to new policy.
Forwarded: not-needed
Last-Update: 2016-06-18

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(kdepimlibs)
 
+cmake_minimum_required(VERSION 2.8.9)
+
 # where to look first for cmake modules. This line must be the first one or cmake will use the system's FindFoo.cmake
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 
--- a/akonadi/calendar/tests/CMakeLists.txt
+++ b/akonadi/calendar/tests/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories( ${CMAKE_BINARY_DIR}
                      ${CMAKE_BINARY_DIR}/akonadi/kmime
                      ${CMAKE_BINARY_DIR}/mailtransport )
 
-add_definitions(-DITIP_DATA_DIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/itip_data\\"" )
+add_definitions(-DITIP_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/itip_data" )
 
 set(common_sources unittestbase.cpp helper.cpp ../utils_p.cpp)
 
--- a/kcal/tests/CMakeLists.txt
+++ b/kcal/tests/CMakeLists.txt
@@ -77,7 +77,7 @@ endif()
 ########### next target ###############
 set(testfields_SRCS testfields.cpp)
 set(srcfile "${CMAKE_SOURCE_DIR}/kcal/tests/data/test_pilot.ics")
-add_definitions( -D_TESTINPUT="\\"${srcfile}\\"" )
+add_definitions( -D_TESTINPUT="${srcfile}" )
 
 kde4_add_executable(testfields TEST ${testfields_SRCS})