From 790b31ef80dacf5fd8a3b5beec362466d1e71478 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Tue, 20 May 2014 08:18:55 +0200 Subject: [PATCH] set custom widget lib default to false --- CMakeLists.txt | 2 +- debian/rules | 1 + ms-windows/cygwin/package.sh | 1 + ms-windows/osgeo4w/package-nightly.cmd | 1 + ms-windows/osgeo4w/package.cmd | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dbd01850993..adf046a548a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)") diff --git a/debian/rules b/debian/rules index eb17ca17b19..8266a93c987 100755 --- a/debian/rules +++ b/debian/rules @@ -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 \ diff --git a/ms-windows/cygwin/package.sh b/ms-windows/cygwin/package.sh index be02537eba1..784e67c45e1 100644 --- a/ms-windows/cygwin/package.sh +++ b/ms-windows/cygwin/package.sh @@ -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 diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd index b44edbeb922..574fd99a35c 100644 --- a/ms-windows/osgeo4w/package-nightly.cmd +++ b/ms-windows/osgeo4w/package-nightly.cmd @@ -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 ^ diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd index d17a6c90226..414a960f575 100644 --- a/ms-windows/osgeo4w/package.cmd +++ b/ms-windows/osgeo4w/package.cmd @@ -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% ^