mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-13 00:03:09 -04:00
add analysis lib (r11552, r11554, r11557, r11558);some export defs cleanup;fix empty osx_archs error in python config;fix georef plugin name;misc cleanup
git-svn-id: http://svn.osgeo.org/qgis/trunk@11569 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
a4631852f9
commit
3bb542ee60
File diff suppressed because it is too large
Load Diff
@ -186,9 +186,10 @@ GCC_VERSION_leo = 4.0
|
||||
GCC_VERSION_snow = 4.2
|
||||
GCC_VERSION = $(GCC_VERSION_$(SDKSYS))
|
||||
|
||||
GCC_PREPROCESSOR_DEFINITIONS = CORE_EXPORT= GUI_EXPORT= PYTHON_EXPORT= $(DEFS_$(CONFIGURATION))
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(DEFS_$(CONFIGURATION)) $(DEFS_EXPORT)
|
||||
DEFS_Debug = QGISDEBUG=1
|
||||
DEFS_Release = NDEBUG
|
||||
DEFS_EXPORT = CORE_EXPORT= GUI_EXPORT= PYTHON_EXPORT= ANALYSIS_EXPORT=
|
||||
|
||||
// use full flags instead of Xcode includes and defs,
|
||||
// since these are needed in scripts also
|
||||
|
@ -15,7 +15,7 @@ if sys.platform == 'darwin':
|
||||
qt_libs.append("QtSql")
|
||||
# possibility of universal build of bindings, if more than 1 arch
|
||||
osx_archs = '@CMAKE_OSX_ARCHITECTURES@'
|
||||
if osx_archs [-1] == ';' :
|
||||
if osx_archs and osx_archs [-1] == ';' :
|
||||
osx_archs = osx_archs [:-1]
|
||||
if osx_archs.count(';') > 0:
|
||||
osx_universal = '@CMAKE_OSX_SYSROOT@'
|
||||
|
Loading…
x
Reference in New Issue
Block a user