Mercurial > hg > orthanc

diff CMakeLists.txt @ 102:7593b57dc1bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch to google log
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 03 Oct 2012 16:28:13 +0200
parents 428784e59dcd
children 5af0a4345d06
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Oct 03 11:44:46 2012 +0200
+++ b/CMakeLists.txt	Wed Oct 03 16:28:13 2012 +0200
@@ -31,6 +31,8 @@
   ${CMAKE_SOURCE_DIR}/Resources/base64/base64.cpp
   )
 
+include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfiguration.cmake)
+
 if (${ENABLE_SSL})
   add_definitions(-DORTHANC_SSL_ENABLED=1)
   include(${CMAKE_SOURCE_DIR}/Resources/CMake/OpenSslConfiguration.cmake)
@@ -40,7 +42,6 @@
 
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/BoostConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/DcmtkConfiguration.cmake)
-include(${CMAKE_SOURCE_DIR}/Resources/CMake/Log4CPlusConfiguration.cmake) # Must be after DcmtkConfiguration
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/MongooseConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/ZlibConfiguration.cmake)
@@ -172,7 +173,6 @@
   Core/HttpServer/MongooseServer.cpp
   Core/MultiThreading/BagOfRunnablesBySteps.cpp
   Core/PngWriter.cpp
-  Core/Logging.cpp
   Core/SQLite/Connection.cpp
   Core/SQLite/FunctionContext.cpp
   Core/SQLite/Statement.cpp
@@ -191,7 +191,6 @@
   OrthancServer/DicomProtocol/DicomServer.cpp
   OrthancServer/DicomProtocol/DicomUserConnection.cpp
   OrthancServer/FromDcmtkBridge.cpp
-  OrthancServer/Internals/DcmtkLogging.cpp
   OrthancServer/Internals/CommandDispatcher.cpp
   OrthancServer/Internals/FindScp.cpp
   OrthancServer/Internals/MoveScp.cpp