Various changes to permit compiling OpenMM stuff on Linux

Added INCLUDE(Dart) to OpenMM CMakeLists.txt

CMakeLists.txt

@@ -16,6 +16,8 @@
 
 PROJECT (OpenMM)
 
+INCLUDE(Dart)
+
 SUBDIRS (tests platforms/reference/tests)
 
 ADD_DEFINITIONS(-DOPENMM_BUILDING_SHARED_LIBRARY)

olla/include/KernelImpl.h

@@ -34,6 +34,7 @@
 
 #include "Platform.h"
 #include <string>
+#include <cassert>
 
 namespace OpenMM {
 

olla/include/StreamImpl.h

@@ -35,6 +35,7 @@
 #include "Platform.h"
 #include "Stream.h"
 #include <string>
+#include <cassert>
 
 namespace OpenMM {
 

openmmapi/include/Integrator.h

@@ -39,6 +39,7 @@
 namespace OpenMM {
 
 class OpenMMContext;
+class OpenMMContextImpl;
 
 /**
  * An Integrator defines a method for simulating a System by integrating the equations of motion.

openmmapi/include/System.h

@@ -134,7 +134,7 @@ public:
     }
 private:
     class ConstraintInfo;
-    std::vector<int> masses;
+    std::vector<double> masses;
     std::vector<ConstraintInfo> constraints;
     std::vector<Force*> forces;
 };

platforms/reference/src/SimTKReference/ReferenceLJCoulomb14.h

@@ -69,7 +69,7 @@ class ReferenceLJCoulomb14 : public ReferenceBondIxn {
       
          --------------------------------------------------------------------------------------- */
       
-      int ReferenceLJCoulomb14::getDerivedParameters( RealOpenMM c6, RealOpenMM c12, RealOpenMM q1, 
+      int getDerivedParameters( RealOpenMM c6, RealOpenMM c12, RealOpenMM q1, 
                                                RealOpenMM q2, RealOpenMM epsfac,
                                                RealOpenMM* parameters ) const;