Merge release-4-5-patches into release-4-6

Change-Id: I420226d869a1d755c731b9f65b66a29c233e9b6e

diff --git a/src/gmxlib/CMakeLists.txt b/src/gmxlib/CMakeLists.txt
index 708ede1f7e099e60d745005437b3df82efdaa520..c8ce87dfdf066bb3ac780e896cb04589e1f2b23d 100644 (file)
--- a/src/gmxlib/CMakeLists.txt
+++ b/src/gmxlib/CMakeLists.txt
@@ -111,7 +111,7 @@ file(GLOB SELECTION_TEST selection/test*)
 list(REMOVE_ITEM GMXLIB_SOURCES ${SELECTION_TEST})
 
 # only fiddle with assembly kernels if we're not doing OpenMM build
-if(NOT GMX_OPENMM) 
+if(GMX_SSEKERNEL_ASM_SRC AND NOT GMX_OPENMM)
 if(GMX_ASM_USEASM_NASM)
   enable_language(ASM_NASM)
 
@@ -139,7 +139,7 @@ else(GMX_ASM_USEASM_NASM)
   endif()
 
 endif(GMX_ASM_USEASM_NASM)
-endif(NOT GMX_OPENMM)
+endif(GMX_SSEKERNEL_ASM_SRC AND NOT GMX_OPENMM)
 
 add_library(gmx ${GMXLIB_SOURCES} ${BLAS_SOURCES} ${LAPACK_SOURCES} ${GMX_SSEKERNEL_C_SRC} ${GMX_SSEKERNEL_ASM_SRC} ${FORTRAN_SOURCES} ${GMX_BLUEGENE_C_SRC} ${GMX_PPC_ALTIVEC_SRC} ${THREAD_MPI_SRC})
 target_link_libraries(gmx ${GMX_EXTRA_LIBRARIES}  ${THREAD_LIB})