Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / CMakeLists.txt

diff --git a/src/gromacs/gmxlib/nonbonded/CMakeLists.txt b/src/gromacs/gmxlib/nonbonded/CMakeLists.txt
index 350d054ec3610a31a0ae4be87c8b8959d912ebb5..761a622042cc9ec79e88cb90939fc54c784418ce 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/CMakeLists.txt
+++ b/src/gromacs/gmxlib/nonbonded/CMakeLists.txt
@@ -1,16 +1,19 @@
 # Sources that should always be built
 file(GLOB NONBONDED_SOURCES *.c nb_kernel_c/*.c)
 
-# For now we enable the (existing) SSE2 kernels for all accelerations
-if(((GMX_CPU_ACCELERATION STREQUAL "SSE2") OR
-    (GMX_CPU_ACCELERATION STREQUAL "SSE4.1") OR
+if(GMX_CPU_ACCELERATION STREQUAL "SSE2" AND NOT GMX_DOUBLE)
+    file(GLOB NONBONDED_SSE2_SINGLE_SOURCES nb_kernel_sse2_single/*.c)
+endif()
+
+# For now we enable the (existing) SSE4.1 kernels for all higher  accelerations
+if(((GMX_CPU_ACCELERATION STREQUAL "SSE4.1") OR
     (GMX_CPU_ACCELERATION STREQUAL "AVX_128_FMA") OR
     (GMX_CPU_ACCELERATION STREQUAL "AVX_256")) AND NOT GMX_DOUBLE)
-    file(GLOB NONBONDED_SSE2_SINGLE_SOURCES nb_kernel_sse2_single/*.c)
+    file(GLOB NONBONDED_SSE4_1_SINGLE_SOURCES nb_kernel_sse4_1_single/*.c)
 endif()
 
 # These sources will be used in the parent directory's CMakeLists.txt
-set(NONBONDED_SOURCES ${NONBONDED_SOURCES} ${NONBONDED_SSE2_SINGLE_SOURCES} PARENT_SCOPE)
+set(NONBONDED_SOURCES ${NONBONDED_SOURCES} ${NONBONDED_SSE2_SINGLE_SOURCES} ${NONBONDED_SSE4_1_SINGLE_SOURCES} PARENT_SCOPE)