Skip to content

Commit 2b55d89

Browse files
jef-njef-n
committedMar 25, 2016
give qgis future (followup 15b3600)
1 parent 0d21e64 commit 2b55d89

File tree

255 files changed

+43952
-6
lines changed

Some content is hidden

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

255 files changed

+43952
-6
lines changed
 

‎debian/rules

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ else
9797
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=FALSE -DWITH_INTERNAL_SIX=FALSE
9898
endif
9999

100+
ifneq (,$(findstring $(DISTRIBUTION),"stretch unstable wily xenial"))
101+
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=TRUE
102+
else
103+
CMAKE_OPTS += -DWITH_INTERNAL_FUTURE=FALSE
104+
endif
105+
106+
100107
ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
101108
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
102109
endif

‎ms-windows/osgeo4w/package-nightly.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ cmake %CMAKE_OPT% ^
193193
-D WITH_INTERNAL_NOSE2=FALSE ^
194194
-D WITH_INTERNAL_MOCK=FALSE ^
195195
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
196+
-D WITH_INTERNAL_FUTURE=FALSE ^
196197
%SRCDIR%
197198
if errorlevel 1 (echo cmake failed & goto error)
198199

0 commit comments

Comments
 (0)