mirror of
https://github.com/qgis/QGIS.git
synced 2025-03-02 00:02:12 -05:00
Merge pull request #117 from dakcarto/master
Fix for source or build directory paths that contain spaces (on Mac).
This commit is contained in:
commit
0358ddcaaf
@ -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
|
||||
|
@ -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@")
|
||||
|
||||
|
@ -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@)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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")
|
||||
|
||||
#
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user