*ENH: Turn it into DOS file type to match libgdcmijpeg8.dsp file type

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c5f999bd3668780d8b1e671a6655041394afc217..f8848c8c88a647f3dafa998e650d85bdd2b15e70 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,13 @@
+#-----------------------------------------------------------------------------\r
+# Build jpeg lib first:\r
 SUBDIRS(jpeg)\r
 \r
-#CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \\r
-#           -D__STDC_LIMIT_MACROS  # Refer to stdint.h\r
-\r
+# "jpeglib.h" is defined here:\r
+INCLUDE_DIRECTORIES(\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
        gdcmException.cxx\r
@@ -23,42 +28,20 @@ SET(libgdcm_la_SOURCES
        gdcmJpeg2000.cxx\r
        gdcmRLE.cxx\r
        gdcmParse.cxx\r
-       gdcmJpegIdo.cxx\r
-)\r
-#Why one should not use ADD_DEFINITIONS\r
-#http://www.cmake.org/pipermail/cmake/2003-September/004286.html\r
-#ADD_DEFINITIONS(-DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}/\\")\r
-ADD_DEFINITIONS(-D__STDC_LIMIT_MACROS)\r
-\r
-SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES} \r
-  PROPERTIES \r
-  COMPILE_FLAGS  -D__STDC_LIMIT_MACROS\r
-  COMPILE_FLAGS  -DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\"\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
-#libgdcminclude_HEADERS =   \\r
-#      gdcmException.h    \\r
-#      gdcmHeader.h       \\r
-#      gdcmHeaderHelper.h \\r
-#      gdcmCommon.h       \\r
-#      gdcm.h             \\r
-#      gdcmDictSet.h      \\r
-#      gdcmDict.h         \\r
-#      gdcmDictEntry.h    \\r
-#      gdcmElValue.h      \\r
-#      gdcmElValSet.h     \\r
-#      gdcmVR.h           \\r
-#      gdcmTS.h           \\r
-#      gdcmFile.h\r
-\r
-#EXTRA_DIST =            \\r
-#      gdcmUtil.h      \\r
-#      gdcmIdo.h       \\r
-#      iddcmjpeg.h\r
-\r
-\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
+)\r
 \r
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )\r
 #TODO this is not working out of the box (on the first time)\r
@@ -66,11 +49,22 @@ IF(UNIX)
   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)
\ No newline at end of file
+ENDIF(UNIX)\r
+\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)\r
+#INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
\ No newline at end of file