Text archives Help

---

Author: cgribble
Date: Fri Jul 21 12:55:36 2006
New Revision: 1154

Added:
   trunk/include/UseStatsCollector.h.CMakeTemplate
Modified:
   trunk/CMakeLists.txt
   trunk/Core/Util/Stat.h
   trunk/DynLT/DynLTGridSpheres.h
   trunk/DynLT/DynLTWorker.cc
   trunk/include/CMakeLists.txt
   trunk/scenes/dynlt.cc
Log:
include/UseStatsCollector.h.CMakeTemplate
include/CMakeLists.txt
CMakeLists.txt
  Use CMakeTemplate file magic to avoid having a "-DUSE_STATS_COLLECTOR" and
    allow changes without rebuild the entire tree

Core/Util/Stat.h
DynLT/DynLTGridSpheres.h
DynLT/DynLTWorker.cc
scenes/dynlt.cc
  #include <UseStatsCollector.h> to enable/disable StatsCollector 
functionality


Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Fri Jul 21 12:55:36 2006
@@ -227,6 +227,8 @@
 ## We need SCI_NOPERSISTENT to be defined
 FORCE_ADD_CXX_FLAGS("-DSCI_NOPERSISTENT")
 
+SET(USE_STATS_COLLECTOR 0 CACHE BOOL "Enable stats collection")
+
 
###############################################################################
 ## Include the configured files
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
@@ -307,11 +309,6 @@
   ADD_DEFINITIONS(-DBUILD_DYNLT)
   SUBDIRS(DynLT)
 ENDIF(BUILD_DYNLT)
-
-SET(USE_STATS_COLLECTOR 0 CACHE BOOL "Enable stats collection")
-IF(USE_STATS_COLLECTOR)
-  ADD_DEFINITIONS(-DUSE_STATS_COLLECTOR)
-ENDIF(USE_STATS_COLLECTOR)
 
 ##################################################################
 # Look for Teem http://teem.sourceforge.net/

Modified: trunk/Core/Util/Stat.h
==============================================================================
--- trunk/Core/Util/Stat.h      (original)
+++ trunk/Core/Util/Stat.h      Fri Jul 21 12:55:36 2006
@@ -1,6 +1,7 @@
 #ifndef Manta_Core_Stat_h
 #define Manta_Core_Stat_h
 
+#include <UseStatsCollector.h>
 #include <SCIRun/Core/Thread/Mutex.h>
 
 #include <float.h>

Modified: trunk/DynLT/DynLTGridSpheres.h
==============================================================================
--- trunk/DynLT/DynLTGridSpheres.h      (original)
+++ trunk/DynLT/DynLTGridSpheres.h      Fri Jul 21 12:55:36 2006
@@ -2,6 +2,7 @@
 #ifndef Manta_DynLT_DynLTGridSpheres_h
 #define Manta_DynLT_DynLTGridSpheres_h
 
+#include <UseStatsCollector.h>
 #include <DynLT/DynLTStatsCollector.h>
 #include <Model/Primitives/GridSpheres.h>
 #include <SCIRun/Core/Thread/Mailbox.h>

Modified: trunk/DynLT/DynLTWorker.cc
==============================================================================
--- trunk/DynLT/DynLTWorker.cc  (original)
+++ trunk/DynLT/DynLTWorker.cc  Fri Jul 21 12:55:36 2006
@@ -1,4 +1,5 @@
 
+#include <UseStatsCollector.h>
 #include <DynLT/DynLTContext.h>
 #include <DynLT/DynLTGridSpheres.h>
 #include <DynLT/DynLTQueue.h>

Modified: trunk/include/CMakeLists.txt
==============================================================================
--- trunk/include/CMakeLists.txt        (original)
+++ trunk/include/CMakeLists.txt        Fri Jul 21 12:55:36 2006
@@ -53,3 +53,16 @@
   )
 
 
+###############################################################################
+## Configure UseStatsCollector.h
+
+IF(USE_STATS_COLLECTOR)
+  SET(USE_STATS_COLLECTOR_DEF "1" CACHE INTERNAL "Enable stats collection")
+ELSE(USE_STATS_COLLECTOR)
+  SET(USE_STATS_COLLECTOR_DEF "0" CACHE INTERNAL "Disable stats collection")
+ENDIF(USE_STATS_COLLECTOR)
+
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/UseStatsCollector.h.CMakeTemplate
+  ${CMAKE_BINARY_DIR}/include/UseStatsCollector.h
+  )

Added: trunk/include/UseStatsCollector.h.CMakeTemplate
==============================================================================
--- (empty file)
+++ trunk/include/UseStatsCollector.h.CMakeTemplate     Fri Jul 21 12:55:36 
2006
@@ -0,0 +1,36 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005-2006
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef Manta_Use_Stats_Collector_h
+#define Manta_Use_Stats_Collector_h
+
+#if ${USE_STATS_COLLECTOR_DEF}
+#define USE_STATS_COLLECTOR 1
+#endif
+
+#endif

Modified: trunk/scenes/dynlt.cc
==============================================================================
--- trunk/scenes/dynlt.cc       (original)
+++ trunk/scenes/dynlt.cc       Fri Jul 21 12:55:36 2006
@@ -1,4 +1,5 @@
 
+#include <UseStatsCollector.h>
 #include <Core/Color/RegularColorMap.h>
 #include <Core/Exceptions/IllegalArgument.h>
 #include <Core/Geometry/Vector.h>

---

• [MANTA] r1154 - in trunk: . Core/Util DynLT include scenes, cgribble, 07/21/2006

---

Archive powered by MHonArc 2.6.16.