Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1373 from 3nids/package
set custom widget lib default to false
  • Loading branch information
jef-n committed May 20, 2014
2 parents 978086b + 790b31e commit 9615a83
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -47,7 +47,7 @@ IF(WITH_MAPSERVER)
ENDIF(WITH_MAPSERVER)

# Custom widgets
SET (WITH_CUSTOM_WIDGETS TRUE CACHE BOOL "Determines whether QGIS custom widgets for Qt Designer should be built")
SET (WITH_CUSTOM_WIDGETS FALSE CACHE BOOL "Determines whether QGIS custom widgets for Qt Designer should be built")

# build our version of astyle
SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)")
Expand Down
1 change: 1 addition & 0 deletions debian/rules
Expand Up @@ -54,6 +54,7 @@ CMAKE_OPTS := \
-DMAPSERVER_SKIP_ECW=TRUE \
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-DWITH_APIDOC=TRUE \
-DWITH_CUSTOM_WIDGETS=TRUE \
-DWITH_GLOBE=TRUE \
-DWITH_INTERNAL_HTTPLIB2=FALSE \
-DWITH_INTERNAL_JINJA2=FALSE \
Expand Down
1 change: 1 addition & 0 deletions ms-windows/cygwin/package.sh
Expand Up @@ -23,6 +23,7 @@ cmake -D BUILDNAME="cygwin" \
-D WITH_GLOBE=NO \
-D ENABLE_TESTS=YES \
-D CMAKE_INSTALL_PREFIX=/usr \
-D WITH_CUSTOM_WIDGETS=TRUE \
../../..

make -j8
Expand Down
1 change: 1 addition & 0 deletions ms-windows/osgeo4w/package-nightly.cmd
Expand Up @@ -146,6 +146,7 @@ cmake %CMAKE_OPT% ^
-D WITH_TOUCH=TRUE ^
-D WITH_ORACLE=TRUE ^
-D WITH_GRASS=TRUE ^
-D WITH_CUSTOM_WIDGETS=TRUE ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c.lib ^
Expand Down
1 change: 1 addition & 0 deletions ms-windows/osgeo4w/package.cmd
Expand Up @@ -140,6 +140,7 @@ cmake %CMAKE_OPT% ^
-D WITH_TOUCH=TRUE ^
-D WITH_ORACLE=TRUE ^
-D WITH_GRASS=TRUE ^
-D WITH_CUSTOM_WIDGETS=TRUE ^
-D CMAKE_CXX_FLAGS_RELEASE="/MD /MP /O2 /Ob2 /D NDEBUG" ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
Expand Down

0 comments on commit 9615a83

Please sign in to comment.