# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1355480549 -3600
# Node ID ffd98d2f0b911c6f54bfb064c50da74217af08dc
# Parent  40d3bf6cc8d913ccb0371061f5c2ce44cec5aea0# Parent  9cd240cfd3a6561abcc480d3caff1684788be4cb
merge

diff -r 40d3bf6cc8d9 -r ffd98d2f0b91 CMakeLists.txt
--- a/CMakeLists.txt	Fri Dec 14 11:22:04 2012 +0100
+++ b/CMakeLists.txt	Fri Dec 14 11:22:29 2012 +0100
@@ -179,6 +179,7 @@
 
   # Build the unit tests if required
   if (BUILD_UNIT_TESTS)
+    add_definitions(-DORTHANC_BUILD_UNIT_TESTS=1)
     include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake)
     add_executable(UnitTests
       ${GTEST_SOURCES}
diff -r 40d3bf6cc8d9 -r ffd98d2f0b91 Core/Compression/HierarchicalZipWriter.h
--- a/Core/Compression/HierarchicalZipWriter.h	Fri Dec 14 11:22:04 2012 +0100
+++ b/Core/Compression/HierarchicalZipWriter.h	Fri Dec 14 11:22:29 2012 +0100
@@ -42,8 +42,10 @@
 {
   class HierarchicalZipWriter
   {
+#if ORTHANC_BUILD_UNIT_TESTS == 1
     FRIEND_TEST(HierarchicalZipWriter, Index);
     FRIEND_TEST(HierarchicalZipWriter, Filenames);
+#endif
 
   private:
     class Index
diff -r 40d3bf6cc8d9 -r ffd98d2f0b91 Core/Compression/ZipWriter.h
--- a/Core/Compression/ZipWriter.h	Fri Dec 14 11:22:04 2012 +0100
+++ b/Core/Compression/ZipWriter.h	Fri Dec 14 11:22:29 2012 +0100
@@ -35,7 +35,10 @@
 #include <stdint.h>
 #include <string>
 #include <boost/shared_ptr.hpp>
+
+#if ORTHANC_BUILD_UNIT_TESTS == 1
 #include <gtest/gtest_prod.h>
+#endif
 
 namespace Orthanc
 {
diff -r 40d3bf6cc8d9 -r ffd98d2f0b91 Core/SQLite/Statement.h
--- a/Core/SQLite/Statement.h	Fri Dec 14 11:22:04 2012 +0100
+++ b/Core/SQLite/Statement.h	Fri Dec 14 11:22:29 2012 +0100
@@ -43,7 +43,10 @@
 #include <vector>
 #include <stdint.h>
 #include <boost/noncopyable.hpp>
+
+#if ORTHANC_BUILD_UNIT_TESTS == 1
 #include <gtest/gtest_prod.h>
+#endif
 
 struct sqlite3_stmt;
 
@@ -68,8 +71,11 @@
     class Statement : public boost::noncopyable
     {
       friend class Connection;
+
+#if ORTHANC_BUILD_UNIT_TESTS == 1
       FRIEND_TEST(SQLStatementTest, Run);
       FRIEND_TEST(SQLStatementTest, Reset);
+#endif
 
     private:
       StatementReference  reference_;