Skip to content

Commit 78ce3cd

Browse files
timlinuxtimlinux
committedNov 30, 2011
Merge branch 'master' of github.com:qgis/Quantum-GIS into qgis-master
2 parents 2414a3a + 763caa7 commit 78ce3cd

File tree

77 files changed

+18044
-315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+18044
-315
lines changed
 

‎CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ IF (WIN32)
253253
SET (DEFAULT_LIBEXEC_SUBDIR .)
254254
SET (DEFAULT_DATA_SUBDIR .)
255255
SET (DEFAULT_PLUGIN_SUBDIR plugins)
256+
SET (DEFAULT_PROVIDER_SUBDIR providers)
256257
SET (DEFAULT_INCLUDE_SUBDIR include)
257258

258259
IF (MSVC)
@@ -322,6 +323,8 @@ ELSE (WIN32)
322323
SET (QGIS_LIBEXEC_SUBDIR_REV ../..)
323324
SET (DEFAULT_PLUGIN_SUBDIR ../PlugIns/qgis)
324325
SET (QGIS_PLUGIN_SUBDIR_REV ../../MacOS)
326+
SET (DEFAULT_PROVIDER_SUBDIR ../Providers/qgis)
327+
SET (QGIS_PROVIDER_SUBDIR_REV ../../MacOS)
325328
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
326329
# path for framework references
327330
SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})
@@ -334,6 +337,7 @@ ELSE (WIN32)
334337
SET (DEFAULT_DATA_SUBDIR share/qgis)
335338
SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
336339
SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
340+
SET (DEFAULT_PROVIDER_SUBDIR lib${LIB_SUFFIX}/qgis/providers)
337341
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
338342
ENDIF (APPLE)
339343

@@ -373,11 +377,12 @@ SET (QGIS_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING "Subdirectory wh
373377
SET (QGIS_LIBEXEC_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR} CACHE STRING "Subdirectory where private executables will be installed")
374378
SET (QGIS_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING "Subdirectory where QGIS data will be installed")
375379
SET (QGIS_PLUGIN_SUBDIR ${DEFAULT_PLUGIN_SUBDIR} CACHE STRING "Subdirectory where plugins will be installed")
380+
SET (QGIS_PROVIDER_SUBDIR ${DEFAULT_PROVIDER_SUBDIR} CACHE STRING "Subdirectory where providers will be installed")
376381
SET (QGIS_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING "Subdirectory where header files will be installed")
377382

378383
# mark *_SUBDIR variables as advanced as this is not something
379384
# that an average user would use
380-
MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_CGIBIN_SUBDIR QGIS_LIB_SUBDIR QGIS_LIBEXEC_SUBDIR QGIS_DATA_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
385+
MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_CGIBIN_SUBDIR QGIS_LIB_SUBDIR QGIS_LIBEXEC_SUBDIR QGIS_DATA_SUBDIR QGIS_PROVIDER_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
381386

382387
# full paths for the installation
383388
SET (QGIS_BIN_DIR ${QGIS_BIN_SUBDIR})
@@ -386,6 +391,7 @@ SET (QGIS_LIB_DIR ${QGIS_LIB_SUBDIR})
386391
SET (QGIS_LIBEXEC_DIR ${QGIS_LIBEXEC_SUBDIR})
387392
SET (QGIS_DATA_DIR ${QGIS_DATA_SUBDIR})
388393
SET (QGIS_PLUGIN_DIR ${QGIS_PLUGIN_SUBDIR})
394+
SET (QGIS_PROVIDER_DIR ${QGIS_PROVIDER_SUBDIR})
389395
SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})
390396

391397
# set the default locations where the targets (executables, libraries) will land when compiled

‎cmake_templates/qgsconfig.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#define RELEASE_NAME "${RELEASE_NAME}"
2222

2323
#define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}"
24+
#define QGIS_PROVIDER_SUBDIR "${QGIS_PROVIDER_SUBDIR}"
2425
#define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}"
2526
#define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}"
2627
#define QGIS_LIB_SUBDIR "${QGIS_LIB_SUBDIR}"

0 commit comments

Comments
 (0)
Please sign in to comment.