Enhanced CMake project file by disabling external support libraries if

corresponding header files could not be found.

CHANGES.355

@@ -1,6 +1,12 @@
 
 Changes between releases are documented here.
 
+**** Changes from 2009.12.17 (riesmeier)
+
+- Enhanced CMake project file by disabling external support libraries if
+  corresponding header files could not be found.
+  Affects: CMakeLists.txt
+
 **** Changes from 2009.12.17 (onken)
 
 - Fixed scu and scp base class compile issues.
@@ -21,7 +27,7 @@ Changes between releases are documented here.
 
 - Fixed bug in SCU/SCP role negotation. Thanks to Evgeny Sabelskiy
   <[email protected]> for the report and suggested fix.
-  Affects: dcmnet/libsrc/dulconst.cc  
+  Affects: dcmnet/libsrc/dulconst.cc
 
 **** Changes from 2009.12.16 (riesmeier)
 

CMakeLists.txt

@@ -160,37 +160,49 @@ IF(WITH_LIBXML AND WITH_LIBXMLINC)
   SET(LIBXML_INCDIR ${WITH_LIBXMLINC}/include)
   SET(LIBXML_LIBDIR ${WITH_LIBXMLINC}/lib)
   SET(LIBXML_LIBS debug libxml2_d optimized libxml2_o debug iconv_d optimized iconv_o)
+ELSE(WITH_LIBXML AND WITH_LIBXMLINC)
+  SET(WITH_LIBXML OFF)
 ENDIF(WITH_LIBXML AND WITH_LIBXMLINC)
 # libpng support
 IF(WITH_LIBPNG AND WITH_LIBPNGINC)
   SET(LIBPNG_INCDIR ${WITH_LIBPNGINC}/include)
   SET(LIBPNG_LIBDIR ${WITH_LIBPNGINC}/lib)
   SET(LIBPNG_LIBS debug libpng_d optimized libpng_o)
+ELSE(WITH_LIBPNG AND WITH_LIBPNGINC)
+  SET(WITH_LIBPNG OFF)
 ENDIF(WITH_LIBPNG AND WITH_LIBPNGINC)
 # libtiff support
 IF(WITH_LIBTIFF AND WITH_LIBTIFFINC)
   SET(LIBTIFF_INCDIR ${WITH_LIBTIFFINC}/include)
   SET(LIBTIFF_LIBDIR ${WITH_LIBTIFFINC}/lib)
   SET(LIBTIFF_LIBS debug libtiff_d optimized libtiff_o)
+ELSE(WITH_LIBTIFF AND WITH_LIBTIFFINC)
+  SET(WITH_LIBTIFF OFF)
 ENDIF(WITH_LIBTIFF AND WITH_LIBTIFFINC)
 # OpenSSL support
 IF(WITH_OPENSSL AND WITH_OPENSSLINC)
   SET(OPENSSL_BINDIR ${WITH_OPENSSLINC}/bin)
   SET(OPENSSL_INCDIR ${WITH_OPENSSLINC}/include)
   SET(OPENSSL_LIBDIR ${WITH_OPENSSLINC}/lib)
   SET(OPENSSL_LIBS debug dcmtkssl_d.lib optimized dcmtkssl_o.lib debug dcmtkeay_d.lib optimized dcmtkeay_o.lib)
+ELSE(WITH_OPENSSL AND WITH_OPENSSLINC)
+  SET(WITH_OPENSSL OFF)
 ENDIF(WITH_OPENSSL AND WITH_OPENSSLINC)
 # zlib support
 IF(WITH_ZLIB AND WITH_ZLIBINC)
   SET(ZLIB_INCDIR ${WITH_ZLIBINC}/include)
   SET(ZLIB_LIBDIR ${WITH_ZLIBINC}/lib)
   SET(ZLIB_LIBS debug zlib_d optimized zlib_o)
+ELSE(WITH_ZLIB AND WITH_ZLIBINC)
+  SET(WITH_ZLIB OFF)
 ENDIF(WITH_ZLIB AND WITH_ZLIBINC)
 # sndfile support
 IF(WITH_SNDFILE AND WITH_SNDFILEINC)
   SET(SNDFILE_INCDIR ${WITH_SNDFILEINC}/include)
   SET(SNDFILE_LIBDIR ${WITH_SNDFILEINC})
   SET(SNDFILE_LIBS debug libsndfile-1 optimized libsndfile-1)
+ELSE(WITH_SNDFILE AND WITH_SNDFILEINC)
+  SET(WITH_SNDFILE OFF)
 ENDIF(WITH_SNDFILE AND WITH_SNDFILEINC)
 
 # specify installation prefix