Merge remote-tracking branch 'gerrit/release-4-6'

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

diff --git a/src/gromacs/CMakeLists.txt b/src/gromacs/CMakeLists.txt
index 9951d6d083edacaec8b6ff51e0542d71b83bd2b4..2f473f7f41ebfc5cb5b34ad3da04a3f445c2f2f3 100644 (file)
--- a/src/gromacs/CMakeLists.txt
+++ b/src/gromacs/CMakeLists.txt
@@ -17,34 +17,7 @@ file(GLOB LIBGROMACS_HEADERS *.h)
 install(FILES ${LIBGROMACS_HEADERS} DESTINATION ${INCL_INSTALL_DIR}/gromacs
         COMPONENT development)
 
-# only fiddle with assembly kernels if we're not doing OpenMM build
-if(GMX_SSEKERNEL_ASM_SRC AND NOT GMX_OPENMM)
-if(GMX_ASM_USEASM_NASM)
-  enable_language(ASM_NASM)
-  # if NASM is used, we need a special build command for windows...
-  FOREACH(SRC ${GMX_SSEKERNEL_ASM_SRC})
-    GET_FILENAME_COMPONENT(FILE_BASE ${SRC} NAME_WE)
-    SET(OBJ ${CMAKE_CURRENT_BINARY_DIR}/${FILE_BASE}${CMAKE_C_OUTPUT_EXTENSION})
-
-    ADD_CUSTOM_COMMAND(OUTPUT ${OBJ}
-                       MAIN_DEPENDENCY ${SRC}
-                       COMMAND ${CMAKE_ASM_NASM_COMPILER} -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o ${OBJ} ${SRC})
-
-    SET(ALL_ASM_OBJS ${ALL_ASM_OBJS} ${OBJ})
-  ENDFOREACH(SRC ${GMX_SSEKERNEL_ASM_SRC})
-  set(GMX_SSEKERNEL_ASM_SRC ${ALL_ASM_OBJS})
-else(GMX_ASM_USEASM_NASM)
-  enable_language(ASM-ATT)
-  SET(CMAKE_ASM-ATT_COMPILER ${CMAKE_C_COMPILER})
-  if(GMX_IA32_ASM)
-    set_source_files_properties(${GMX_SSEKERNEL_ASM_SRC} PROPERTIES COMPILE_FLAGS "-c -m32")
-  else()
-    set_source_files_properties(${GMX_SSEKERNEL_ASM_SRC} PROPERTIES COMPILE_FLAGS "-c -m64")
-  endif()
-endif(GMX_ASM_USEASM_NASM)
-endif(GMX_SSEKERNEL_ASM_SRC AND NOT GMX_OPENMM)
-
-list(APPEND LIBGROMACS_SOURCES ${GMXLIB_SOURCES} ${GMX_SSEKERNEL_ASM_SRC} ${MDLIB_SOURCES})
+list(APPEND LIBGROMACS_SOURCES ${GMXLIB_SOURCES} ${MDLIB_SOURCES})
 
 # add target that generates version.c every time a make is run
 # only do this if we generate the version