Skip to content

Commit 0358ddc

Browse files
committed
Merge pull request #117 from dakcarto/master
Fix for source or build directory paths that contain spaces (on Mac).
2 parents a65ded0 + 27fe004 commit 0358ddc

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

mac/cmake/0qgis.cmake.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# kill boolean warnings
77
CMAKE_POLICY (SET CMP0012 NEW)
88

9-
INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
10-
INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
9+
INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
10+
INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
1111

1212
# assume all install_names start with CMAKE_INSTALL_NAME_DIR
1313
# so we don't have to extract it from binaries

mac/cmake/1osg.cmake.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CMAKE_POLICY (SET CMP0012 NEW)
88

99
IF (@OSGEARTH_FOUND@)
1010

11-
INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
12-
INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
11+
INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
12+
INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
1313

1414
SET (OSG_PLUGINS_PATH "@OSG_PLUGINS_PATH@")
1515

mac/cmake/1qt.cmake.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# kill boolean warnings
77
CMAKE_POLICY (SET CMP0012 NEW)
88

9-
INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
10-
INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
9+
INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
10+
INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
1111

1212
# Qt framework version is major version
1313
SET (QT_FWVER @QT_VERSION_MAJOR@)

mac/cmake/2lib.cmake.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# kill boolean warnings
1111
CMAKE_POLICY (SET CMP0012 NEW)
1212

13-
INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
14-
INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
13+
INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
14+
INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
1515

1616
# Postgres
1717

mac/cmake/3fw.cmake.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ MESSAGE (STATUS "Bundling other frameworks is not functional yet, skipping...")
88
# kill boolean warnings
99
CMAKE_POLICY (SET CMP0012 NEW)
1010

11-
INCLUDE (@CMAKE_BINARY_DIR@/mac/0vars.cmake)
12-
INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake)
11+
INCLUDE ("@CMAKE_BINARY_DIR@/mac/0vars.cmake")
12+
INCLUDE ("@CMAKE_SOURCE_DIR@/cmake/MacBundleMacros.cmake")
1313

1414
#
1515

0 commit comments

Comments
 (0)