Merge branch release-5-1 into release-2016

[alexxy/gromacs.git] / cmake / gmxSetBuildInformation.cmake

diff --git a/cmake/gmxSetBuildInformation.cmake b/cmake/gmxSetBuildInformation.cmake
index c53f369d5ba30e90dbff472784852ecc64a1099f..e3d677ac57d191ca602ad456e88017d7cbce4d5f 100644 (file)
--- a/cmake/gmxSetBuildInformation.cmake
+++ b/cmake/gmxSetBuildInformation.cmake
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012,2013,2014,2016, by the GROMACS development team, led by
+# Copyright (c) 2012,2013,2014,2015,2016, 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.
@@ -59,9 +59,9 @@ macro(gmx_set_build_information)
     gmx_test_inline_asm_gcc_x86(GMX_X86_GCC_INLINE_ASM)
 
     if(GMX_X86_GCC_INLINE_ASM)
-        set(GCC_INLINE_ASM_DEFINE "-DGMX_X86_GCC_INLINE_ASM")
+        set(GCC_INLINE_ASM_DEFINE "-DGMX_X86_GCC_INLINE_ASM=1")
     else()
-        set(GCC_INLINE_ASM_DEFINE "")
+        set(GCC_INLINE_ASM_DEFINE "-DGMX_X86_GCC_INLINE_ASM=0")
     endif()
 
     message(STATUS "Setting build user/date/host/cpu information")
@@ -105,7 +105,7 @@ macro(gmx_set_build_information)
         # it duplicates code in gmxDetectSimd.cmake
         try_compile(GMX_BUILDINFORMATION_COMPILED
             "${CMAKE_CURRENT_BINARY_DIR}"
-            "${CMAKE_CURRENT_SOURCE_DIR}/src/gromacs/gmxlib/gmx_cpuid.c"
+            "${CMAKE_CURRENT_SOURCE_DIR}/src/gromacs/hardware/cpuinfo.cpp"
             COMPILE_DEFINITIONS "${_compile_definitions}"
             OUTPUT_VARIABLE GMX_BUILDINFORMATION_COMPILED_OUTPUT
             COPY_FILE ${GMX_BUILDINFORMATION_BINARY})