From: malaterre <malaterre>
Date: Wed, 22 Oct 2003 10:04:54 +0000 (+0000)
Subject: *FIX: When copying a Makefile.am to CMakeLists.txt one should remove the '\'
X-Git-Tag: Version0.3.1~93
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=530408ad94b783e1de68e31fdfc9b7306f8397b4;p=gdcm.git

*FIX: When copying a Makefile.am to CMakeLists.txt one should remove the '\'
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 43e70ff9..bd6823a1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,6 @@ INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/jpeg/libijg8
   #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
   #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom 
-                                    #
 )
 
 SET(libgdcm_la_SOURCES
@@ -57,7 +56,7 @@ ELSE(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
-    gdcmjpeg
 
+    gdcmjpeg
     Wsock32.lib   #doesn't exist on cygwin
   )
 ENDIF(UNIX)
diff --git a/src/jpeg/ljpg/CMakeLists.txt b/src/jpeg/ljpg/CMakeLists.txt
index b1f6722c..62c83600 100644
--- a/src/jpeg/ljpg/CMakeLists.txt
+++ b/src/jpeg/ljpg/CMakeLists.txt
@@ -1,37 +1,22 @@
-#LTVERSION = 0:1:0
-
-#lib_LTLIBRARIES = libgdcmjpg.la
-
-##CXXFLAGS = @CXXFLAGS@
-
 SET(libgdcmjpg_la_SOURCES
- decomp.c   \
- huffd.c    \
- jpegutil.c \
- mcu.c      \
- predict.c  \
+ decomp.c
+ huffd.c
+ jpegutil.c
+ mcu.c
+ predict.c
  read.c
 )
 
-#libgdcmjpgincludedir = $(includedir)
-SET(llibgdcmjpginclude_HEADERS
- io.h       \
- jpeg.h     \
- jpegless.h \
- mcu.h      \
- predict.h  \
+SET(libgdcmjpginclude_HEADERS
+ io.h
+ jpeg.h
+ jpegless.h
+ mcu.h
+ predict.h
  proto.h
 )
 
-#EXTRA_DIST = \
-#   jconfig.linux \
-#   jconfig.vc
+ADD_LIBRARY(gdcmjpeg ${libgdcmjpg_la_SOURCES})
 
-ADD_LIBRARY(gdcmjpeg ${libgdcmjpeg_la_SOURCES})
-
-#INSTALL_FILES(/include "\\.h$")
 INSTALL_FILES(/include FILES ${libgdcmjpeginclude_HEADERS})
-#INSTALL_FILES(/include FILES jconfig.linux jconfig.vc)
-INSTALL_FILES(/include FILES jconfig.linux)
-
 INSTALL_TARGETS(/lib/ gdcmjpeg)
\ No newline at end of file