sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
20,256 Commits 82 Branches 277 Tags
Commit Graph

174 Commits

Author SHA1 Message Date
Juergen E. Fischer
7ba1c4d632 fix retrieval of PYTHON_SITE_PACKAGES_DIR - broke debian builds 2013-09-13 23:05:16 +02:00
Marco Bernasocchi
b61b5b0f83 make honoring -DPYTHON_LIBRARY more solid. 
as cmake --help-module FindPythonLibs states
If you'd like to specify the installation of Python to use, you should modify the following cache variables:

         PYTHON_LIBRARY             - path to the python library
         PYTHON_INCLUDE_PATH         - path to where Python.h is found

(please note it is PYTHON_INCLUDE_PATH  (deprecated) and not PYTHON_INCLUDE_DIR (new in 2.8) since we require cmake >= 2.6.2)
 2013-09-10 02:23:02 +02:00
Larry Shaffer
71558e697e [Android] Update library path 2013-09-09 17:15:38 -06:00
Larry Shaffer
1942239049 [Android] Change order of finding QtMobility package so Qt isn't 'found' twice 2013-09-09 17:15:38 -06:00
Larry Shaffer
dc4628599e [pyqgis-console] Add targets and python script for generating console's QScintilla .pap file, for auto-completion 
- Run 'make;make qsci-pap-src; make install' to update the default .pap file in source tree
- Run 'make;make qsci-pap-master[; make install]' for local-only .pap that overrides the default .pap (when testing new bindings)
- Update console to override default .pap if master.pap is available
- Include new qgis.core.NULL attribute defined in <src>/python/__init__.py for QPyNullVariant comparisons
- Update 11-month-old default .pap
 2013-08-30 13:12:38 -06:00
Jaka Kranjc
909411ce9d FindQsci: removed the unused exception holder variable 
master didn't build without that:
-- Found PyQt4 version: 4.10
  File "~/carina/Quantum-GIS/cmake/FindQsci.py", line 41
    except ImportError, e:
                      ^
SyntaxError: invalid syntax
 2013-08-06 21:37:09 +02:00
Larry Shaffer
0653127dd6 Fix finding QScintilla2 lib: prefer local installs over system 2013-07-11 18:16:20 -06:00
Juergen E. Fischer
06272115d5 fix #8082 2013-06-16 21:41:58 +02:00
Juergen E. Fischer
65d3535fc5 - Quantum GIS => QGIS update 
- integrate PythonConsole help into main translation
- allow referencing QGIS images in context help(viewer)
 2013-05-20 16:48:51 +02:00
Tim Sutton
d2433c561d Revert "make cmake honor PYTHON_LIBRARY and find the default both in x86 (tested on ubuntu 12.10 64) and android " 
This reverts commit f7f3e413b726024384235a3654d6b18d9ff073be.
 2013-05-19 15:31:51 +02:00
Marco Bernasocchi
f7f3e413b7 make cmake honor PYTHON_LIBRARY and find the default both in x86 (tested on ubuntu 12.10 64) and android 2013-05-19 15:17:55 +02:00
Tim Sutton
cf928a5672 Revert "make cmake honor PYTHON_LIBRARY" 
This reverts commit b3c6d38ffefa9db79932be234b010598a9664706.
 2013-05-19 13:47:02 +02:00
Marco Bernasocchi
b3c6d38ffe make cmake honor PYTHON_LIBRARY 2013-04-23 18:26:18 +02:00
Pirmin Kalberer
1436056f77 Globe: Fix compilation with osgearth 2.4 2013-04-08 23:54:29 +02:00
Juergen E. Fischer
22cb38b2cc deduce plugin directory from a plugin that actually still exists 2013-04-07 23:14:24 +02:00
Juergen E. Fischer
82a36f9cbe adjustments to build on cygwin 2013-04-06 18:30:28 +02:00
William Kyngesburye
67a542bfd0 add framework path to link test to fix OS X SDK problem 2013-04-02 20:54:57 -05:00
William Kyngesburye
87572f72e8 add framework path to link test to fix OS X SDK problem 2013-04-02 17:48:21 -05:00
William Kyngesburye
2f2ca9f405 unset temporary LIB_PATH var 2013-04-02 14:30:52 -05:00
William Kyngesburye
a0e9f89854 handle spaces in install_names (for real this time) 2013-04-01 16:53:58 -05:00
William Kyngesburye
e31d4a2058 handle spaces in install_names 2013-04-01 16:42:43 -05:00
Juergen E. Fischer
f2029b4ec4 log python warnings and enabled deprecation warnings 2013-01-24 03:08:20 +01:00
Jaka Kranjc
5003c465d0 FindQwt.cmake: also detect qwt6 suffixes 2013-01-10 20:13:50 +01:00
Juergen E. Fischer
e2f7adf2fb geos 3.3.6 doesn't produces geos_c_i on windows anymore also check geos_c 2012-12-29 02:56:24 +01:00
Larry Shaffer
d56b1c885f Add CMake option for custom Python framework on Mac 2012-12-22 15:37:14 -07:00
Juergen E. Fischer
56bba0609e remove trailing whitespace 2012-12-05 22:14:16 +01:00
Werner Macho
8c32fe97e5 add missing FindQextserialport.cmake to complete issue #6613 2012-12-05 11:49:35 +01:00
Giuseppe Sucameli
ce31f37d8e fix SL provider (follow 90972db78a): 
fix build linking SL < v4,
fix SL4 database version check,
rename SPATIALITE_RECENT_VERSION macro to the more significant SPATIALITE_VERSION_GE_4_0_0,
 2012-12-05 04:32:34 +01:00
