Skip to content

Commit 228d816

Browse files
committedSep 25, 2015
Merge pull request #2330 from boundlessgeo/master-2_11-auth-system
Authentication configuration system with master password
2 parents caf12e7 + 12de332 commit 228d816

File tree

279 files changed

+27407
-374
lines changed

Some content is hidden

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

279 files changed

+27407
-374
lines changed
 

‎CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,13 @@ ENDIF (WITH_TOUCH)
308308
# search for QScintilla2 (C++ lib)
309309
FIND_PACKAGE(QScintilla REQUIRED)
310310

311+
# Master password hash and authentication encryption
312+
FIND_PACKAGE(QCA REQUIRED)
313+
# Check for runtime dependency of qca-ossl plugin
314+
# REQUIRED if unit tests are to be run from build directory
315+
include(QCAMacros)
316+
FIND_QCAOSSL_PLUGIN_CPP(ENABLE_TESTS)
317+
311318
# ModelTest
312319
SET(ENABLE_MODELTEST FALSE CACHE BOOL "Enable QT ModelTest (not for production)")
313320

‎ci/travis/linux/before_install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ sudo apt-get install --force-yes --no-install-recommends --no-install-suggests \
1111
libgdal1-dev libgeos-dev libgeos++-dev libgsl0-dev libpq-dev \
1212
libproj-dev libqscintilla2-dev libqt4-dev \
1313
libqt4-opengl-dev libqt4-sql-sqlite libqtwebkit-dev \
14+
libqca2-dev libqca2-plugin-ossl \
1415
libqwt-dev libspatialindex-dev libspatialite-dev \
1516
libsqlite3-dev lighttpd pkg-config poppler-utils \
1617
pyqt4-dev-tools python python-dev python-qt4 \

0 commit comments

Comments
 (0)
Please sign in to comment.