\r
# "jpeglib.h" is defined here:\r
INCLUDE_DIRECTORIES(\r
- ${GDCM_SOURCE_DIR}/jpeg/libijg8\r
+ ${GDCM_SOURCE_DIR}/src/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
+ ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h\r
)\r
\r
SET(libgdcm_la_SOURCES\r
- gdcmException.cxx\r
- gdcmUtil.cxx\r
- gdcmHeader.cxx\r
- gdcmHeaderHelper.cxx\r
- gdcmElValue.cxx\r
- gdcmDictEntry.cxx\r
- gdcmDict.cxx\r
- gdcmDictSet.cxx\r
- gdcmElValSet.cxx\r
- gdcmHeaderIdo.cxx\r
- gdcmFile.cxx\r
- gdcmVR.cxx\r
- gdcmTS.cxx\r
- gdcmJpeg.cxx\r
- gdcmJpeg12.cxx\r
- gdcmJpeg2000.cxx\r
- gdcmRLE.cxx\r
- gdcmParse.cxx\r
- gdcmJpegIdo.cxx\r
-)\r
-#-----------------------------------------------------------------------------\r
-# Why one should not use ADD_DEFINITIONS\r
-# http://www.cmake.org/pipermail/cmake/2003-September/004286.html\r
-\r
-#-----------------------------------------------------------------------------\r
-# __STDC_LIMIT_MACROS -> Refer to stdint.h\r
-# http://www.cmake.org/pipermail/cmake/2003-October/004369.html\r
-# http://www.cmake.org/pipermail/cmake/2003-October/004373.html\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
+ gdcmDebug.cxx\r
+ gdcmDicomDir.cxx\r
+ gdcmDicomDirElement.cxx\r
+ gdcmDicomDirImage.cxx\r
+ gdcmDicomDirMeta.cxx\r
+ gdcmDicomDirPatient.cxx\r
+ gdcmDicomDirSerie.cxx\r
+ gdcmDicomDirStudy.cxx\r
+ gdcmDict.cxx\r
+ gdcmDictEntry.cxx\r
+ gdcmDictSet.cxx\r
+ gdcmDirList.cxx\r
+ gdcmException.cxx\r
+ gdcmFile.cxx\r
+ gdcmGlobal.cxx\r
+ gdcmHeader.cxx\r
+ gdcmHeaderEntry.cxx\r
+ gdcmHeaderHelper.cxx\r
+ gdcmJpeg12.cxx\r
+ gdcmJpeg2000.cxx\r
+ gdcmJpeg.cxx\r
+ gdcmObject.cxx\r
+ gdcmParsePixels.cxx\r
+ gdcmParser.cxx\r
+ gdcmRLE.cxx\r
+ gdcmTS.cxx\r
+ gdcmUtil.cxx\r
+ gdcmVR.cxx\r
)\r
\r
ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )\r
-#TODO this is not working out of the box (on the first time)\r
IF(UNIX)\r
TARGET_LINK_LIBRARIES(gdcm \r
gdcmijpeg8 \r
gdcmijpeg12\r
+ gdcmljpeg # JPEG lib from xmedcom \r
)\r
ELSE(UNIX)\r
TARGET_LINK_LIBRARIES(gdcm \r
gdcmijpeg8 \r
gdcmijpeg12\r
+ gdcmljpeg\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