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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 43e70ff9729c1b5e90ca56eb9a4a23e56cd46b82..bd6823a1c908c774bcc31590de8251535c90c28b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,6 @@ INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/jpeg/libijg8\r
   #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12\r
   #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom \r
-                                    #\r
 )\r
 \r
 SET(libgdcm_la_SOURCES\r
@@ -57,7 +56,7 @@ ELSE(UNIX)
   TARGET_LINK_LIBRARIES(gdcm \r
     gdcmijpeg8 \r
     gdcmijpeg12\r
-    gdcmjpeg\r 
+    gdcmjpeg\r
     Wsock32.lib   #doesn't exist on cygwin\r
   )\r
 ENDIF(UNIX)\r

diff --git a/src/jpeg/ljpg/CMakeLists.txt b/src/jpeg/ljpg/CMakeLists.txt
index b1f6722c079e5e84d0cb7f01ddaf9740a8c7a36b..62c836006c03011451ccc4a5a7db4f288a7f719c 100644 (file)
--- a/src/jpeg/ljpg/CMakeLists.txt
+++ b/src/jpeg/ljpg/CMakeLists.txt
@@ -1,37 +1,22 @@
-#LTVERSION = 0:1:0\r
-\r
-#lib_LTLIBRARIES = libgdcmjpg.la\r
-\r
-##CXXFLAGS = @CXXFLAGS@\r
-\r
 SET(libgdcmjpg_la_SOURCES\r
- decomp.c   \\r
- huffd.c    \\r
- jpegutil.c \\r
- mcu.c      \\r
- predict.c  \\r
+ decomp.c\r
+ huffd.c\r
+ jpegutil.c\r
+ mcu.c\r
+ predict.c\r
  read.c\r
 )\r
 \r
-#libgdcmjpgincludedir = $(includedir)\r
-SET(llibgdcmjpginclude_HEADERS\r
- io.h       \\r
- jpeg.h     \\r
- jpegless.h \\r
- mcu.h      \\r
- predict.h  \\r
+SET(libgdcmjpginclude_HEADERS\r
+ io.h\r
+ jpeg.h\r
+ jpegless.h\r
+ mcu.h\r
+ predict.h\r
  proto.h\r
 )\r
 \r
-#EXTRA_DIST = \\r
-#   jconfig.linux \\r
-#   jconfig.vc\r
+ADD_LIBRARY(gdcmjpeg ${libgdcmjpg_la_SOURCES})\r
 \r
-ADD_LIBRARY(gdcmjpeg ${libgdcmjpeg_la_SOURCES})\r
-\r
-#INSTALL_FILES(/include "\\.h$")\r
 INSTALL_FILES(/include FILES ${libgdcmjpeginclude_HEADERS})\r
-#INSTALL_FILES(/include FILES jconfig.linux jconfig.vc)\r
-INSTALL_FILES(/include FILES jconfig.linux)\r
-\r
 INSTALL_TARGETS(/lib/ gdcmjpeg)
\ No newline at end of file