Commit 677b9f1a authored by peastman's avatar peastman
Browse files

Fixes to PPC support

parent cdfc47e4
...@@ -56,13 +56,13 @@ FOREACH(subdir ${OPENMM_SOURCE_SUBDIRS}) ...@@ -56,13 +56,13 @@ FOREACH(subdir ${OPENMM_SOURCE_SUBDIRS})
ENDFOREACH(subdir) ENDFOREACH(subdir)
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
IF (NOT MSVC) IF(NOT MSVC)
IF (ANDROID OR PNACL) IF(X86)
SET_SOURCE_FILES_PROPERTIES(${SOURCE_FILES} PROPERTIES COMPILE_FLAGS "")
ELSE (ANDROID OR PNACL)
SET_SOURCE_FILES_PROPERTIES(${SOURCE_FILES} PROPERTIES COMPILE_FLAGS "-msse4.1") SET_SOURCE_FILES_PROPERTIES(${SOURCE_FILES} PROPERTIES COMPILE_FLAGS "-msse4.1")
ENDIF (ANDROID OR PNACL) ELSE()
ENDIF (NOT MSVC) SET_SOURCE_FILES_PROPERTIES(${SOURCE_FILES} PROPERTIES COMPILE_FLAGS "")
ENDIF()
ENDIF()
# Include FFTW related files. # Include FFTW related files.
INCLUDE_DIRECTORIES(${FFTW_INCLUDES}) INCLUDE_DIRECTORIES(${FFTW_INCLUDES})
......
...@@ -54,7 +54,7 @@ void testCreateSystem() { ...@@ -54,7 +54,7 @@ void testCreateSystem() {
ASSERT_EQUAL(numParticles, system.getNumParticles()); ASSERT_EQUAL(numParticles, system.getNumParticles());
for (int i = 0; i < numParticles; i++) { for (int i = 0; i < numParticles; i++) {
double mass = (i == 5 ? 100.0 : 1.0+0.1*i); double mass = (i == 5 ? 100.0 : 1.0+0.1*i);
ASSERT_EQUAL(mass, system.getParticleMass(i)); ASSERT_EQUAL_TOL(mass, system.getParticleMass(i), 1e-15);
} }
// Test adding, removing, and modifying constraints. // Test adding, removing, and modifying constraints.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment