ENH: Revamp a bit the build process to make the exe more like a library...

diff --git a/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt b/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt
index 033ace6ca83dccfeb7c7b3161e6442cb4c2830fa..942e5fa2866279e7a4cb3f865696d269a401efdd 100644 (file)
--- a/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt
+++ b/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 SET(GDCM_MPEG2DEC_SOURCES
   getpic.c
   motion.c
@@ -15,10 +17,12 @@ SET(GDCM_MPEG2DEC_SOURCES
   subspic.c
   #  verify.c
   )
-ADD_LIBRARY(gdcmmpeg2 ${GDCM_MPEG2DEC_SOURCES} )
+
+ADD_LIBRARY(gdcmmpeg2 ${GDCM_MPEG2DEC_SOURCES} mpeg2dec.c)
 IF(UNIX)
   TARGET_LINK_LIBRARIES(gdcmmpeg2 -lm)
 ENDIF(UNIX)
 
+#ADD_DEFINITIONS(-DGDCM_BUILD_MPEG2DEC)
 #ADD_EXECUTABLE(mpeg2decode mpeg2dec.c)
 #TARGET_LINK_LIBRARIES(mpeg2decode gdcmmpeg2)

diff --git a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
index 1e7bb2a277e64818d5df1ace895f2aadeca7b842..f5f7dc43f1740c6cc6b6a171865bf0ad561ea960 100644 (file)
--- a/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
+++ b/src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c
@@ -77,6 +77,7 @@ int my_close(int infile)
 
 
 
+#ifdef GDCM_BUILD_MPEG2DEC
 int main(argc,argv)
 int argc;
 char *argv[];
@@ -181,6 +182,7 @@ char *argv[];
 
   return ret;
 }
+#endif /*GDCM_BUILD_MPEG2DEC*/
 
 /* IMPLEMENTATION specific routines */
 static void Initialize_Decoder()

diff --git a/src/gdcmmpeg2/src/mpeg2enc/CMakeLists.txt b/src/gdcmmpeg2/src/mpeg2enc/CMakeLists.txt
index e691ee6ca034f4f1896157a874bfe8a93da09f98..a653f09c38bc6758cecb58ae381d9637ee83bd07 100644 (file)
--- a/src/gdcmmpeg2/src/mpeg2enc/CMakeLists.txt
+++ b/src/gdcmmpeg2/src/mpeg2enc/CMakeLists.txt
@@ -1,3 +1,5 @@
+INCLUDE_REGULAR_EXPRESSION("^.*$")
+
 SET(GDCM_MPEG2ENC_SOURCES
   conform.c
   putseq.c