Skip to content

Commit f9f4860

Browse files
timlinuxtimlinux
committedDec 2, 2011
Merge branch 'master' of github.com:qgis/Quantum-GIS
·
ltr-3_40Before-merge-new_vector_api
2 parents ad8ae1b + 335dbf1 commit f9f4860

File tree

107 files changed

+1461
-18783
lines changed

Some content is hidden

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

107 files changed

+1461
-18783
lines changed
 

‎CMakeLists.txt

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

259258
IF (MSVC)
@@ -323,8 +322,6 @@ ELSE (WIN32)
323322
SET (QGIS_LIBEXEC_SUBDIR_REV ../..)
324323
SET (DEFAULT_PLUGIN_SUBDIR ../PlugIns/qgis)
325324
SET (QGIS_PLUGIN_SUBDIR_REV ../../MacOS)
326-
SET (DEFAULT_PROVIDER_SUBDIR ../Providers/qgis)
327-
SET (QGIS_PROVIDER_SUBDIR_REV ../../MacOS)
328325
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
329326
# path for framework references
330327
SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})
@@ -337,7 +334,6 @@ ELSE (WIN32)
337334
SET (DEFAULT_DATA_SUBDIR share/qgis)
338335
SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
339336
SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
340-
SET (DEFAULT_PROVIDER_SUBDIR lib${LIB_SUFFIX}/qgis/providers)
341337
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
342338
ENDIF (APPLE)
343339

@@ -377,12 +373,11 @@ SET (QGIS_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING "Subdirectory wh
377373
SET (QGIS_LIBEXEC_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR} CACHE STRING "Subdirectory where private executables will be installed")
378374
SET (QGIS_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING "Subdirectory where QGIS data will be installed")
379375
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")
381376
SET (QGIS_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING "Subdirectory where header files will be installed")
382377

383378
# mark *_SUBDIR variables as advanced as this is not something
384379
# that an average user would use
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)
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)
386381

387382
# full paths for the installation
388383
SET (QGIS_BIN_DIR ${QGIS_BIN_SUBDIR})
@@ -391,7 +386,6 @@ SET (QGIS_LIB_DIR ${QGIS_LIB_SUBDIR})
391386
SET (QGIS_LIBEXEC_DIR ${QGIS_LIBEXEC_SUBDIR})
392387
SET (QGIS_DATA_DIR ${QGIS_DATA_SUBDIR})
393388
SET (QGIS_PLUGIN_DIR ${QGIS_PLUGIN_SUBDIR})
394-
SET (QGIS_PROVIDER_DIR ${QGIS_PROVIDER_SUBDIR})
395389
SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})
396390

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

‎cmake_templates/qgsconfig.h.in

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

2323
#define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}"
24-
#define QGIS_PROVIDER_SUBDIR "${QGIS_PROVIDER_SUBDIR}"
2524
#define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}"
2625
#define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}"
2726
#define QGIS_LIB_SUBDIR "${QGIS_LIB_SUBDIR}"

0 commit comments

Comments
 (0)
Please sign in to comment.