# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1383062702 -3600
# Node ID 8d1382acee29e86dee49e585da6c47f73b0c191a
# Parent  9a85a2ac1005ff2eba3acc571d96354feda12a6d# Parent  a5f291f05bba28e3af8a5f9f645c05df39b8d253
merge

diff -r 9a85a2ac1005 -r 8d1382acee29 CMakeLists.txt
--- a/CMakeLists.txt	Tue Oct 29 17:04:35 2013 +0100
+++ b/CMakeLists.txt	Tue Oct 29 17:05:02 2013 +0100
@@ -31,8 +31,8 @@
 SET(USE_SYSTEM_CURL ON CACHE BOOL "Use the system version of LibCurl")
 
 # Distribution-specific settings
-SET(USE_GTEST_DEBIAN_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
-mark_as_advanced(USE_GTEST_DEBIAN_PACKAGE)
+SET(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)")
+mark_as_advanced(USE_GTEST_DEBIAN_SOURCE_PACKAGE)
 
 # Some basic inclusions
 include(CheckIncludeFiles)
diff -r 9a85a2ac1005 -r 8d1382acee29 LinuxCompilation.txt
--- a/LinuxCompilation.txt	Tue Oct 29 17:04:35 2013 +0100
+++ b/LinuxCompilation.txt	Tue Oct 29 17:05:02 2013 +0100
@@ -65,7 +65,7 @@
 
 # sudo apt-get install build-essential unzip cmake mercurial \
        	       	       uuid-dev libcurl4-openssl-dev liblua5.1-0-dev \
-       	       	       libgoogle-glog-dev libpng-dev \
+       	       	       libgoogle-glog-dev libpng-dev libgtest-dev \
        	       	       libsqlite3-dev libssl-dev zlib1g-dev
 
 # cmake -DALLOW_DOWNLOADS=ON \
@@ -88,7 +88,7 @@
 # cmake "-DDCMTK_LIBRARIES=wrap;oflog" \
         -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
-        -DUSE_GTEST_DEBIAN_PACKAGE=ON \
+        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
         -DDCMTK_DICTIONARY_DIR:PATH=/usr/share/libdcmtk2 \
 	~/Orthanc
 
@@ -110,7 +110,7 @@
         -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
 	-DUSE_SYSTEM_JSONCPP=OFF \
-        -DUSE_GTEST_DEBIAN_PACKAGE=ON \
+        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
 	~/Orthanc
 
 
diff -r 9a85a2ac1005 -r 8d1382acee29 Resources/CMake/GoogleTestConfiguration.cmake
--- a/Resources/CMake/GoogleTestConfiguration.cmake	Tue Oct 29 17:04:35 2013 +0100
+++ b/Resources/CMake/GoogleTestConfiguration.cmake	Tue Oct 29 17:05:02 2013 +0100
@@ -1,4 +1,4 @@
-if (USE_GTEST_DEBIAN_PACKAGE)
+if (USE_GTEST_DEBIAN_SOURCE_PACKAGE)
   set(GTEST_SOURCES /usr/src/gtest/src/gtest-all.cc)
   include_directories(/usr/src/gtest)