# Build jpeg lib first:\r
SUBDIRS(jpeg)\r
\r
+# "jpeglib.h" is defined here:\r
INCLUDE_DIRECTORIES(\r
- ${GDCM_SOURCE_DIR}/jpeg/\r
+ ${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
SET(libgdcm_la_SOURCES\r
gdcmJpeg2000.cxx\r
gdcmRLE.cxx\r
gdcmParse.cxx\r
- gdcmJpegIdo.cxx\r
)\r
#-----------------------------------------------------------------------------\r
# Why one should not use ADD_DEFINITIONS\r
\r
SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES}\r
PROPERTIES\r
- COMPILE_FLAGS "-D__STDC_LIMIT_MACROS -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""\r
+ COMPILE_FLAGS "-D__STDC_LIMIT_MACROS -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""\r
)\r
\r
ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )\r
TARGET_LINK_LIBRARIES(gdcm \r
gdcmijpeg8 \r
gdcmijpeg12\r
+ gdcmjpeg # JPEG lib from xmedcom \r
)\r
ELSE(UNIX)\r
TARGET_LINK_LIBRARIES(gdcm \r
gdcmijpeg8 \r
gdcmijpeg12\r
+ gdcmjpeg\r
Wsock32.lib #doesn't exist on cygwin\r
)\r
ENDIF(UNIX)\r
\r
-#The following is not wroking because when a header file is not found it tries \r
+#The following is not working because when a header file is not found it tries \r
#to find one in the binary dir\r
#INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})\r
#INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)\r
INSTALL_FILES(/include "\\.h$")\r
\r
-INSTALL_TARGETS(/lib/ gdcm)
\ No newline at end of file
+INSTALL_TARGETS(/lib/ gdcm)\r
+#INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
\ No newline at end of file