# HG changeset patch # User Sebastien Jodogne # Date 1355133650 -3600 # Node ID 9cd240cfd3a6561abcc480d3caff1684788be4cb # Parent 3b3525dee6619f7332fc2cfa017fb6c3f2d5b3d4 fixes diff -r 3b3525dee661 -r 9cd240cfd3a6 CMakeLists.txt --- a/CMakeLists.txt Sun Dec 09 15:01:00 2012 +0100 +++ b/CMakeLists.txt Mon Dec 10 11:00:50 2012 +0100 @@ -178,6 +178,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 3b3525dee661 -r 9cd240cfd3a6 Core/Compression/HierarchicalZipWriter.h --- a/Core/Compression/HierarchicalZipWriter.h Sun Dec 09 15:01:00 2012 +0100 +++ b/Core/Compression/HierarchicalZipWriter.h Mon Dec 10 11:00:50 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 3b3525dee661 -r 9cd240cfd3a6 Core/Compression/ZipWriter.h --- a/Core/Compression/ZipWriter.h Sun Dec 09 15:01:00 2012 +0100 +++ b/Core/Compression/ZipWriter.h Mon Dec 10 11:00:50 2012 +0100 @@ -35,7 +35,10 @@ #include #include #include + +#if ORTHANC_BUILD_UNIT_TESTS == 1 #include +#endif namespace Orthanc { diff -r 3b3525dee661 -r 9cd240cfd3a6 Core/SQLite/Statement.h --- a/Core/SQLite/Statement.h Sun Dec 09 15:01:00 2012 +0100 +++ b/Core/SQLite/Statement.h Mon Dec 10 11:00:50 2012 +0100 @@ -43,7 +43,10 @@ #include #include #include + +#if ORTHANC_BUILD_UNIT_TESTS == 1 #include +#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_;