Skip to content
Permalink
Browse files

Merge branch 'master' into delimiter_text_enhancement

  • Loading branch information
ccrook committed Apr 12, 2013
2 parents 920253d + a290fa2 commit 9a01c5306f4f621adf9ac452de6987e86320a19f
Showing 752 changed files with 14,456 additions and 30,091 deletions.
@@ -57,19 +57,16 @@ SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")

SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport")

SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")
IF (WITH_SPATIALITE)
SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
SET (WITH_QSPATIALITE FALSE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
IF(WITH_INTERNAL_SPATIALITE)
SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
SET(HAVE_SPATIALITE TRUE)
IF(WIN32 OR APPLE)
FIND_PACKAGE(Iconv REQUIRED)
ENDIF(WIN32 OR APPLE)
ENDIF (WITH_INTERNAL_SPATIALITE)
ENDIF (WITH_SPATIALITE)
SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
SET (WITH_QSPATIALITE FALSE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
IF(WITH_INTERNAL_SPATIALITE)
SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
SET(HAVE_SPATIALITE TRUE)
IF(WIN32 OR APPLE OR CYGWIN)
FIND_PACKAGE(Iconv REQUIRED)
ENDIF(WIN32 OR APPLE OR CYGWIN)
ENDIF (WITH_INTERNAL_SPATIALITE)

SET (WITH_ORACLE FALSE CACHE BOOL "Determines whether Oracle support should be built")
IF(WITH_ORACLE)
@@ -198,9 +195,9 @@ IF (WITH_POSTGRESQL)
FIND_PACKAGE(Postgres) # PostgreSQL provider, SPIT plugin
ENDIF (WITH_POSTGRESQL)

IF (WITH_SPATIALITE AND NOT WITH_INTERNAL_SPATIALITE)
IF (NOT WITH_INTERNAL_SPATIALITE)
FIND_PACKAGE(SPATIALITE)
ENDIF (WITH_SPATIALITE AND NOT WITH_INTERNAL_SPATIALITE)
ENDIF (NOT WITH_INTERNAL_SPATIALITE)

IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
MESSAGE (SEND_ERROR "Some dependencies were not found!")
@@ -670,8 +670,6 @@ INPUT = doc \
src/core/diagram \
src/core/composer \
src/core/raster \
src/core/renderer \
src/core/symbology \
src/core/symbology-ng \
src/core/gps \
src/gui \
57 INSTALL
@@ -1,9 +1,9 @@
Quantum GIS (QGIS)
Building QGIS from source - step by step
Tuesday April 02, 2013
Sunday April 07, 2013


Last Updated: Tuesday April 02, 2013
Last Updated: Sunday April 07, 2013
Last Change : Saturday December 08, 2012


@@ -103,7 +103,7 @@ Required build deps:
- GEOS >= 3.0
- Sqlite3 >= 3.0.0
- GDAL/OGR >= 1.4.x
- Qwt >= 5.0
- Qwt >= 5.0 & (< 6.1 with internal QwtPolar)
- expat >= 1.95

Optional dependencies:
@@ -1633,61 +1633,28 @@ The GPS tracking feature uses Qwt.

NOTE: PyQwt is not compatible with PyQt 4.9, so we will skip that.

Download the latest Qwt 5.x or 6.x source from:
Download the latest Qwt 6.0 source (6.1 does not work with the QwtPolar in QGIS) from:

http://sourceforge.net/projects/qwt

Double-click the tarball to unpack it. Now, cd to the qwt source folder in a
Terminal.

Type these commands to build and install 5.x.x (assumes v5.2.2, adjust commands
Type these commands to build and install 6.0.x (assumes v6.0.2, adjust commands
for other version as needed):

cat >> qwtconfig.pri <<EOF
QWT_CONFIG -= QwtFramework
EOF
qmake -spec macx-g++
make -j [#cpus]
sudo make install

sudo install_name_tool -id /usr/local/qwt-5.2.2/lib/libqwt.5.dylib \
/usr/local/qwt-5.2.2/lib/libqwt.5.dylib

The Qwt shared library is now installed in /usr/local/qwt-5.x.x (x.x is
the minor.point version). Remember this for QGIS configuration.

Qwt 6.x.x is similarly built, but defaults to being installed as a framework:

cd <Qwt 6.x.x source directory>
qmake -spec macx-g++
make -j [#cpus]
sudo make install
sudo install_name_tool -id /usr/local/qwt-6.0.2/lib/libqwt.6.dylib \
/usr/local/qwt-6.0.2/lib/libqwt.6.dylib

TODO: Remedy for :

shrub:qwt-6.1-rc3 timlinux$ sudo make install
Password:
cd src/ && make -f Makefile install
rm -f -r "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
cp -f -R "../lib/qwt.framework" "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/html /usr/local/qwt-6.1.0-rc3/doc/
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/man /usr/local/qwt-6.1.0-rc3/doc/
cd textengines/ && make -f Makefile install
make[1]: Nothing to be done for `install'.
cd designer/ && make -f Makefile install
rm -f libqwt_designer_plugin.dylib
linking plugins/designer/libqwt_designer_plugin.dylib
ld: library not found for -lqwt
collect2: ld returned 1 exit status
make[1]: *** [plugins/designer/libqwt_designer_plugin.dylib] Error 1
make: *** [sub-designer-install_subtargets-ordered] Error 2

sudo install_name_tool -id /usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt \
/usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt

This installs to the following location

/usr/local/qwt-6.x.x/lib/qwt.framework/qwt
/usr/local/qwt-6.x.x/lib/qwt.framework/Headers

(x.x is the minor.point version). Remember these for QGIS configuration.
The Qwt shared library is now installed in /usr/local/qwt-6.0.x (x is
the point version). Remember this for QGIS configuration.


5.4.10. Additional dependencies: Bison
@@ -67,6 +67,10 @@ ELSE(WIN32)
ENDIF ()
ENDIF (APPLE)

IF(CYGWIN)
FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS /usr/lib /usr/local/lib)
ENDIF(CYGWIN)

IF (NOT GDAL_INCLUDE_DIR OR NOT GDAL_LIBRARY OR NOT GDAL_CONFIG)
# didn't find OS X framework, and was not set by user
SET(GDAL_CONFIG_PREFER_PATH "$ENV{GDAL_HOME}/bin" CACHE STRING "preferred path to GDAL (gdal-config)")
@@ -39,7 +39,6 @@ IF(WIN32)
ELSE(WIN32)

IF(UNIX)

# try to use framework on mac
# want clean framework path, not unix compatibility path
IF (APPLE)
@@ -69,6 +68,10 @@ ELSE(WIN32)
ENDIF ()
ENDIF (APPLE)

IF(CYGWIN)
FIND_LIBRARY(GEOS_LIBRARY NAMES geos_c PATHS /usr/lib /usr/local/lib)
ENDIF(CYGWIN)

IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
# didn't find OS X framework, and was not set by user
SET(GEOS_CONFIG_PREFER_PATH "$ENV{GEOS_HOME}/bin" CACHE STRING "preferred path to GEOS (geos-config)")
@@ -44,6 +44,7 @@ ENDMACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_

FIND_OSGEARTH_INCLUDE( OSGEARTH_GEN_INCLUDE_DIR osgEarth/Common )
FIND_OSGEARTH_INCLUDE( OSGEARTH_INCLUDE_DIR osgEarth/TileSource )
FIND_OSGEARTH_INCLUDE( OSGEARTH_ELEVATION_QUERY osgEarth/ElevationQuery )

###### libraries ######

@@ -64,7 +64,38 @@ ELSE(WIN32)
OUTPUT_VARIABLE PG_TMP)
IF (APPLE)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
ELSE (APPLE)
ELSEIF (CYGWIN)
EXEC_PROGRAM(${POSTGRES_CONFIG}
ARGS --libs
OUTPUT_VARIABLE PG_TMP)

STRING(REGEX MATCHALL "[-][L]([^ ;])+" _LDIRS "${PG_TMP}")
STRING(REGEX MATCHALL "[-][l]([^ ;])+" _LLIBS "${PG_TMP}")

FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq PATHS /usr/lib /usr/local/lib)

SET(_DIRS)
FOREACH(_DIR ${_LDIRS})
STRING(REPLACE "-L" "" _DIR ${_DIR})
SET(_DIRS ${_DIRS} ${_DIR})
ENDFOREACH(_DIR ${_LDIRS})

SET(_LIBS)
FOREACH(_LIB ${_LLIBS})
STRING(REPLACE "-l" "" _LIB ${_LIB})
SET(_LIBS ${_LIBS} ${_LIB})
ENDFOREACH(_LIB ${_LDIRS})

FOREACH(_LIBNAME ${_LIBS})
UNSET(PG_LIB CACHE)
FIND_LIBRARY(PG_LIB NAMES ${_LIBNAME} PATHS ${_DIRS} /usr/lib /usr/local/lib)
IF(NOT PG_LIB)
MESSAGE(FATAL "PostgreSQL dependency library ${_LIBNAME} not found")
ENDIF(NOT PG_LIB)
SET(POSTGRES_LIBRARY ${POSTGRES_LIBRARY} ${PG_LIB})
ENDFOREACH(_LIBNAME ${_LIBS})

ELSE (CYGWIN)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
ENDIF (APPLE)
ENDIF(POSTGRES_CONFIG)
@@ -15,7 +15,7 @@ IF(WIN32)
#MESSAGE("Searching for QGIS in $ENV{PROGRAMFILES}/Quantum GIS")
IF (MINGW)
FIND_PATH(QGIS_PLUGIN_DIR
NAMES libnortharrowplugin.dll
NAMES libdelimitedtextplugin.dll
PATHS
"$ENV{PROGRAMFILES}/Quantum GIS/plugins"
)
@@ -38,7 +38,7 @@ IF(WIN32)

IF (MSVC)
FIND_PATH(QGIS_PLUGIN_DIR
NAMES northarrowplugin.dll
NAMES delimitedtextplugin.dll
PATHS
"$ENV{OSGEO4W_ROOT}/apps/qgis/plugins"
"$ENV{PROGRAMFILES}/Quantum GIS/plugins"
@@ -82,7 +82,7 @@ ELSE(WIN32)
SET (QGIS_MAC_PATH /Applications/QGIS.app/Contents)
#MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
FIND_PATH(QGIS_PLUGIN_DIR
NAMES libnortharrowplugin.so
NAMES libdelimitedtextplugin.so
PATHS
/usr/lib64/qgis/plugins
/usr/lib/qgis
@@ -46,7 +46,6 @@ CMAKE_OPTS := \
-D CMAKE_INSTALL_PREFIX=/usr \
-D BINDINGS_GLOBAL_INSTALL=TRUE \
-D PEDANTIC=TRUE \
-D WITH_SPATIALITE=TRUE \
-D WITH_QSPATIALITE=TRUE \
-D WITH_MAPSERVER=TRUE \
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
@@ -77,12 +77,12 @@
<DIV CLASS="header" ID="header">
<H1>Quantum GIS (QGIS)</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Tuesday April 02, 2013</H3>
<H3>Sunday April 07, 2013</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Tuesday April 02, 2013
Last Updated: Sunday April 07, 2013
Last Change : Saturday December 08, 2012
</P>
<DIV CLASS="toc">
@@ -210,7 +210,7 @@ <H1>2. Overview</H1>
<LI>GEOS &gt;= 3.0
<LI>Sqlite3 &gt;= 3.0.0
<LI>GDAL/OGR &gt;= 1.4.x
<LI>Qwt &gt;= 5.0
<LI>Qwt &gt;= 5.0 &amp; (&lt; 6.1 with internal QwtPolar)
<LI>expat &gt;= 1.95
</UL>

@@ -2302,7 +2302,7 @@ <H3>5.4.9. Additional dependencies: Qwt</H3>
NOTE: PyQwt is not compatible with PyQt 4.9, so we will skip that.
</P>
<P>
Download the latest Qwt 5.x or 6.x source from:
Download the latest Qwt 6.0 source (6.1 does not work with the QwtPolar in QGIS) from:
</P>
<P>
<A HREF="http://sourceforge.net/projects/qwt">http://sourceforge.net/projects/qwt</A>
@@ -2312,71 +2312,25 @@ <H3>5.4.9. Additional dependencies: Qwt</H3>
Terminal.
</P>
<P>
Type these commands to build and install 5.x.x (assumes v5.2.2, adjust commands
Type these commands to build and install 6.0.x (assumes v6.0.2, adjust commands
for other version as needed):
</P>

<div class="code"><PRE>
cat &gt;&gt; qwtconfig.pri &lt;&lt;EOF
QWT_CONFIG -= QwtFramework
EOF
qmake -spec macx-g++
make -j [#cpus]
sudo make install

sudo install_name_tool -id /usr/local/qwt-5.2.2/lib/libqwt.5.dylib \
/usr/local/qwt-5.2.2/lib/libqwt.5.dylib
sudo install_name_tool -id /usr/local/qwt-6.0.2/lib/libqwt.6.dylib \
/usr/local/qwt-6.0.2/lib/libqwt.6.dylib
</PRE></div>

<P>
The Qwt shared library is now installed in /usr/local/qwt-5.x.x (x.x is
the minor.point version). Remember this for QGIS configuration.
</P>
<P>
Qwt 6.x.x is similarly built, but defaults to being installed as a framework:
</P>

<div class="code"><PRE>
cd &lt;Qwt 6.x.x source directory&gt;
qmake -spec macx-g++
make -j [#cpus]
sudo make install
</PRE></div>

<P>
<B>TODO:</B> Remedy for :
</P>

<div class="code"><PRE>
shrub:qwt-6.1-rc3 timlinux$ sudo make install
Password:
cd src/ &amp;&amp; make -f Makefile install
rm -f -r "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
cp -f -R "../lib/qwt.framework" "/usr/local/qwt-6.1.0-rc3/lib/qwt.framework"
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/html /usr/local/qwt-6.1.0-rc3/doc/
cp -f -R /Users/timlinux/dev/cpp/qwt-6.1-rc3/doc/man /usr/local/qwt-6.1.0-rc3/doc/
cd textengines/ &amp;&amp; make -f Makefile install
make[1]: Nothing to be done for `install'.
cd designer/ &amp;&amp; make -f Makefile install
rm -f libqwt_designer_plugin.dylib
linking plugins/designer/libqwt_designer_plugin.dylib
ld: library not found for -lqwt
collect2: ld returned 1 exit status
make[1]: *** [plugins/designer/libqwt_designer_plugin.dylib] Error 1
make: *** [sub-designer-install_subtargets-ordered] Error 2
</PRE></div>

<div class="code"><PRE>
sudo install_name_tool -id /usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt \
/usr/local/qwt-6.0.1/lib/qwt.framework/Versions/6/qwt
</PRE></div>

<P>
This installs to the following location
</P>
<P>
/usr/local/qwt-6.x.x/lib/qwt.framework/qwt
/usr/local/qwt-6.x.x/lib/qwt.framework/Headers
</P>
<P>
(x.x is the minor.point version). Remember these for QGIS configuration.
The Qwt shared library is now installed in /usr/local/qwt-6.0.x (x is
the point version). Remember this for QGIS configuration.
</P>

<H3>5.4.10. Additional dependencies: Bison</H3>

0 comments on commit 9a01c53

Please sign in to comment.
You can’t perform that action at this time.