Skip to content

Commit

Permalink
[server] remove ENABLE_MS_TESTS definition when tests are enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Nov 14, 2018
1 parent 8b9e86d commit ad774e9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
4 changes: 0 additions & 4 deletions src/server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

########################################################
Expand Down
2 changes: 0 additions & 2 deletions src/server/qgsserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit ad774e9

Please sign in to comment.