Giuseppe Sucameli
47097b72b8 [FEATURE] update SL provider to use statistics (available from spatialite v4.0). 
Patch by Alessandro Furieri.
 2012-11-30 14:37:16 +01:00
Larry Shaffer
a27aad04f6 Run Mac bundled app from build directory 
- No longer a need for hard link
- Build directory app bundle, providers, Python plugins and unit tests functional
- Adjusted resources corrected on install
 2012-10-29 03:05:10 -06:00
Werner Macho
b78456f70d added machine readable license 2012-10-24 12:28:20 +02:00
Larry Shaffer
e8edb950e4 Add CMake finds for QScintilla2 and Qsci module 
- Needs testing on Windows platform
- Add QScintilla2 library version info to About dialog
- Add Mac bundling support for Qwt 6 framework and QScintilla2
- Fallback to sys or custom site-pkgs when looking for PyQt4 modules to Mac bundle
 2012-10-22 20:45:14 -06:00
Pirmin Kalberer
b419adc514 Use ViewerWidget and Controls from OsgEarth instead of backports 2012-10-19 02:03:42 +02:00
Werner Macho
b3dcc3d7c4 another few licenses added 2012-10-11 17:15:32 +02:00
Juergen E. Fischer
e7f40bdea4 add more copyrights 2012-10-06 13:32:08 +02:00
Larry Shaffer
064c0c054b PyQScintilla api files setup for local compiling of pap file 
- Update and concatenate sip-built api files into PyQGIS.api
- Move python/qgis/api to python/qsci_apis for future api selection and compiling module
- Add base version api files for python components
 2012-10-04 15:06:25 -06:00
Juergen E. Fischer
74fd0e48ae more sip fixes: 
- also move enum StyleEntity in QgsStyleV2
- fix some warnings
 2012-09-24 18:43:20 +02:00
Juergen E. Fischer
9117bf1b10 fix warnings 2012-09-17 11:05:53 +02:00
Larry Shaffer
096badd94f Revert most Mac hacks for testing in favor of 4cfc365 
- Cleanup of old .qml svg paths to matches other test data .qml
 2012-08-26 17:27:18 -06:00
Tim Sutton
0d6858e30c Typo fix 2012-08-26 15:13:12 +02:00
Larry Shaffer
9e73629d92 Fix package data and svg paths for cmake and pyqgis tests on Mac 2012-08-24 22:03:46 -06:00
Juergen E. Fischer
96b2d51e97 fix tests on windows 2012-08-18 00:44:50 +02:00
Juergen E. Fischer
511e89ca36 - remove CMAKE_BUILD_TYPE from osgeo4w nightly configuration 
- rename 'our' astyle to qgisstyle
 2012-08-07 17:57:25 +02:00
Juergen E. Fischer
3b3f6748f1 remove CMAKE_BUILD_TYPE dependency on windows 2012-08-06 10:12:38 +02:00
Juergen E. Fischer
fdefb5bffb run python tests from build directory 2012-07-25 22:32:29 +02:00
Tim Sutton
55fc81d76a Merge branch 'master' of github.com:qgis/Quantum-GIS 2012-07-23 00:05:36 +02:00
Tim Sutton
b702d3ca9f Initial test framework for running python tests as part of the CTest suite. 2012-07-23 00:02:56 +02:00
Larry Shaffer
2599bf4683 Fix for Mac source builds. 
Builds were not portable (i.e. Snow Leopard to Lion, dev Mac to client) because libs were still referencing dev Mac's libs and were not being updated on bundle frameworks.
 2012-07-19 20:59:03 -06:00
Juergen E. Fischer
edaadddb2a fix cmake warning and report GDAL version 2012-05-13 00:24:26 +02:00
Juergen E. Fischer
44248cb050 fix GDAL version check 2012-05-11 12:29:32 +02:00