Merge pull request #117 from dakcarto/master

Fix for source or build directory paths that contain spaces (on Mac).
qgis · Apr 13, 2012 · 0358ddc · 0358ddc
2 parents a65ded0 + 27fe004
commit 0358ddc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/mac/cmake/0qgis.cmake.in b/mac/cmake/0qgis.cmake.in
@@ -6,8 +6,8 @@
 # kill boolean warnings
 CMAKE_POLICY (SET CMP0012 NEW)
 
-INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
-INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
+INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
+INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
 
 # assume all install_names start with CMAKE_INSTALL_NAME_DIR
 # so we don't have to extract it from binaries

diff --git a/mac/cmake/1osg.cmake.in b/mac/cmake/1osg.cmake.in
@@ -8,8 +8,8 @@ CMAKE_POLICY (SET CMP0012 NEW)
 
 IF (@OSGEARTH_FOUND@)
 
-INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
-INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
+INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
+INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
 
 SET (OSG_PLUGINS_PATH "@OSG_PLUGINS_PATH@")
 

diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -6,8 +6,8 @@
 # kill boolean warnings
 CMAKE_POLICY (SET CMP0012 NEW)
 
-INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
-INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
+INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
+INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
 
 # Qt framework version is major version
 SET (QT_FWVER @QT_VERSION_MAJOR@)

diff --git a/mac/cmake/2lib.cmake.in b/mac/cmake/2lib.cmake.in
@@ -10,8 +10,8 @@
 # kill boolean warnings
 CMAKE_POLICY (SET CMP0012 NEW)
 
-INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
-INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
+INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
+INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
 
 # Postgres
 

diff --git a/mac/cmake/3fw.cmake.in b/mac/cmake/3fw.cmake.in
@@ -8,8 +8,8 @@ MESSAGE (STATUS "Bundling other frameworks is not functional yet, skipping...")
 # kill boolean warnings
 CMAKE_POLICY (SET CMP0012 NEW)
 
-INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
-INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
+INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
+INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
 
 #