Merge https://github.com/SimTk/openmm

platforms/cuda/tests/TestCudaCustomBondForce.cpp

@@ -39,7 +39,7 @@
 #include "openmm/CustomBondForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>
 

platforms/cuda/tests/TestCudaCustomExternalForce.cpp

@@ -39,7 +39,7 @@
 #include "openmm/CustomExternalForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/cuda/tests/TestCudaCustomIntegrator.cpp

@@ -41,7 +41,7 @@
 #include "openmm/NonbondedForce.h"
 #include "openmm/System.h"
 #include "openmm/CustomIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/cuda/tests/TestCudaEwald.cpp

@@ -42,7 +42,7 @@
 #include "openmm/LangevinIntegrator.h"
 #include "openmm/VerletIntegrator.h"
 #include "openmm/internal/ContextImpl.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/cuda/tests/TestCudaGBSAOBCForce.cpp

@@ -40,7 +40,7 @@
 #include "openmm/GBSAOBCForce.h"
 #include "openmm/System.h"
 #include "openmm/LangevinIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include "openmm/NonbondedForce.h"
 #include <iostream>

platforms/cuda/tests/TestCudaHarmonicAngleForce.cpp

@@ -40,7 +40,7 @@
 #include "openmm/HarmonicAngleForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>
 

platforms/cuda/tests/TestCudaLangevinIntegrator.cpp

@@ -40,7 +40,7 @@
 #include "openmm/NonbondedForce.h"
 #include "openmm/System.h"
 #include "openmm/LangevinIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/cuda/tests/TestCudaMonteCarloBarostat.cpp

@@ -42,7 +42,7 @@
 #include "openmm/LangevinIntegrator.h"
 #include "openmm/VerletIntegrator.h"
 #include "sfmt/SFMT.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>
 

platforms/cuda/tests/TestCudaMultipleForces.cpp

@@ -44,7 +44,7 @@
 #include "openmm/RBTorsionForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/cuda/tests/TestCudaNonbondedForce.cpp

@@ -45,7 +45,7 @@
 #include "openmm/internal/ContextImpl.h"
 #include "CudaArray.h"
 #include "CudaNonbondedUtilities.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/cuda/tests/TestCudaPeriodicTorsionForce.cpp

@@ -39,7 +39,7 @@
 #include "openmm/PeriodicTorsionForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>
 

platforms/cuda/tests/TestCudaRBTorsionForce.cpp

@@ -39,7 +39,7 @@
 #include "openmm/RBTorsionForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>
 

platforms/cuda/tests/TestCudaRandom.cpp

@@ -34,14 +34,14 @@
  */
 
 #include "openmm/internal/AssertionUtilities.h"
-#include "../src/CudaArray.h"
-#include "../src/CudaContext.h"
-#include "../src/CudaIntegrationUtilities.h"
+#include "CudaArray.h"
+#include "CudaContext.h"
+#include "CudaIntegrationUtilities.h"
 #include "openmm/System.h"
 #include "openmm/Context.h"
 #include "CudaPlatform.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <iostream>
 
 using namespace OpenMM;

platforms/cuda/tests/TestCudaSort.cpp

@@ -34,9 +34,9 @@
  */
 
 #include "openmm/internal/AssertionUtilities.h"
-#include "../src/CudaArray.h"
-#include "../src/CudaContext.h"
-#include "../src/CudaSort.h"
+#include "CudaArray.h"
+#include "CudaContext.h"
+#include "CudaSort.h"
 #include "sfmt/SFMT.h"
 #include "openmm/System.h"
 #include <iostream>

platforms/cuda/tests/TestCudaVariableLangevinIntegrator.cpp

@@ -40,7 +40,7 @@
 #include "openmm/NonbondedForce.h"
 #include "openmm/System.h"
 #include "openmm/VariableLangevinIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/cuda/tests/TestCudaVariableVerletIntegrator.cpp

@@ -40,7 +40,7 @@
 #include "openmm/NonbondedForce.h"
 #include "openmm/System.h"
 #include "openmm/VariableVerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/cuda/tests/TestCudaVerletIntegrator.cpp

@@ -40,7 +40,7 @@
 #include "openmm/NonbondedForce.h"
 #include "openmm/System.h"
 #include "openmm/VerletIntegrator.h"
-#include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include "sfmt/SFMT.h"
 #include <iostream>
 #include <vector>

platforms/opencl/CMakeLists.txt

@@ -102,4 +102,9 @@ SET(CL_KERNELS_H ${CMAKE_CURRENT_BINARY_DIR}/src/${CL_SOURCE_CLASS}.h)
 SET(SOURCE_FILES ${SOURCE_FILES} ${CL_KERNELS_CPP} ${CL_KERNELS_H})
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/src)
 
+# Install headers
+
+FILE(GLOB CORE_HEADERS include/*.h)
+INSTALL_FILES(/include/openmm/opencl FILES ${CORE_HEADERS})
+
 SUBDIRS (sharedTarget)