Several changes to get OpenMM to build on Linux

 * capitalization of gpuTypes.h
 * various cmake issues

CMakeLists.txt

@@ -14,6 +14,9 @@
 #   libOpenMM_static[_d].a
 #----------------------------------------------------
 
+# On Linux it appears that cmake 2.4 does not work with Cuda cmake rules
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
 # Don't create a new project name if this is part of a mega-build from the
 # parent directory
 IF( NOT PROJECT_NAME )
@@ -22,7 +25,7 @@ ENDIF( NOT PROJECT_NAME )
 
 INCLUDE(Dart)
 
-SUBDIRS (tests platforms/reference/tests platforms/cuda)
+SUBDIRS (platforms/reference/tests platforms/cuda)
 
 ADD_DEFINITIONS(-DOPENMM_BUILDING_SHARED_LIBRARY)
 

platforms/cuda/CMakeLists.txt

@@ -93,7 +93,7 @@ FOREACH(subdir ${OPENMM_SOURCE_SUBDIRS})
     FILE(GLOB src_files ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/src/*.cu  ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/src/*/*.cu)
     FOREACH(file ${src_files})
         FILE(RELATIVE_PATH file ${CMAKE_CURRENT_SOURCE_DIR} ${file})
-        MESSAGE(${file})
+        # MESSAGE(${file})
         SET(SOURCE_FILES         ${SOURCE_FILES}         ${file})   #append
     ENDFOREACH(file)
     CUDA_INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/include)

platforms/cuda/cuda-cmake/parse_cubin.cmake

@@ -98,8 +98,8 @@ IF (${file_text} MATCHES ".+")
 
   ENDFOREACH(line) 
 
-ELSE(${depend_text} MATCHES ".+") 
+ELSE(${file_text} MATCHES ".+") 
   # MESSAGE("FOUND NO DEPENDS")
-ENDIF(${depend_text} MATCHES ".+")
+ENDIF(${file_text} MATCHES ".+")
 
 

platforms/cuda/src/CudaKernels.h

@@ -34,7 +34,7 @@
 
 #include "CudaPlatform.h"
 #include "kernels.h"
-#include "kernels/gpuTypes.h"
+#include "kernels/gputypes.h"
 #include "System.h"
 
 class CudaAndersenThermostat;

platforms/cuda/src/CudaPlatform.cpp

@@ -33,7 +33,7 @@
 #include "CudaKernelFactory.h"
 #include "CudaKernels.h"
 #include "internal/OpenMMContextImpl.h"
-#include "kernels/gpuTypes.h"
+#include "kernels/gputypes.h"
 #include "System.h"
 
 using namespace OpenMM;

platforms/cuda/src/CudaStreamFactory.cpp

@@ -34,7 +34,7 @@
 #include "CudaStreamImpl.h"
 #include "OpenMMException.h"
 #include "internal/OpenMMContextImpl.h"
-#include "kernels/gpuTypes.h"
+#include "kernels/gputypes.h"
 
 using namespace OpenMM;
 

platforms/cuda/tests/TestCudaRandom.cpp

@@ -34,7 +34,7 @@
  */
 
 #include "../../../tests/AssertionUtilities.h"
-#include "../src/kernels/gpuTypes.h"
+#include "../src/kernels/gputypes.h"
 #include "../src/kernels/cudaKernels.h"
 #include <iostream>
 

platforms/reference/src/ReferenceKernels.cpp

@@ -648,7 +648,7 @@ void ReferenceRemoveCMMotionKernel::initialize(const System& system, const CMMot
 }
 
 void ReferenceRemoveCMMotionKernel::execute(OpenMMContextImpl& context) {
-    int step = std::floor(context.getTime()/context.getIntegrator().getStepSize());
+    int step = (int)std::floor(context.getTime()/context.getIntegrator().getStepSize());
     if (step%frequency != 0)
         return;
     RealOpenMM** velData = ((ReferenceFloatStreamImpl&) context.getVelocities().getImpl()).getData();