[server] remove ENABLE_MS_TESTS definition when tests are enabled

3nids · 3nids · commit 7e5a6a23ca34 · 2018-11-14T18:31:18.000+01:00
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -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)
 
 ########################################################
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -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();
 
