added Verlet scheme and NxN non-bonded functionality

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

diff --git a/cmake/gmxSetBuildInformation.cmake b/cmake/gmxSetBuildInformation.cmake
index 639035335bb0ef55622a0212ed2a7fcd2f414f4f..8b04ef2d4424fe3a527c671e7bd8f45924d9c01c 100644 (file)
--- a/cmake/gmxSetBuildInformation.cmake
+++ b/cmake/gmxSetBuildInformation.cmake
@@ -50,35 +50,35 @@ macro(gmx_set_build_information)
 
     if(NOT CMAKE_CROSSCOMPILING)
         # Get CPU acceleration information
-        try_run(GMX_DETECTCPU_RUN_VENDOR GMX_DETECTCPU_COMPILED
+        try_run(GMX_CPUID_RUN_VENDOR GMX_CPUID_COMPILED
             ${CMAKE_BINARY_DIR}
-            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_detectcpu.c
-            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_DETECTCPU_STANDALONE"
+            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_cpuid.c
+            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_CPUID_STANDALONE"
             RUN_OUTPUT_VARIABLE OUTPUT_CPU_VENDOR ARGS "-vendor")
-        try_run(GMX_DETECTCPU_RUN_BRAND GMX_DETECTCPU_COMPILED
+        try_run(GMX_CPUID_RUN_BRAND GMX_CPUID_COMPILED
             ${CMAKE_BINARY_DIR}
-            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_detectcpu.c
-            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_DETECTCPU_STANDALONE"
+            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_cpuid.c
+            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_CPUID_STANDALONE"
             RUN_OUTPUT_VARIABLE OUTPUT_CPU_BRAND ARGS "-brand")
-        try_run(GMX_DETECTCPU_RUN_FAMILY GMX_DETECTCPU_COMPILED
+        try_run(GMX_CPUID_RUN_FAMILY GMX_CPUID_COMPILED
             ${CMAKE_BINARY_DIR}
-            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_detectcpu.c
-            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_DETECTCPU_STANDALONE"
+            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_cpuid.c
+            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_CPUID_STANDALONE"
             RUN_OUTPUT_VARIABLE OUTPUT_CPU_FAMILY ARGS "-family")
-        try_run(GMX_DETECTCPU_RUN_MODEL GMX_DETECTCPU_COMPILED
+        try_run(GMX_CPUID_RUN_MODEL GMX_CPUID_COMPILED
             ${CMAKE_BINARY_DIR}
-            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_detectcpu.c
-            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_DETECTCPU_STANDALONE"
+            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_cpuid.c
+            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_CPUID_STANDALONE"
             RUN_OUTPUT_VARIABLE OUTPUT_CPU_MODEL ARGS "-model")
-       try_run(GMX_DETECTCPU_RUN_STEPPING GMX_DETECTCPU_COMPILED
+       try_run(GMX_CPUID_RUN_STEPPING GMX_CPUID_COMPILED
             ${CMAKE_BINARY_DIR}
-            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_detectcpu.c
-            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_DETECTCPU_STANDALONE"
+            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_cpuid.c
+            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_CPUID_STANDALONE"
             RUN_OUTPUT_VARIABLE OUTPUT_CPU_STEPPING ARGS "-stepping")
-        try_run(GMX_DETECTCPU_RUN_FEATURES GMX_DETECTCPU_COMPILED
+        try_run(GMX_CPUID_RUN_FEATURES GMX_CPUID_COMPILED
             ${CMAKE_BINARY_DIR}
-            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_detectcpu.c
-            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_DETECTCPU_STANDALONE"
+            ${CMAKE_SOURCE_DIR}/src/gmxlib/gmx_cpuid.c
+            COMPILE_DEFINITIONS "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/include -DGMX_CPUID_STANDALONE"
             RUN_OUTPUT_VARIABLE OUTPUT_CPU_FEATURES ARGS "-features")
 
         string(STRIP "@OUTPUT_CPU_VENDOR@" OUTPUT_CPU_VENDOR)
@@ -88,32 +88,32 @@ macro(gmx_set_build_information)
         string(STRIP "@OUTPUT_CPU_STEPPING@" OUTPUT_CPU_STEPPING)
         string(STRIP "@OUTPUT_CPU_FEATURES@" OUTPUT_CPU_FEATURES)
 
-        if(GMX_DETECTCPU_RUN_VENDOR EQUAL 0)
+        if(GMX_CPUID_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)
+        if(GMX_CPUID_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)
+        if(GMX_CPUID_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)
+        if(GMX_CPUID_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)
+        if(GMX_CPUID_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)
+            if(GMX_CPUID_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")