Rename remaining GMX_ACCELERATION to GMX_CPU_ACCELERATION

366c49a438150 renamed this variable but forgot these three.

Change-Id: Iad653e2deaa2fc7cb218bffab84c6833ff8b3d56

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d6bdd75939b13b93aefea8dab8121622a0e5e0b..7dd6f4540ad4ad95709be43f6be69b4dd911ec0e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -800,7 +800,7 @@ elseif(${GMX_CPU_ACCELERATION} STREQUAL "AVX_128_FMA" OR ${GMX_CPU_ACCELERATION}
         message(FATAL_ERROR "Cannot find immintrin.h, which is required for AVX intrinsics support. Consider switching compiler.")
     endif(NOT HAVE_IMMINTRIN_H)
 
-    if(${GMX_ACCELERATION} STREQUAL "AVX_256")
+    if(${GMX_CPU_ACCELERATION} STREQUAL "AVX_256")
         try_compile(TEST_AVX ${CMAKE_BINARY_DIR}
             "${CMAKE_SOURCE_DIR}/cmake/TestAVX.c"
             COMPILE_DEFINITIONS "${GROMACS_C_FLAGS}")

diff --git a/cmake/Toolchain-BlueGeneL-xlc.cmake b/cmake/Toolchain-BlueGeneL-xlc.cmake
index 5e0eadce85fd4819cf4fd771d0f227b27f33de19..a735edc57a7ad4c6edc011514334a85edd562575 100644 (file)
--- a/cmake/Toolchain-BlueGeneL-xlc.cmake
+++ b/cmake/Toolchain-BlueGeneL-xlc.cmake
@@ -48,4 +48,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
-set(GMX_ACCELERATION "BlueGene" CACHE STRING "Forcing BlueGene acceleration when using BlueGene toolchain")
+set(GMX_CPU_ACCELERATION "BlueGene" CACHE STRING "Forcing BlueGene acceleration when using BlueGene toolchain")

diff --git a/cmake/Toolchain-BlueGeneP.cmake b/cmake/Toolchain-BlueGeneP.cmake
index 73b6b34c90142b51772cabadb64bf8cd91364d23..67629ba632eb5a90aa693c54b7f2f9f7fdf0b4f9 100644 (file)
--- a/cmake/Toolchain-BlueGeneP.cmake
+++ b/cmake/Toolchain-BlueGeneP.cmake
@@ -5,4 +5,4 @@ set(CMAKE_SYSTEM_NAME BlueGeneP-static CACHE STRING "Cross-compiling for BlueGen
 set(CMAKE_C_COMPILER mpixlc_r)
 set(CMAKE_CXX_COMPILER mpixlcxx_r)
 
-set(GMX_ACCELERATION "BlueGene" CACHE STRING "Forcing BlueGene acceleration when using BlueGene toolchain")
+set(GMX_CPU_ACCELERATION "BlueGene" CACHE STRING "Forcing BlueGene acceleration when using BlueGene toolchain")