--- a/CMakeLists.txt	Tue Jun 02 10:55:32 2015 +0200
+++ b/CMakeLists.txt	Tue Jun 02 11:07:20 2015 +0200
@@ -7,6 +7,7 @@
 
 # Parameters of the build
 SET(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)")
+SET(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages")
 
 # Advanced parameters to fine-tune linking against system libraries
 SET(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost")
@@ -29,9 +30,10 @@
 include(Orthanc/Resources/CMake/Compiler.cmake)
 
 include(Orthanc/Resources/CMake/BoostConfiguration.cmake)
+include(Orthanc/Resources/CMake/GoogleTestConfiguration.cmake)
 include(Orthanc/Resources/CMake/JsonCppConfiguration.cmake)
+include(Orthanc/Resources/CMake/LibCurlConfiguration.cmake)
 include(Orthanc/Resources/CMake/LibPngConfiguration.cmake)
-include(Orthanc/Resources/CMake/LibCurlConfiguration.cmake)
 include(Orthanc/Resources/CMake/OpenSslConfiguration.cmake)
 include(Orthanc/Resources/CMake/ZlibConfiguration.cmake)
 
@@ -50,9 +52,9 @@
     set(CMAKE_SHARED_LIBRARY_PREFIX "")
 
     if (${CMAKE_SIZEOF_VOID_P} EQUAL 4)
-      set(ORTHANC_CPP_CLIENT_AUX CppClient/SharedLibrary/AUTOGENERATED/Windows32.def)
+      set(ORTHANC_CPP_CLIENT_AUX SharedLibrary/AUTOGENERATED/Windows32.def)
     elseif (${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-      set(ORTHANC_CPP_CLIENT_AUX CppClient/SharedLibrary/AUTOGENERATED/Windows64.def)
+      set(ORTHANC_CPP_CLIENT_AUX SharedLibrary/AUTOGENERATED/Windows64.def)
     else()
       message(FATAL_ERROR "Support your platform here")
     endif()
@@ -62,10 +64,10 @@
 
   if (${CMAKE_SIZEOF_VOID_P} EQUAL 4)
     set(CMAKE_SHARED_LIBRARY_SUFFIX "_Windows32.dll")
-    list(APPEND ORTHANC_CPP_CLIENT_AUX CppClient/SharedLibrary/AUTOGENERATED/Windows32.rc)
+    list(APPEND ORTHANC_CPP_CLIENT_AUX SharedLibrary/AUTOGENERATED/Windows32.rc)
   elseif (${CMAKE_SIZEOF_VOID_P} EQUAL 8)
     set(CMAKE_SHARED_LIBRARY_SUFFIX "_Windows64.dll")
-    list(APPEND ORTHANC_CPP_CLIENT_AUX CppClient/SharedLibrary/AUTOGENERATED/Windows64.rc)
+    list(APPEND ORTHANC_CPP_CLIENT_AUX SharedLibrary/AUTOGENERATED/Windows64.rc)
   else()
     message(FATAL_ERROR "Support your platform here")
   endif()    
@@ -104,6 +106,18 @@
   )
 
 
+add_executable(UnitTests
+  CppClient/ArrayFilledByThreads.cpp
+  CppClient/ThreadedCommandProcessor.cpp
+  Orthanc/Core/MultiThreading/SharedMessageQueue.cpp
+  UnitTestsSources/MultiThreadingTests.cpp
+  UnitTestsSources/UnitTestsMain.cpp
+
+  ${THIRD_PARTY_SOURCES}
+  ${GTEST_SOURCES}
+  )
+
+
 list(LENGTH OPENSSL_SOURCES OPENSSL_SOURCES_LENGTH)
 if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
   add_library(OpenSSL STATIC ${OPENSSL_SOURCES})
@@ -161,7 +175,7 @@
 
 install(
   FILES
-  CppClient/SharedLibrary/AUTOGENERATED/CppClient.h 
+  SharedLibrary/AUTOGENERATED/CppClient.h 
   DESTINATION include/orthanc
   )