--- a/CMakeLists.txt	Mon Oct 17 13:14:57 2016 +0200
+++ b/CMakeLists.txt	Mon Oct 17 17:01:51 2016 +0200
@@ -1,10 +1,19 @@
 cmake_minimum_required(VERSION 2.8)
 project(OrthancStone)
 
-include(Resources/CMake/OrthancStone.cmake)
+
+#####################################################################
+## Build a static library containing the Orthanc Stone framework
+#####################################################################
 
+include(Resources/CMake/OrthancStone.cmake)
 add_library(OrthancStone STATIC ${ORTHANC_STONE_SOURCES})
 
+
+#####################################################################
+## Build all the sample applications
+#####################################################################
+
 macro(BuildSample Target Sample)
   add_executable(${Target} Samples/SampleMainSdl.cpp)
   set_target_properties(${Target} PROPERTIES COMPILE_DEFINITIONS ORTHANC_STONE_SAMPLE=${Sample})
@@ -18,3 +27,23 @@
 BuildSample(OrthancStoneBasicPetCtFusion 5)
 BuildSample(OrthancStoneSynchronizedSeries 6)
 BuildSample(OrthancStoneLayoutPetCtFusion 7)
+
+
+#####################################################################
+## Generate the documentation if Doxygen is present
+#####################################################################
+
+find_package(Doxygen)
+if (DOXYGEN_FOUND)
+  configure_file(
+    ${ORTHANC_STONE_DIR}/Resources/OrthancStone.doxygen
+    ${CMAKE_CURRENT_BINARY_DIR}/OrthancStone.doxygen
+    @ONLY)
+
+  add_custom_target(doc
+    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/OrthancStone.doxygen
+    COMMENT "Generating documentation with Doxygen" VERBATIM
+    )
+else()
+  message("Doxygen not found. The documentation will not be built.")
+endif()

--- a/Resources/OrthancStone.doxygen	Mon Oct 17 13:14:57 2016 +0200
+++ b/Resources/OrthancStone.doxygen	Mon Oct 17 17:01:51 2016 +0200
@@ -655,8 +655,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @ORTHANC_STONE_DIR@/Framework \
-                         @ORTHANC_STONE_DIR@/Tests/Sdl/dev.h
+INPUT                  = @ORTHANC_STONE_DIR@/Framework
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -688,9 +687,7 @@
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = @ORTHANC_STONE_DIR@/Framework/Orthanc/Plugins/ \
-                         @ORTHANC_STONE_DIR@/Framework/Orthanc/Resources/ \
-                         @ORTHANC_STONE_DIR@/Framework/Orthanc/Sdk-1.1.0/
+EXCLUDE                = @ORTHANC_STONE_DIR@/Framework/Orthanc/Resources/
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded