# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1401869500 -7200
# Node ID ffa8c7dcd87c88c73c6ae34dc630413534f044cc
# Parent  89a593f6610442b7a0022107bd0591a7ac90bd79
notes

diff -r 89a593f66104 -r ffa8c7dcd87c CMakeLists.txt
--- a/CMakeLists.txt	Tue Jun 03 20:37:35 2014 +0200
+++ b/CMakeLists.txt	Wed Jun 04 10:11:40 2014 +0200
@@ -162,16 +162,10 @@
   UnitTestsSources/Lua.cpp
   UnitTestsSources/MultiThreading.cpp
   UnitTestsSources/UnitTestsMain.cpp
+  UnitTestsSources/JpegLossless.cpp
   )
 
 
-if (ENABLE_JPEG_LOSSLESS)
-  list(APPEND ORTHANC_UNIT_TESTS_SOURCES
-    UnitTestsSources/JpegLossless.cpp
-    )
-endif()
-
-
 
 #####################################################################
 ## Inclusion of third-party dependencies
diff -r 89a593f66104 -r ffa8c7dcd87c LinuxCompilation.txt
--- a/LinuxCompilation.txt	Tue Jun 03 20:37:35 2014 +0200
+++ b/LinuxCompilation.txt	Wed Jun 04 10:11:40 2014 +0200
@@ -134,9 +134,22 @@
        	       	       uuid-dev libcurl4-openssl-dev liblua5.1-0-dev \
        	       	       libgoogle-glog-dev libgtest-dev libpng-dev \
        	       	       libsqlite3-dev libssl-dev zlib1g-dev \
-       	       	       libdcmtk2-dev libboost-all-dev libwrap0-dev
+       	       	       libdcmtk2-dev libboost-all-dev libwrap0-dev libcharls-dev
+
+With JPEG Lossless:
 
-# cmake "-DDCMTK_LIBRARIES=dcmjpls;wrap;oflog" \
+# cmake "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog" \
+        -DALLOW_DOWNLOADS=ON \
+	-DUSE_SYSTEM_MONGOOSE=OFF \
+	-DUSE_SYSTEM_JSONCPP=OFF \
+        -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
+        -DENABLE_JPEG_LOSSLESS=ON \
+	~/Orthanc
+
+
+Without JPEG Lossless:
+
+# cmake "-DDCMTK_LIBRARIES=wrap;oflog" \
         -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
 	-DUSE_SYSTEM_JSONCPP=OFF \
diff -r 89a593f66104 -r ffa8c7dcd87c UnitTestsSources/JpegLossless.cpp
--- a/UnitTestsSources/JpegLossless.cpp	Tue Jun 03 20:37:35 2014 +0200
+++ b/UnitTestsSources/JpegLossless.cpp	Wed Jun 04 10:11:40 2014 +0200
@@ -33,6 +33,8 @@
 #include "PrecompiledHeadersUnitTests.h"
 #include "gtest/gtest.h"
 
+#if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
+
 #include <dcmtk/dcmjpls/djlsutil.h>
 #include <dcmtk/dcmjpls/djdecode.h>
 
@@ -46,3 +48,6 @@
 
   DJLSDecoderRegistration::cleanup();
 }
+
+
+#endif