Skip to content

Commit 9b2e60e

Browse files
nyalldawsonnyalldawson
committedAug 29, 2017
Remove use of old CMP0005 CMake policy
Since it's deprecated on newer CMake versions
·
ltr-3_40final-3_0_0
1 parent 9171da6 commit 9b2e60e

File tree

10 files changed

+18
-19
lines changed

10 files changed

+18
-19
lines changed
 

‎CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,6 @@ IF (WITH_CORE)
581581
#hoops to escape compiler directives then
582582
IF(COMMAND cmake_policy)
583583
cmake_policy(SET CMP0003 NEW)
584-
cmake_policy(SET CMP0005 OLD)
585584
IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
586585
cmake_policy(SET CMP0063 NEW)
587586
ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")

‎cmake/FindGSL.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ ELSE(WIN32)
107107
# MESSAGE("DBG GSL_LINK_DIRECTORIES=${GSL_LINK_DIRECTORIES}")
108108
# MESSAGE("DBG GSL_EXE_LINKER_FLAGS=${GSL_EXE_LINKER_FLAGS}")
109109

110-
# ADD_DEFINITIONS("-DHAVE_GSL")
110+
# ADD_DEFINITIONS(-DHAVE_GSL)
111111
# SET(GSL_DEFINITIONS "-DHAVE_GSL")
112112
MARK_AS_ADVANCED(
113113
GSL_CXX_FLAGS

‎python/ext-libs/pyspatialite/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ELSE(MSVC)
2626
SET_SOURCE_FILES_PROPERTIES(${PYSPATIALITE_SRC} PROPERTIES COMPILE_FLAGS -w)
2727
ENDIF(MSVC)
2828

29-
ADD_DEFINITIONS(-DMODULE_NAME=\\\"spatialite.dbapi2\\\")
29+
ADD_DEFINITIONS(-DMODULE_NAME="spatialite.dbapi2")
3030

3131
IF (CYGWIN OR APPLE)
3232
ADD_LIBRARY(pyspatialite MODULE ${PYSPATIALITE_SRC})

‎src/core/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,13 +1126,13 @@ INCLUDE_DIRECTORIES(SYSTEM
11261126

11271127
#for PAL classes
11281128
IF (WIN32)
1129-
ADD_DEFINITIONS("-D_HAVE_WINDOWS_H_")
1129+
ADD_DEFINITIONS(-D_HAVE_WINDOWS_H_)
11301130
ELSE (WIN32)
1131-
ADD_DEFINITIONS("-D_HAVE_PTHREAD_")
1131+
ADD_DEFINITIONS(-D_HAVE_PTHREAD_)
11321132
ENDIF (WIN32)
11331133

11341134
# Test data dir for QgsRenderChecker
1135-
ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
1135+
ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
11361136

11371137
#############################################################
11381138
# qgis_core library

‎src/plugins/globe/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ SET (GLOBE_PLUGIN_RCCS globe_plugin.qrc)
4343
# Build
4444

4545
IF(WIN32)
46-
ADD_DEFINITIONS("\"-DGLOBE_EXPORT=${DLLEXPORT}\"")
46+
ADD_DEFINITIONS(-DGLOBE_EXPORT=${DLLEXPORT})
4747
ELSE(WIN32)
48-
ADD_DEFINITIONS("-DGLOBE_EXPORT=")
48+
ADD_DEFINITIONS(-DGLOBE_EXPORT=)
4949
ENDIF(WIN32)
5050

5151
QT5_WRAP_UI (GLOBE_PLUGIN_UIS_H ${GLOBE_PLUGIN_UIS})

‎src/plugins/grass/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ADD_SUBDIRECTORY(modules)
22
ADD_SUBDIRECTORY(scripts)
33

4-
#ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
4+
#ADD_DEFINITIONS(-DGRASS_BASE="${GRASS_PREFIX}")
55
if (HAVE_OPENPTY)
66
ADD_DEFINITIONS(-DHAVE_OPENPTY)
77
ENDIF (HAVE_OPENPTY)
@@ -13,7 +13,7 @@ ELSE (WIN32)
1313
ENDIF (WIN32)
1414

1515
# GRASS Direct disabled in 2.0
16-
#ADD_DEFINITIONS("-DGRASS_DIRECT")
16+
#ADD_DEFINITIONS(-DGRASS_DIRECT)
1717

1818
########################################################
1919
# Files
@@ -133,10 +133,10 @@ IF(NOT WIN32)
133133

134134

135135
SET(KB_LAYOUT_DIR "${QGIS_DATA_DIR}/grass/qtermwidget/kb-layouts")
136-
ADD_DEFINITIONS(-DKB_LAYOUT_DIR=\\\"${CMAKE_INSTALL_PREFIX}/${KB_LAYOUT_DIR}\\\")
136+
ADD_DEFINITIONS(-DKB_LAYOUT_DIR="${CMAKE_INSTALL_PREFIX}/${KB_LAYOUT_DIR}")
137137

138138
SET(COLORSCHEMES_DIR "${QGIS_DATA_DIR}/grass/qtermwidget/color-schemes")
139-
ADD_DEFINITIONS(-DCOLORSCHEMES_DIR=\\\"${CMAKE_INSTALL_PREFIX}/${COLORSCHEMES_DIR}\\\")
139+
ADD_DEFINITIONS(-DCOLORSCHEMES_DIR="${CMAKE_INSTALL_PREFIX}/${COLORSCHEMES_DIR}")
140140

141141
ENDIF(NOT WIN32)
142142

‎src/providers/grass/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
1+
#ADD_DEFINITIONS(-DGRASS_BASE="${GRASS_PREFIX}")
22
########################################################
33
# Build
44

‎tests/src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ IF (ENABLE_TESTS)
55
# This define is used for tests that need to locate the test
66
# data under tests/testdata in the qgis source tree.
77
# the TEST_DATA_DIR variable is set in the top level CMakeLists.txt
8-
ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
8+
ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
99

10-
ADD_DEFINITIONS(-DINSTALL_PREFIX="\\"${CMAKE_INSTALL_PREFIX}\\"")
10+
ADD_DEFINITIONS(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
1111

1212
# libraries
1313
# enable postgresql tests
1414
SET (ENABLE_PGTEST FALSE CACHE BOOL "Enable PostgreSQL provider tests")
1515
IF ( ENABLE_PGTEST )
16-
ADD_DEFINITIONS( "-DENABLE_PGTEST" )
16+
ADD_DEFINITIONS(-DENABLE_PGTEST)
1717
ENDIF ()
1818

1919
# because of htonl

‎tests/src/native/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ ENDIF(APPLE)
2828
# This define is used for tests that need to locate the test
2929
# data under tests/testdata in the qgis source tree.
3030
# the TEST_DATA_DIR variable is set in the top level CMakeLists.txt
31-
ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
31+
ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
3232

33-
ADD_DEFINITIONS(-DINSTALL_PREFIX="\\"${CMAKE_INSTALL_PREFIX}\\"")
33+
ADD_DEFINITIONS(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
3434

3535
#############################################################
3636
# libraries

‎tests/src/providers/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ ADD_QGIS_TEST(wcsprovidertest testqgswcsprovider.cpp)
5959
# Temporarily set to old version until server is reconfigured
6060
#SET(TEST_SERVER_URL "http://wcs.qgis.org/${COMPLETE_VERSION}")
6161
SET(TEST_SERVER_URL "http://wcs.qgis.org/1.9.0")
62-
#ADD_DEFINITIONS(-DTEST_SERVER_URL="\\"${TEST_SERVER_URL}\\"")
62+
#ADD_DEFINITIONS(-DTEST_SERVER_URL="${TEST_SERVER_URL}")
6363
SET_TARGET_PROPERTIES(qgis_wcsprovidertest PROPERTIES
6464
COMPILE_FLAGS "-DTEST_SERVER_URL=\\\"${TEST_SERVER_URL}\\\""
6565
)

0 commit comments

Comments
 (0)
Please sign in to comment.