Merge pull request #5082 from nyalldawson/cmp0005

Remove use of old CMP0005 CMake policy
qgis · Aug 29, 2017 · c3a737b · c3a737b
2 parents 9ac511d + 9b2e60e
commit c3a737b
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -581,7 +581,6 @@ IF (WITH_CORE)
   #hoops to escape compiler directives then
   IF(COMMAND cmake_policy)
     cmake_policy(SET CMP0003 NEW)
-    cmake_policy(SET CMP0005 OLD)
     IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
       cmake_policy(SET CMP0063 NEW)
     ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")

diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake
@@ -107,7 +107,7 @@ ELSE(WIN32)
         #      MESSAGE("DBG  GSL_LINK_DIRECTORIES=${GSL_LINK_DIRECTORIES}")
         #      MESSAGE("DBG  GSL_EXE_LINKER_FLAGS=${GSL_EXE_LINKER_FLAGS}")
 
-        #      ADD_DEFINITIONS("-DHAVE_GSL")
+        #      ADD_DEFINITIONS(-DHAVE_GSL)
         #      SET(GSL_DEFINITIONS "-DHAVE_GSL")
         MARK_AS_ADVANCED(
             GSL_CXX_FLAGS

diff --git a/python/ext-libs/pyspatialite/CMakeLists.txt b/python/ext-libs/pyspatialite/CMakeLists.txt
@@ -26,7 +26,7 @@ ELSE(MSVC)
   SET_SOURCE_FILES_PROPERTIES(${PYSPATIALITE_SRC} PROPERTIES COMPILE_FLAGS -w)
 ENDIF(MSVC)
 
-ADD_DEFINITIONS(-DMODULE_NAME=\\\"spatialite.dbapi2\\\")
+ADD_DEFINITIONS(-DMODULE_NAME="spatialite.dbapi2")
 
 IF (CYGWIN OR APPLE)
   ADD_LIBRARY(pyspatialite MODULE ${PYSPATIALITE_SRC})

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1126,13 +1126,13 @@ INCLUDE_DIRECTORIES(SYSTEM
 
 #for PAL classes
 IF (WIN32)
-    ADD_DEFINITIONS("-D_HAVE_WINDOWS_H_")
+    ADD_DEFINITIONS(-D_HAVE_WINDOWS_H_)
 ELSE (WIN32)
-    ADD_DEFINITIONS("-D_HAVE_PTHREAD_")
+    ADD_DEFINITIONS(-D_HAVE_PTHREAD_)
 ENDIF (WIN32)
 
 # Test data dir for QgsRenderChecker
-ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
+ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
 
 #############################################################
 # qgis_core library

diff --git a/src/plugins/globe/CMakeLists.txt b/src/plugins/globe/CMakeLists.txt
@@ -43,9 +43,9 @@ SET (GLOBE_PLUGIN_RCCS  globe_plugin.qrc)
 # Build
 
 IF(WIN32)
-    ADD_DEFINITIONS("\"-DGLOBE_EXPORT=${DLLEXPORT}\"")
+    ADD_DEFINITIONS(-DGLOBE_EXPORT=${DLLEXPORT})
 ELSE(WIN32)
-    ADD_DEFINITIONS("-DGLOBE_EXPORT=")
+    ADD_DEFINITIONS(-DGLOBE_EXPORT=)
 ENDIF(WIN32)
 
 QT5_WRAP_UI (GLOBE_PLUGIN_UIS_H  ${GLOBE_PLUGIN_UIS})

diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -1,7 +1,7 @@
 ADD_SUBDIRECTORY(modules)
 ADD_SUBDIRECTORY(scripts)
 
-#ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
+#ADD_DEFINITIONS(-DGRASS_BASE="${GRASS_PREFIX}")
 if (HAVE_OPENPTY)
   ADD_DEFINITIONS(-DHAVE_OPENPTY)
 ENDIF (HAVE_OPENPTY)
@@ -13,7 +13,7 @@ ELSE (WIN32)
 ENDIF (WIN32)
 
 # GRASS Direct disabled in 2.0
-#ADD_DEFINITIONS("-DGRASS_DIRECT")
+#ADD_DEFINITIONS(-DGRASS_DIRECT)
 
 ########################################################
 # Files
@@ -133,10 +133,10 @@ IF(NOT WIN32)
 
 
   SET(KB_LAYOUT_DIR "${QGIS_DATA_DIR}/grass/qtermwidget/kb-layouts")
-  ADD_DEFINITIONS(-DKB_LAYOUT_DIR=\\\"${CMAKE_INSTALL_PREFIX}/${KB_LAYOUT_DIR}\\\")
+  ADD_DEFINITIONS(-DKB_LAYOUT_DIR="${CMAKE_INSTALL_PREFIX}/${KB_LAYOUT_DIR}")
 
   SET(COLORSCHEMES_DIR "${QGIS_DATA_DIR}/grass/qtermwidget/color-schemes")
-  ADD_DEFINITIONS(-DCOLORSCHEMES_DIR=\\\"${CMAKE_INSTALL_PREFIX}/${COLORSCHEMES_DIR}\\\")
+  ADD_DEFINITIONS(-DCOLORSCHEMES_DIR="${CMAKE_INSTALL_PREFIX}/${COLORSCHEMES_DIR}")
 
 ENDIF(NOT WIN32)
 

diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -1,4 +1,4 @@
-#ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
+#ADD_DEFINITIONS(-DGRASS_BASE="${GRASS_PREFIX}")
 ########################################################
 # Build
 

diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt
@@ -5,15 +5,15 @@ IF (ENABLE_TESTS)
   # This define is used for tests that need to locate the test
   # data under tests/testdata in the qgis source tree.
   # the TEST_DATA_DIR variable is set in the top level CMakeLists.txt
-  ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
+  ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
 
-  ADD_DEFINITIONS(-DINSTALL_PREFIX="\\"${CMAKE_INSTALL_PREFIX}\\"")
+  ADD_DEFINITIONS(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
 
   # libraries
   # enable postgresql tests
   SET (ENABLE_PGTEST FALSE CACHE BOOL "Enable PostgreSQL provider tests")
   IF ( ENABLE_PGTEST )
-    ADD_DEFINITIONS( "-DENABLE_PGTEST" )
+    ADD_DEFINITIONS(-DENABLE_PGTEST)
   ENDIF ()
 
   # because of htonl

diff --git a/tests/src/native/CMakeLists.txt b/tests/src/native/CMakeLists.txt
@@ -28,9 +28,9 @@ ENDIF(APPLE)
 # This define is used for tests that need to locate the test
 # data under tests/testdata in the qgis source tree.
 # the TEST_DATA_DIR variable is set in the top level CMakeLists.txt
-ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
+ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
 
-ADD_DEFINITIONS(-DINSTALL_PREFIX="\\"${CMAKE_INSTALL_PREFIX}\\"")
+ADD_DEFINITIONS(-DINSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
 
 #############################################################
 # libraries

diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt
@@ -59,7 +59,7 @@ ADD_QGIS_TEST(wcsprovidertest testqgswcsprovider.cpp)
 # Temporarily set to old version until server is reconfigured
 #SET(TEST_SERVER_URL "http://wcs.qgis.org/${COMPLETE_VERSION}")
 SET(TEST_SERVER_URL "http://wcs.qgis.org/1.9.0")
-#ADD_DEFINITIONS(-DTEST_SERVER_URL="\\"${TEST_SERVER_URL}\\"")
+#ADD_DEFINITIONS(-DTEST_SERVER_URL="${TEST_SERVER_URL}")
 SET_TARGET_PROPERTIES(qgis_wcsprovidertest PROPERTIES
   COMPILE_FLAGS "-DTEST_SERVER_URL=\\\"${TEST_SERVER_URL}\\\""
 )