ovito (0.9.5-2) 40-use-libmuparser.patch

Description: Use libmuparser-dev.
Author: Scott Howard <showard@debian.org>
Reviewed-by: Mònica Ramírez Arceda <monica@debian.org>
Bug-Debian: http://bugs.debian.org/651331
Last-Update: 2012-05-26

--- a/src/atomviz/CMakeLists.txt
+++ b/src/atomviz/CMakeLists.txt
@@ -173,19 +173,6 @@
 	benchmark/AtomVizBenchmarkUtility.cpp
 )
 
-# The source files of the muParser library.
-SET(AtomViz_muParser_SRCS
-	utils/muparser/muParser.cpp
-	utils/muparser/muParserBytecode.cpp
-	utils/muparser/muParserTest.cpp
-	utils/muparser/muParserDLL.cpp
-	utils/muparser/muParserInt.cpp
-	utils/muparser/muParserTokenReader.cpp
-	utils/muparser/muParserError.cpp
-	utils/muparser/muParserCallback.cpp
-	utils/muparser/muParserBase.cpp
-)
-
 # Add optional source file needed for POV-Ray export of atoms.
 IF(OVITO_BUILD_PLUGIN_POVRAY)
 	LIST(APPEND AtomViz_SRCS writer/Atoms2POVRay.cpp)
@@ -208,7 +195,7 @@
 
 # Generate plugin module.
 OVITO_PLUGIN(AtomViz
-	SOURCES PrecompiledHeader.cpp ${AtomViz_SRCS} ${AtomViz_MOC_SRCS} ${AtomViz_muParser_SRCS}
+	SOURCES PrecompiledHeader.cpp ${AtomViz_SRCS} ${AtomViz_MOC_SRCS}
 	LIB_DEPENDENCIES Mesh
 	OPTIONAL_PLUGIN_DEPENDENCIES Scripting POVRay Tachyon
 	RESOURCE atomviz.rcc resources/atomviz.qrc
@@ -221,3 +208,4 @@
 	INSTALL(DIRECTORY "${OVITO_SHARE_DIRECTORY}/scripts/atomviz" DESTINATION "${OVITO_RELATIVE_SHARE_DIRECTORY}/scripts" PATTERN ".svn" EXCLUDE)
 ENDIF(OVITO_BUILD_PLUGIN_SCRIPTING)
 
+TARGET_LINK_LIBRARIES(AtomViz Base Core Mesh muparser)
--- a/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp
+++ b/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp
@@ -22,7 +22,7 @@
 #include <core/Core.h>
 #include <core/undo/UndoManager.h>
 #include <core/scene/objects/ModifiedObject.h>
-#include <atomviz/utils/muparser/muParser.h>
+#include <muParser.h>
 
 #include "CreateExpressionChannelModifier.h"
 
@@ -141,7 +141,7 @@
 				parsers[i].DefineNameChars("0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.");
 
 				// Add the atan2() function.
-				parsers[i].DefineFun("atan2", atan2, false);
+				//parsers[i].DefineFun("atan2", atan2, false); INCLUDED IN MUPARSER 2.1.0
 
 				// Let the muParser process the math expression.
 				parsers[i].SetExpr(expr.toStdString());
--- a/src/atomviz/modifier/selection/SelectExpressionModifier.cpp
+++ b/src/atomviz/modifier/selection/SelectExpressionModifier.cpp
@@ -25,7 +25,7 @@
 #include <core/scene/objects/ModifiedObject.h>
 #include <core/gui/properties/StringPropertyUI.h>
 #include <core/gui/properties/BooleanPropertyUI.h>
-#include <atomviz/utils/muparser/muParser.h>
+#include <muParser.h>
 
 #include "SelectExpressionModifier.h"
 
@@ -93,7 +93,7 @@
 			parser.DefineNameChars("0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.");
 
 			// Add the atan2() function.
-			parser.DefineFun("atan2", atan2, false);
+			//parser.DefineFun("atan2", atan2, false); INCLUDED IN MUPARSER 2.1.0
 
 			// Let the muParser process the math expression.
 			parser.SetExpr(expression.toStdString());