* FIX : now, the DocEntries are all deleted in the gdcmElementSet.

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5cfd632fcdcf20216c7de9a6903bf901fcf64579..97dad5ea5acefce2210bcc7b47d6f37cb7bd91c8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,12 @@
 #-----------------------------------------------------------------------------
 # Build jpeg lib first:
-SUBDIRS(jpeg)
+SUBDIRS(gdcmjpeg)
 
 # "jpeglib.h" is defined here:
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src
   ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
+  ${GDCM_BINARY_DIR}/src #for gdcmjpeg 8, 12 and 16 
 )
 
 SET(libgdcm_la_SOURCES
@@ -51,20 +52,16 @@ SET(libgdcm_la_SOURCES
    )
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmijpeg8 
-    gdcmijpeg12
-    gdcmijpeg16
-  )
-ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmijpeg8 
-    gdcmijpeg12
-    gdcmijpeg16
-    Wsock32.lib   #doesn't exist on cygwin
-  )
-ENDIF(UNIX)
+TARGET_LINK_LIBRARIES(gdcm 
+  gdcmjpeg8 
+  gdcmjpeg12
+  gdcmjpeg16
+)
+IF(WIN32)
+  IF(NOT BORLAND)
+    TARGET_LINK_LIBRARIES(gdcm Wsock32)
+  ENDIF(NOT BORLAND)
+ENDIF(WIN32)
 
 #The following is not working because when a header file is not found it tries 
 #to find one in the binary dir