Improved option disabling on switching to OpenMM build in a non-clean build tree

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

diff --git a/src/gmxlib/CMakeLists.txt b/src/gmxlib/CMakeLists.txt
index ac9cd2aceae2539366ec5c60ba5bfdbc9252b3ac..03a5cba0d6bc3427e3eacc1841048b0d28cef83e 100644 (file)
--- a/src/gmxlib/CMakeLists.txt
+++ b/src/gmxlib/CMakeLists.txt
@@ -87,6 +87,8 @@ if(GMX_FAHCORE)
     list(REMOVE_ITEM GMXLIB_SOURCES ${SELECTION_TEST})
 endif(GMX_FAHCORE)
 
+# only fiddle with assembly kernels if we're not doing OpenMM build
+if(NOT GMX_OPENMM) 
 if(GMX_ASM_USEASM-NASM)
   enable_language(ASM-NASM)
 
@@ -114,6 +116,7 @@ else(GMX_ASM_USEASM-NASM)
   endif()
 
 endif(GMX_ASM_USEASM-NASM)
+endif(NOT GMX_OPENMM)
 
 add_library(gmx ${GMXLIB_SOURCES} ${BLAS_SOURCES} ${LAPACK_SOURCES} ${GMX_SSEKERNEL_C_SRC} ${GMX_SSEKERNEL_ASM_SRC} ${THREAD_MPI_SRC})
 target_link_libraries(gmx ${GMX_EXTRA_LIBRARIES}  ${THREAD_LIB})