set(CMAKE_C_FLAGS "${SIMD_C_FLAGS} ${MPI_COMPILE_FLAGS} ${EXTRA_C_FLAGS} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${SIMD_CXX_FLAGS} ${MPI_COMPILE_FLAGS} ${EXTRA_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${FFT_LINKER_FLAGS} ${MPI_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
- set(CMAKE_SHARED_LINKER_FLAGS "${MPI_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}")
+ set(CMAKE_SHARED_LINKER_FLAGS "${FFT_LINKER_FLAGS} ${MPI_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}")
else()
message("Recommended flags which are not added because GMX_SKIP_DEFAULT_CFLAGS=yes:")
message("CMAKE_C_FLAGS: ${SIMD_C_FLAGS} ${MPI_COMPILE_FLAGS} ${EXTRA_C_FLAGS} ${GMXC_CFLAGS}")
if (NOT MKL_MANUALLY)
# The next line takes care of everything for MKL
if (WIN32)
- set(FFT_LINKER_FLAGS "/Qmkl=sequential")
+ # This works according to the Intel MKL 10.3 for Windows
+ # docs, but on Jenkins Win2k8, icl tries to interpret it
+ # as a file. Shrug.
+ set(FFT_LINKER_FLAGS "/Qmkl:sequential")
else()
set(FFT_LINKER_FLAGS "-mkl=sequential")
endif()
#
# This file is part of the GROMACS molecular simulation package.
#
-# Copyright (c) 2013, by the GROMACS development team, led by
+# Copyright (c) 2013,2014, by the GROMACS development team, led by
# Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
# and including many others, as listed in the AUTHORS file in the
# top-level source directory and at http://www.gromacs.org.
endif()
if(NOT _library_was_found AND HAVE_LIBMKL)
- set(CMAKE_REQUIRED_LIBRARIES ${FFT_LINKER_FLAGS} ${FFT_LIBRARIES})
+ set(CMAKE_REQUIRED_LIBRARIES "${FFT_LIBRARIES}")
+ set(CMAKE_REQUIRED_FLAGS "${FFT_LINKER_FLAGS}")
# This may also not work correctly if the user changes
# MKL_LIBRARIES after the first run. However,
# MKL_LIBRARIES is only needed for icc version < 11, or