Don't enable ASM if no asm kernel is selected
authorRoland Schulz <roland@utk.edu>
Sun, 29 Apr 2012 04:29:44 +0000 (00:29 -0400)
committerRoland Schulz <roland@utk.edu>
Sun, 29 Apr 2012 04:29:44 +0000 (00:29 -0400)
Caused that -DGMX_ACCELERATION=none didn't compile without
asm installed.

Change-Id: I572d64b94af89516ef35336190636ead6a256c0f

src/gmxlib/CMakeLists.txt

index ca8fd547973ef28789668372a1ddd246c3300c42..8be047595a02d3931652e0ce158a41e26a37f241 100644 (file)
@@ -106,7 +106,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)
 
@@ -134,7 +134,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})