[QGIS Commit] r12787 - in trunk/qgis: . doc mac/xcode
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Jan 16 19:59:47 EST 2010
Author: kyngchaos
Date: 2010-01-16 19:59:46 -0500 (Sat, 16 Jan 2010)
New Revision: 12787
Modified:
trunk/qgis/INSTALL
trunk/qgis/doc/INSTALL.t2t
trunk/qgis/mac/xcode/qgis_settings.xcconfig
trunk/qgis/mac/xcode/qgis_user-template.xcconfig
Log:
fix some missing lib paths, install instructions cleanup
Modified: trunk/qgis/INSTALL
===================================================================
--- trunk/qgis/INSTALL 2010-01-16 21:09:22 UTC (rev 12786)
+++ trunk/qgis/INSTALL 2010-01-17 00:59:46 UTC (rev 12787)
@@ -525,8 +525,7 @@
These should then be found automatically on Leopard and above. Earlier systems
may need some help by adding '-L/usr/local/lib' to CMAKE_SHARED_LINKER_FLAGS,
-CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build, or
-adding '/usr/local/lib' to LIBRARY_SEARCH_PATHS in the Xcode build.
+CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.
4.3. Install development frameworks for QGIS dependencies
@@ -678,6 +677,17 @@
export QTDIR=/Developer/Applications/Qt
python configure.py
yes
+
+
+There is a problem with the configuration that needs to be fixed now (it affect PyQwt compilation later). Edit pyqtconfig.py and change the qt_dir line to:
+
+
+ 'qt_dir': '/usr',
+
+
+Then continue with compilation and installation:
+
+
make
sudo make install
@@ -749,6 +759,7 @@
Now for PyQwt. Still in the Terminal:
+ cd ../configure
python configure.py --extra-include-dirs=/usr/local/qwt-5.2.1-svn/include \
--extra-lib-dirs=/usr/local/qwt-5.2.1-svn/lib --extra-libs=qwt
make
Modified: trunk/qgis/doc/INSTALL.t2t
===================================================================
--- trunk/qgis/doc/INSTALL.t2t 2010-01-16 21:09:22 UTC (rev 12786)
+++ trunk/qgis/doc/INSTALL.t2t 2010-01-17 00:59:46 UTC (rev 12787)
@@ -417,8 +417,7 @@
These should then be found automatically on Leopard and above. Earlier systems
may need some help by adding '-L/usr/local/lib' to CMAKE_SHARED_LINKER_FLAGS,
-CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build, or
-adding '/usr/local/lib' to LIBRARY_SEARCH_PATHS in the Xcode build.
+CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.
== Install development frameworks for QGIS dependencies ==
@@ -562,6 +561,17 @@
export QTDIR=/Developer/Applications/Qt
python configure.py
yes
+```
+
+There is a problem with the configuration that needs to be fixed now (it affect PyQwt compilation later). Edit pyqtconfig.py and change the qt_dir line to:
+
+```
+ 'qt_dir': '/usr',
+```
+
+Then continue with compilation and installation:
+
+```
make
sudo make install
```
@@ -632,6 +642,7 @@
Now for PyQwt. Still in the Terminal:
```
+cd ../configure
python configure.py --extra-include-dirs=/usr/local/qwt-5.2.1-svn/include \
--extra-lib-dirs=/usr/local/qwt-5.2.1-svn/lib --extra-libs=qwt
make
Modified: trunk/qgis/mac/xcode/qgis_settings.xcconfig
===================================================================
--- trunk/qgis/mac/xcode/qgis_settings.xcconfig 2010-01-16 21:09:22 UTC (rev 12786)
+++ trunk/qgis/mac/xcode/qgis_settings.xcconfig 2010-01-17 00:59:46 UTC (rev 12787)
@@ -1,6 +1,6 @@
// QGIS Xcode project common build settings
-CURRENT_PROJECT_VERSION = 2.5.0
+CURRENT_PROJECT_VERSION = 2.5.1
// SDKSYS must be set to valid value
SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
@@ -32,6 +32,11 @@
QT_VER_MINOR = 5 // minor version
QT_FWVER = $(QT_VER_MAJOR) // the Versions/ folder name, normally same as Qt ver
+QT_DIR = /usr
+// this is to enable Qt libs in /usr/lib (QtUiTools, QtCLucene) to work in SDKs
+// -> create symlinks to these libs in /usr/local/lib
+QT_DIR_SDK = /usr/local
+
QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
QTBIN = /Developer/Tools/Qt
QTMOC = $(QTBIN)/moc
@@ -176,7 +181,6 @@
QGIS_DATA_SUBDIR = ../Resources
QGIS_PLUGIN_SUBDIR = ../PlugIns/qgis
HEADER_SEARCH_PATHS = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/include
-//LIBRARY_SEARCH_PATHS = $(PROJECT_TARGET_APP_DIR)/../Frameworks
ALWAYS_SEARCH_USER_PATHS = NO
USE_HEADERMAP = NO // else headers with same name cause confusion
@@ -217,7 +221,7 @@
// use full flags instead of Xcode includes and defs,
// since these are needed in scripts also
QT_CXXFLAGS = -DQT_DLL -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_SQL_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_NO_CAST_TO_ASCII $(QTDEFS_$(CONFIGURATION)) -I/Library/Frameworks/QtCore.framework/Headers -I/Library/Frameworks/QtGui.framework/Headers -I/Library/Frameworks/QtNetwork.framework/Headers -I/Library/Frameworks/QtSql.framework/Headers -I/Library/Frameworks/QtSvg.framework/Headers -I/Library/Frameworks/QtXml.framework/Headers -I/Library/Frameworks/QtWebKit.framework/Headers
-QT_INC_UITOOLS = /usr/include/QtUiTools
+QT_INC_UITOOLS = $(QT_DIR)/include/QtUiTools
QTDEFS_Debug = -DQT_DEBUG
QTDEFS_Release = -DQT_NO_DEBUG
QT_CXXFLAGS_APP = $(PGSQL_HAVE)
@@ -230,7 +234,7 @@
QT_LIB_WEBKIT = -framework QtWebKit
QT_LIB_DBUS = -framework QtDBus
QT_LIB_PHONON = -framework phonon
-QT_LIB_UITOOLS = -lQtUiTools
+QT_LIB_UITOOLS = -L$(QT_DIR_SDK)/lib -lQtUiTools
// convenience for all Qt:
QT_LIB = $(QT_LIB_CORE) $(QT_LIB_GUI) $(QT_LIB_NET) $(QT_LIB_XML) $(QT_LIB_SVG) $(QT_LIB_SQL)
// list of Qt frameworks used
Modified: trunk/qgis/mac/xcode/qgis_user-template.xcconfig
===================================================================
--- trunk/qgis/mac/xcode/qgis_user-template.xcconfig 2010-01-16 21:09:22 UTC (rev 12786)
+++ trunk/qgis/mac/xcode/qgis_user-template.xcconfig 2010-01-17 00:59:46 UTC (rev 12787)
@@ -25,6 +25,11 @@
//QT_VER_MINOR = 5 // minor version, currently unused
//QT_FWVER = $(QT_VER_MAJOR) // the Versions/ folder name, normally same as Qt ver
+//QT_DIR = /usr
+// this is to enable Qt libs in /usr/lib (QtUiTools, QtCLucene) to work in SDKs
+// -> create symlinks to these libs in /usr/local/lib
+//QT_DIR_SDK = /usr/local
+
//QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
//QTBIN = /Developer/Tools/Qt // bin dir
//SIP_INC = /usr/local/include
More information about the QGIS-commit
mailing list