Skip to content

Commit ffc9eb5

Browse files
author
kyngchaos
committed
fix some missing lib paths, install instructions cleanup
git-svn-id: http://svn.osgeo.org/qgis/trunk@12787 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent f84f71e commit ffc9eb5

File tree

4 files changed

+39
-8
lines changed

4 files changed

+39
-8
lines changed

INSTALL

+13-2
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,7 @@ add symlinks to /usr/local:
525525

526526
These should then be found automatically on Leopard and above. Earlier systems
527527
may need some help by adding '-L/usr/local/lib' to CMAKE_SHARED_LINKER_FLAGS,
528-
CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build, or
529-
adding '/usr/local/lib' to LIBRARY_SEARCH_PATHS in the Xcode build.
528+
CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.
530529

531530

532531
4.3. Install development frameworks for QGIS dependencies
@@ -678,6 +677,17 @@ and (this installs by default into the Python framework, and is appropriate only
678677
export QTDIR=/Developer/Applications/Qt
679678
python configure.py
680679
yes
680+
681+
682+
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:
683+
684+
685+
'qt_dir': '/usr',
686+
687+
688+
Then continue with compilation and installation:
689+
690+
681691
make
682692
sudo make install
683693

@@ -749,6 +759,7 @@ minor.point version, and it may be an SVN version). Remember this for QGIS and
749759
Now for PyQwt. Still in the Terminal:
750760

751761

762+
cd ../configure
752763
python configure.py --extra-include-dirs=/usr/local/qwt-5.2.1-svn/include \
753764
--extra-lib-dirs=/usr/local/qwt-5.2.1-svn/lib --extra-libs=qwt
754765
make

doc/INSTALL.t2t

+13-2
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,7 @@ sudo ln -s /usr/lib/libQtCLucene.dylib /usr/local/lib/
417417

418418
These should then be found automatically on Leopard and above. Earlier systems
419419
may need some help by adding '-L/usr/local/lib' to CMAKE_SHARED_LINKER_FLAGS,
420-
CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build, or
421-
adding '/usr/local/lib' to LIBRARY_SEARCH_PATHS in the Xcode build.
420+
CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.
422421

423422

424423
== Install development frameworks for QGIS dependencies ==
@@ -562,6 +561,17 @@ and (this installs by default into the Python framework, and is appropriate only
562561
export QTDIR=/Developer/Applications/Qt
563562
python configure.py
564563
yes
564+
```
565+
566+
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:
567+
568+
```
569+
'qt_dir': '/usr',
570+
```
571+
572+
Then continue with compilation and installation:
573+
574+
```
565575
make
566576
sudo make install
567577
```
@@ -632,6 +642,7 @@ minor.point version, and it may be an SVN version). Remember this for QGIS and
632642
Now for PyQwt. Still in the Terminal:
633643

634644
```
645+
cd ../configure
635646
python configure.py --extra-include-dirs=/usr/local/qwt-5.2.1-svn/include \
636647
--extra-lib-dirs=/usr/local/qwt-5.2.1-svn/lib --extra-libs=qwt
637648
make

mac/xcode/qgis_settings.xcconfig

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// QGIS Xcode project common build settings
22

3-
CURRENT_PROJECT_VERSION = 2.5.0
3+
CURRENT_PROJECT_VERSION = 2.5.1
44

55
// SDKSYS must be set to valid value
66
SDKSYS = leo // tig (Tiger), leo (Leopard), snow (Snow Leopard)
@@ -32,6 +32,11 @@ QT_VER_MAJOR = 4 // the install_name/major version
3232
QT_VER_MINOR = 5 // minor version
3333
QT_FWVER = $(QT_VER_MAJOR) // the Versions/ folder name, normally same as Qt ver
3434

35+
QT_DIR = /usr
36+
// this is to enable Qt libs in /usr/lib (QtUiTools, QtCLucene) to work in SDKs
37+
// -> create symlinks to these libs in /usr/local/lib
38+
QT_DIR_SDK = /usr/local
39+
3540
QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
3641
QTBIN = /Developer/Tools/Qt
3742
QTMOC = $(QTBIN)/moc
@@ -176,7 +181,6 @@ QGIS_LIB_SUBDIR = lib // qgispython lib MUST be in MacOS/lib
176181
QGIS_DATA_SUBDIR = ../Resources
177182
QGIS_PLUGIN_SUBDIR = ../PlugIns/qgis
178183
HEADER_SEARCH_PATHS = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/include
179-
//LIBRARY_SEARCH_PATHS = $(PROJECT_TARGET_APP_DIR)/../Frameworks
180184
ALWAYS_SEARCH_USER_PATHS = NO
181185
USE_HEADERMAP = NO // else headers with same name cause confusion
182186

@@ -217,7 +221,7 @@ DEFS_EXPORT = CORE_EXPORT= GUI_EXPORT= PYTHON_EXPORT= ANALYSIS_EXPORT=
217221
// use full flags instead of Xcode includes and defs,
218222
// since these are needed in scripts also
219223
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
220-
QT_INC_UITOOLS = /usr/include/QtUiTools
224+
QT_INC_UITOOLS = $(QT_DIR)/include/QtUiTools
221225
QTDEFS_Debug = -DQT_DEBUG
222226
QTDEFS_Release = -DQT_NO_DEBUG
223227
QT_CXXFLAGS_APP = $(PGSQL_HAVE)
@@ -230,7 +234,7 @@ QT_LIB_SQL = -framework QtSql
230234
QT_LIB_WEBKIT = -framework QtWebKit
231235
QT_LIB_DBUS = -framework QtDBus
232236
QT_LIB_PHONON = -framework phonon
233-
QT_LIB_UITOOLS = -lQtUiTools
237+
QT_LIB_UITOOLS = -L$(QT_DIR_SDK)/lib -lQtUiTools
234238
// convenience for all Qt:
235239
QT_LIB = $(QT_LIB_CORE) $(QT_LIB_GUI) $(QT_LIB_NET) $(QT_LIB_XML) $(QT_LIB_SVG) $(QT_LIB_SQL)
236240
// list of Qt frameworks used

mac/xcode/qgis_user-template.xcconfig

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
//QT_VER_MINOR = 5 // minor version, currently unused
2626
//QT_FWVER = $(QT_VER_MAJOR) // the Versions/ folder name, normally same as Qt ver
2727

28+
//QT_DIR = /usr
29+
// this is to enable Qt libs in /usr/lib (QtUiTools, QtCLucene) to work in SDKs
30+
// -> create symlinks to these libs in /usr/local/lib
31+
//QT_DIR_SDK = /usr/local
32+
2833
//QT_PLUGINS_DIR = /Developer/Applications/Qt/plugins
2934
//QTBIN = /Developer/Tools/Qt // bin dir
3035
//SIP_INC = /usr/local/include

0 commit comments

Comments
 (0)