From a2dc7f14b6bab4d1c55bc7621efa74bf8d3f7681 Mon Sep 17 00:00:00 2001 From: malaterre Date: Tue, 7 Jun 2005 17:30:07 +0000 Subject: [PATCH] ENH: Revamp a bit the build process to make the exe more like a library... --- src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt | 6 +++++- src/gdcmmpeg2/src/mpeg2dec/mpeg2dec.c | 2 ++ src/gdcmmpeg2/src/mpeg2enc/CMakeLists.txt | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt b/src/gdcmmpeg2/src/mpeg2dec/CMakeLists.txt index 033ace6c..942e5fa2 100644 --- 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 1e7bb2a2..f5f7dc43 100644 --- 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 e691ee6c..a653f09c 100644 --- 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 -- 2.48.1