X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=1ccabed4e0e8f5cafb2e7195e92627f64cd58857;hb=16eead9d9f2128578afe6c524987e45e49bc3138;hp=97b8086ffa129b6882a74f081fa06e1b3441fecd;hpb=83fb7ba2632adcb140889c5f71da6ccd53ecffa2;p=gdcm.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 97b8086f..1ccabed4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,65 +4,63 @@ SUBDIRS(jpeg) # "jpeglib.h" is defined here: INCLUDE_DIRECTORIES( - ${GDCM_SOURCE_DIR}/jpeg/libijg8 + ${GDCM_SOURCE_DIR}/src/jpeg/libijg8 #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12 + #${GDCM_SOURCE_DIR}/jpeg/ljpg # JPEG lib from xmedcom + ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h ) SET(libgdcm_la_SOURCES - gdcmException.cxx - gdcmUtil.cxx - gdcmHeader.cxx - gdcmHeaderHelper.cxx - gdcmElValue.cxx - gdcmDictEntry.cxx - gdcmDict.cxx - gdcmDictSet.cxx - gdcmElValSet.cxx - gdcmHeaderIdo.cxx - gdcmFile.cxx - gdcmVR.cxx - gdcmTS.cxx - gdcmJpeg.cxx - gdcmJpeg12.cxx - gdcmJpeg2000.cxx - gdcmRLE.cxx - gdcmParse.cxx - gdcmJpegIdo.cxx -) -#----------------------------------------------------------------------------- -# Why one should not use ADD_DEFINITIONS -# http://www.cmake.org/pipermail/cmake/2003-September/004286.html - -#----------------------------------------------------------------------------- -# __STDC_LIMIT_MACROS -> Refer to stdint.h -# http://www.cmake.org/pipermail/cmake/2003-October/004369.html -# http://www.cmake.org/pipermail/cmake/2003-October/004373.html - -SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES} - PROPERTIES - COMPILE_FLAGS "-D__STDC_LIMIT_MACROS -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\"" + gdcmDebug.cxx + gdcmDicomDir.cxx + gdcmDicomDirElement.cxx + gdcmDicomDirImage.cxx + gdcmDicomDirMeta.cxx + gdcmDicomDirPatient.cxx + gdcmDicomDirSerie.cxx + gdcmDicomDirStudy.cxx + gdcmDict.cxx + gdcmDictEntry.cxx + gdcmDictSet.cxx + gdcmDirList.cxx + gdcmException.cxx + gdcmFile.cxx + gdcmGlobal.cxx + gdcmHeader.cxx + gdcmHeaderEntry.cxx + gdcmHeaderHelper.cxx + gdcmJpeg12.cxx + gdcmJpeg2000.cxx + gdcmJpeg.cxx + gdcmObject.cxx + gdcmParsePixels.cxx + gdcmParser.cxx + gdcmRLE.cxx + gdcmTS.cxx + gdcmUtil.cxx + gdcmVR.cxx ) ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} ) -#TODO this is not working out of the box (on the first time) IF(UNIX) TARGET_LINK_LIBRARIES(gdcm gdcmijpeg8 gdcmijpeg12 + gdcmljpeg # JPEG lib from xmedcom ) ELSE(UNIX) TARGET_LINK_LIBRARIES(gdcm gdcmijpeg8 gdcmijpeg12 + gdcmljpeg Wsock32.lib #doesn't exist on cygwin ) ENDIF(UNIX) -#The following is not wroking because when a header file is not found it tries +#The following is not working because when a header file is not found it tries #to find one in the binary dir #INSTALL_FILES(/include .h ${libgdcm_la_SOURCES}) #INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h) INSTALL_FILES(/include "\\.h$") INSTALL_TARGETS(/lib/ gdcm) -#INSTALL_FILES(/include/vtk .h ${Kit_SRCS}) \ No newline at end of file