diff --git a/CMakeLists.txt b/CMakeLists.txt
index d363e651..a48d9765 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,10 +70,6 @@ IF( EXIV2_ENABLE_XMP )
     SET( XMPLIB "do" )
 ENDIF( EXIV2_ENABLE_XMP )
 
-IF( EXIV2_ENABLE_BUILD_SAMPLES )
-    EXIV2_ENABLE_TESTING()
-ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
-
 INCLUDE( config/ConfigureChecks.cmake )
 
 SET( INSTALL_TARGET_STANDARD_ARGS RUNTIME
diff --git a/TODO-CMAKE b/TODO-CMAKE
index ddb8ee1f..6cf09d56 100644
--- a/TODO-CMAKE
+++ b/TODO-CMAKE
@@ -11,7 +11,6 @@
 
 * Rename configuration settings to EXIV2_*, e.g., EXIV2_ENABLE_SHARED
 
-* Two cmake projects: 1) exiv2 2) samples, common config in config/
 
 * emacs M-c command to (re-)compile
 
@@ -45,7 +44,7 @@ DONE * Add further messages to display option settings.
    -- XMP metadata support........... YES
    ------------------------------------------------------------------
 
-DONE * add possibility to build xmp as a convenience library.
+DONE * Add possibility to build xmp as a convenience library.
 
 DONE * Compilation fails if Expat (possibly also other dependencies?) is in a non-standard place.
 
@@ -71,7 +70,7 @@ DONE * Manage eviv2.pc file with CMake, like it's do with kdegraphics/libs .pc f
 
 DONE * Manage eviv2.lsm file with CMake, like it's do with kdegraphics/libs .lsm file.
 
-DONE * added cmake target to uninstall Exiv2, based on KDE4 cmake script.
+DONE * Added cmake target to uninstall Exiv2, based on KDE4 cmake script.
 
 DONE * The following options of the configure script should be supported
    --disable-shared     => -ENABLE_SHARED_EXIV2
@@ -82,5 +81,9 @@ DONE * The following options of the configure script should be supported
    --disable-printucs2  => -ENABLE_PRINTUCS2
    --enable-nls         => -ENABLE_NLS
 
-INFO * check How does cmake handle RPATH? (I'll read up on this).
+DONE * Cmake project: in root folder, common config in config sub-dir.
+
+DONE * Manage samples sub-dir with CMake.
+
+INFO * Check How does cmake handle RPATH? (I'll read up on this).
 
diff --git a/config/ConfigureChecks.cmake b/config/ConfigureChecks.cmake
index 7f0e7557..57b35d75 100644
--- a/config/ConfigureChecks.cmake
+++ b/config/ConfigureChecks.cmake
@@ -269,4 +269,5 @@ OptionOutput( "Native language support:         " EXIV2_ENABLE_NLS
 OptionOutput( "Conversion of Windows XP tags:   " EXIV2_ENABLE_PRINTUCS2          )
 OptionOutput( "Nikon lens database:             " EXIV2_ENABLE_LENSDATA           )
 OptionOutput( "Commercial build:                " EXIV2_ENABLE_COMMERCIAL         )
+OptionOutput( "Build the unit tests             " EXIV2_ENABLE_BUILD_SAMPLES      )
 MESSAGE( STATUS "-------------------------------------------------------------"   )