Merge release-4-6 into master

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

diff --git a/cmake/gmxSetBuildInformation.cmake b/cmake/gmxSetBuildInformation.cmake
index 709add215c929363e9ab55e9ce63d936ff75c0f8..a646032c49567e622d0f00c6102b8f057f80c61f 100644 (file)
--- a/cmake/gmxSetBuildInformation.cmake
+++ b/cmake/gmxSetBuildInformation.cmake
@@ -88,12 +88,36 @@ macro(gmx_set_build_information)
         string(STRIP "@OUTPUT_CPU_STEPPING@" OUTPUT_CPU_STEPPING)
         string(STRIP "@OUTPUT_CPU_FEATURES@" OUTPUT_CPU_FEATURES)
 
-        set(BUILD_CPU_VENDOR   "@OUTPUT_CPU_VENDOR@"   CACHE INTERNAL "Build CPU vendor")
-        set(BUILD_CPU_BRAND    "@OUTPUT_CPU_BRAND@"    CACHE INTERNAL "Build CPU brand")
-        set(BUILD_CPU_FAMILY   "@OUTPUT_CPU_FAMILY@"   CACHE INTERNAL "Build CPU family")
-        set(BUILD_CPU_MODEL    "@OUTPUT_CPU_MODEL@"    CACHE INTERNAL "Build CPU model")
-        set(BUILD_CPU_STEPPING "@OUTPUT_CPU_STEPPING@" CACHE INTERNAL "Build CPU stepping")
-        set(BUILD_CPU_FEATURES "@OUTPUT_CPU_FEATURES@" CACHE INTERNAL "Build CPU features")
+        if(GMX_DETECTCPU_RUN_VENDOR EQUAL 0)
+            set(BUILD_CPU_VENDOR   "@OUTPUT_CPU_VENDOR@"   CACHE INTERNAL "Build CPU vendor")
+        else()
+            set(BUILD_CPU_VENDOR   "Unknown, detect failed" CACHE INTERNAL "Build CPU vendor")
+        endif()
+        if(GMX_DETECTCPU_RUN_BRAND EQUAL 0)
+            set(BUILD_CPU_BRAND    "@OUTPUT_CPU_BRAND@"    CACHE INTERNAL "Build CPU brand")
+        else()
+            set(BUILD_CPU_BRAND    "Unknown, detect failed" CACHE INTERNAL "Build CPU brand")
+        endif()
+        if(GMX_DETECTCPU_RUN_FAMILY EQUAL 0)
+            set(BUILD_CPU_FAMILY   "@OUTPUT_CPU_FAMILY@"   CACHE INTERNAL "Build CPU family")
+        else()
+            set(BUILD_CPU_FAMILY   "0"                     CACHE INTERNAL "Build CPU family")
+        endif()
+        if(GMX_DETECTCPU_RUN_MODEL EQUAL 0)
+            set(BUILD_CPU_MODEL    "@OUTPUT_CPU_MODEL@"    CACHE INTERNAL "Build CPU model")
+        else()
+            set(BUILD_CPU_MODEL    "0"                     CACHE INTERNAL "Build CPU model")
+        endif()
+        if(GMX_DETECTCPU_RUN_STEPPING EQUAL 0)
+            set(BUILD_CPU_STEPPING "@OUTPUT_CPU_STEPPING@" CACHE INTERNAL "Build CPU stepping")
+        else()
+            set(BUILD_CPU_STEPPING "0"                     CACHE INTERNAL "Build CPU stepping")
+        endif()
+        if(GMX_DETECTCPU_RUN_FEATURES EQUAL 0)
+            set(BUILD_CPU_FEATURES "@OUTPUT_CPU_FEATURES@" CACHE INTERNAL "Build CPU features")
+        else()
+            set(BUILD_CPU_FEATURES ""                      CACHE INTERNAL "Build CPU features")
+        endif()
 
     else(NOT CMAKE_CROSSCOMPILING)