- Comment out uselesss #define MAX (vtk-4.5 doesn't compile)

- Comment out doxygen target

diff --git a/lib/doxygen/CMakeLists.txt b/lib/doxygen/CMakeLists.txt
index e6ba0f2c2810659fb7b6ec881763422142df9a20..d03ccf5744eb17015cbd849efec4d0de71938024 100644 (file)
--- a/lib/doxygen/CMakeLists.txt
+++ b/lib/doxygen/CMakeLists.txt
@@ -55,10 +55,10 @@ MACRO(CREA_BUILD_DOXYGEN_DOC NAME INPUT DOC_RELATIVE_INSTALL_PATH PREDEFINED)
     ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.txt
     #  DEPENDS bbtk bbi 
     )
-  
-  ADD_CUSTOM_TARGET(doxygen_${NAME} ALL
-    DEPENDS  ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/index.html
-    )
+# Temp removed EED JPR  
+#  ADD_CUSTOM_TARGET(doxygen_${NAME} ALL
+#    DEPENDS  ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/index.html
+#    )
   
 #  INSTALL(
 #    DIRECTORY

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h
index d2d021861583cc01644f75baba90f6770b47fc7d..576da9987ff9dce2840da6f4db37b4bce6acaed0 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h
@@ -24,7 +24,7 @@
 #include "pPlotterScaleY.h"
 #include "pPlotterScaleX.h"
 
-#define MAX 500
+//#define MAX 500
 #define NUM_POINTS 100
 #define WINDOW_SIZE 10
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
index 078e9efe7d18ff74dc39a9c0c2fe714e04672d83..f559cc47c7a1d8ba6e9ff5c05e4178e714976a83 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
@@ -24,7 +24,7 @@
 #include "pPlotterScaleY.h"
 #include "pPlotterScaleX.h"
 
-#define MAX 500
+//#define MAX 500
 #define NUM_POINTS 100
 #define WINDOW_SIZE 10