Fix RelWithAssert with ICC

The fp-model flags required for ICC to run with fp-assertions
were not correctly appended. The forwarding of build configuration
specific flags was not working. The RelWithAssert for ICC flags
were the only such flags.

Change-Id: I138fd82eb758157f47ff5186a040afb9e4a2d956

diff --git a/cmake/gmxCFlags.cmake b/cmake/gmxCFlags.cmake
index 2fb4693311bd36298f2f8e639d79a6074a0ae49e..bfe3146c56653e461113aad27ce97db590ab32b5 100644 (file)
--- a/cmake/gmxCFlags.cmake
+++ b/cmake/gmxCFlags.cmake
@@ -65,7 +65,7 @@ function(gmx_set_cmake_compiler_flags)
         # inconvenient in CMake to pass more than one list, and such a
         # list is only used here.
         foreach(build_type RELWITHDEBINFO RELWITHASSERT MINSIZEREL PROFILE)
-            set(GMXC_${language}FLAGS_${build_type} "${GMXC_${language}FLAGS_RELEASE}")
+            set(GMXC_${language}FLAGS_${build_type} "${GMXC_${language}FLAGS_RELEASE} ${GMXC_${language}FLAGS_${build_type}}")
         endforeach()
         # Copy the flags that are only used by the real Release build
         # type. Used for, e.g., -Wno-array-bounds in Release to work around