From: delmon Date: Tue, 22 Feb 2011 08:35:07 +0000 (+0000) Subject: BUG: Add PrintMemory Symbol to clitkCommon even if CLITK_MEMORY_INFO is OFF X-Git-Tag: v1.2.0~229 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f074d8bb87321b2549a09829167fb96a0f8f6d06;p=clitk.git BUG: Add PrintMemory Symbol to clitkCommon even if CLITK_MEMORY_INFO is OFF --- diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index a4b2614..2060486 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -31,24 +31,20 @@ SET(clitkCommon_SRC clitkImageToImageGenericFilterBase.cxx clitkExceptionObject.cxx clitkFilterBase.cxx + clitkMemoryUsage.cxx ) +### Declare clitkCommon library +ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC}) + ### if LIBSTATGRAB is installed, add clitkMemoryUsage.cxx in the library IF(CLITK_MEMORY_INFO) FIND_PROGRAM(LIBSTATGRAB NAMES statgrab PATHS) IF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND") MESSAGE( FATAL_ERROR "libstatgrab NOT FOUND -> please install http://www.i-scream.org/libstatgrab/") ELSE (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND") - SET(clitkCommon_SRC ${clitkCommon_SRC} clitkMemoryUsage.cxx) - ENDIF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND") -ENDIF(CLITK_MEMORY_INFO) - -### Declare clitkCommon library -ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC}) - -### Add libstatgrab if needed -IF(CLITK_MEMORY_INFO) TARGET_LINK_LIBRARIES(clitkCommon statgrab) + ENDIF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND") ENDIF(CLITK_MEMORY_INFO) TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging vtkHybrid ITKBasicFilters)