Merge branch 'master' of github.com:leeping/openmm

CMakeLists.txt

@@ -111,6 +111,11 @@ IF (APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
     SET (CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "The minimum version of OS X to support" FORCE)
 ENDIF (APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
 
+# Improve the linking behavior of Mac libraries
+IF (APPLE)
+    SET (CMAKE_INSTALL_NAME_DIR "@rpath")
+ENDIF (APPLE)
+
 IF(UNIX AND NOT CMAKE_BUILD_TYPE)
     SET(CMAKE_BUILD_TYPE Release CACHE STRING "Debug or Release build" FORCE)
 ENDIF (UNIX AND NOT CMAKE_BUILD_TYPE)
@@ -247,6 +252,7 @@ FOREACH(subdir ${OPENMM_SOURCE_SUBDIRS})
     ## OpenMM was previously installed there.
     INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/include)
 ENDFOREACH(subdir)
+SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/libraries/sfmt/src/SFMT.cpp PROPERTIES COMPILE_FLAGS "-msse2 -DHAVE_SSE2=1")
 
 # If API wrappers are being generated, and add them to the build.
 FIND_PROGRAM(GCCXML_PATH gccxml PATH
@@ -290,9 +296,9 @@ ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
 # On Linux need to link to libdl
 FIND_LIBRARY(DL_LIBRARY dl)
 IF(DL_LIBRARY)
-  TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${DL_LIBRARY})
+  TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${DL_LIBRARY} ${PTHREADS_LIB})
   IF(OPENMM_BUILD_STATIC_LIB)
-    TARGET_LINK_LIBRARIES(${STATIC_TARGET} ${DL_LIBRARY})
+    TARGET_LINK_LIBRARIES(${STATIC_TARGET} ${DL_LIBRARY} ${PTHREADS_LIB})
   ENDIF(OPENMM_BUILD_STATIC_LIB)
 ENDIF(DL_LIBRARY)
 IF(WIN32)
@@ -369,6 +375,13 @@ IF(OPENMM_BUILD_OPENCL_LIB)
     ADD_SUBDIRECTORY(platforms/opencl)
 ENDIF(OPENMM_BUILD_OPENCL_LIB)
 
+# Optimized CPU platform
+
+SET(OPENMM_BUILD_CPU_LIB ON CACHE BOOL "Build optimized CPU platform")
+IF(OPENMM_BUILD_CPU_LIB)
+   ADD_SUBDIRECTORY(platforms/cpu)
+ENDIF(OPENMM_BUILD_CPU_LIB)
+
 # Amoeba plugin
 
 SET(OPENMM_BUILD_AMOEBA_PLUGIN ON CACHE BOOL "Build Amoeba plugin")