Skip to content
Permalink
Browse files

[server] remove ENABLE_MS_TESTS definition when tests are enabled

  • Loading branch information
3nids committed Nov 14, 2018
1 parent a139f8d commit 7e5a6a23ca346e30d89cea7f340b87e08e92f555
Showing with 0 additions and 6 deletions.
  1. +0 −4 src/server/CMakeLists.txt
  2. +0 −2 src/server/qgsserver.cpp
@@ -10,10 +10,6 @@ IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
ADD_DEFINITIONS(-DQGSMSDEBUG=1)
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)

IF (ENABLE_TESTS)
ADD_DEFINITIONS(-DENABLE_MS_TESTS=1)
ENDIF (ENABLE_TESTS)

ADD_SUBDIRECTORY(services)

########################################################
@@ -239,9 +239,7 @@ bool QgsServer::init()
//create cache for capabilities XML
sCapabilitiesCache = new QgsCapabilitiesCache();

#ifdef ENABLE_MS_TESTS
QgsFontUtils::loadStandardTestFonts( QStringList() << QStringLiteral( "Roman" ) << QStringLiteral( "Bold" ) );
#endif

sServiceRegistry = new QgsServiceRegistry();

0 comments on commit 7e5a6a2

Please sign in to comment.
You can’t perform that action at this time.