From 05870ba875c31e74e8f817a0834fa9a682c5c007 Mon Sep 17 00:00:00 2001 From: Erik Lindahl Date: Tue, 2 Sep 2014 08:36:34 +0200 Subject: [PATCH] Fixed string var expansion in CMake due to CMP0053 CMake policy 0053 means they are deprecating the usage of @VAR@ in CMakefiles, so CMake-3.0.2 has started to issue big warnings about this. Replace them with ${VAR}. Change-Id: I4e63a4eb038edbc27019bfb89c7106e97aa194c2 --- cmake/gmxDetectSimd.cmake | 8 +++---- cmake/gmxSetBuildInformation.cmake | 36 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmake/gmxDetectSimd.cmake b/cmake/gmxDetectSimd.cmake index 447ce66782..a2ac397c4c 100644 --- a/cmake/gmxDetectSimd.cmake +++ b/cmake/gmxDetectSimd.cmake @@ -62,7 +62,7 @@ function(gmx_suggest_x86_simd _suggested_simd) message(STATUS "Detecting best SIMD instructions for this CPU") # Get CPU SIMD properties information - set(_compile_definitions "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/src/gromacs/legacyheaders -DGMX_CPUID_STANDALONE") + set(_compile_definitions "${GCC_INLINE_ASM_DEFINE} -I${CMAKE_SOURCE_DIR}/src/gromacs/legacyheaders -DGMX_CPUID_STANDALONE") if(GMX_TARGET_X86) set(_compile_definitions "${_compile_definitions} -DGMX_TARGET_X86") endif() @@ -84,10 +84,10 @@ function(gmx_suggest_x86_simd _suggested_simd) set(OUTPUT_TMP "None") endif(NOT GMX_CPUID_COMPILED) - string(STRIP "@OUTPUT_TMP@" OUTPUT_SIMD) + string(STRIP "${OUTPUT_TMP}" OUTPUT_SIMD) - set(${_suggested_simd} "@OUTPUT_SIMD@" PARENT_SCOPE) - message(STATUS "Detected best SIMD instructions for this CPU - @OUTPUT_SIMD@") + set(${_suggested_simd} "${OUTPUT_SIMD}" PARENT_SCOPE) + message(STATUS "Detected best SIMD instructions for this CPU - ${OUTPUT_SIMD}") endfunction() function(gmx_detect_simd _suggested_simd) diff --git a/cmake/gmxSetBuildInformation.cmake b/cmake/gmxSetBuildInformation.cmake index 277ed54c7d..d7add47d20 100644 --- a/cmake/gmxSetBuildInformation.cmake +++ b/cmake/gmxSetBuildInformation.cmake @@ -69,21 +69,21 @@ macro(gmx_set_build_information) execute_process( COMMAND date OUTPUT_VARIABLE TMP_TIME OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process( COMMAND whoami OUTPUT_VARIABLE TMP_USER OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process( COMMAND hostname OUTPUT_VARIABLE TMP_HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE) - set(BUILD_USER "@TMP_USER@\@@TMP_HOSTNAME@ [CMAKE]" CACHE INTERNAL "Build user") - set(BUILD_TIME "@TMP_TIME@" CACHE INTERNAL "Build date & time") + set(BUILD_USER "${TMP_USER}\@${TMP_HOSTNAME} [CMAKE]" CACHE INTERNAL "Build user") + set(BUILD_TIME "${TMP_TIME}" CACHE INTERNAL "Build date & time") execute_process( COMMAND uname -srm OUTPUT_VARIABLE TMP_HOST OUTPUT_STRIP_TRAILING_WHITESPACE) - set(BUILD_HOST "@TMP_HOST@" CACHE INTERNAL "Build host & architecture") + set(BUILD_HOST "${TMP_HOST}" CACHE INTERNAL "Build host & architecture") message(STATUS "Setting build user & time - OK") else() - set(BUILD_USER "Anonymous@unknown [CMAKE]" CACHE INTERNAL "Build user") + set(BUILD_USER "Anonymous\@unknown [CMAKE]" CACHE INTERNAL "Build user") set(BUILD_TIME "Unknown date" CACHE INTERNAL "Build date & time") - set(BUILD_HOST "@CMAKE_HOST_SYSTEM@ @CMAKE_HOST_SYSTEM_PROCESSOR@" CACHE INTERNAL "Build host & architecture") + set(BUILD_HOST "${CMAKE_HOST_SYSTEM} ${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE INTERNAL "Build host & architecture") message(STATUS "Setting build user & time - not on Unix, using anonymous") endif() if(NOT CMAKE_CROSSCOMPILING) # Get CPU information, e.g. for deciding what SIMD support exists - set(_compile_definitions "@GCC_INLINE_ASM_DEFINE@ -I${CMAKE_SOURCE_DIR}/src/gromacs/legacyheaders -DGMX_CPUID_STANDALONE") + set(_compile_definitions "${GCC_INLINE_ASM_DEFINE} -I${CMAKE_SOURCE_DIR}/src/gromacs/legacyheaders -DGMX_CPUID_STANDALONE") if(GMX_TARGET_X86) set(_compile_definitions "${_compile_definitions} -DGMX_TARGET_X86") endif() @@ -119,40 +119,40 @@ macro(gmx_set_build_information) RUN_OUTPUT_VARIABLE OUTPUT_CPU_FEATURES ARGS "-features") unset(_compile_definitions) - string(STRIP "@OUTPUT_CPU_VENDOR@" OUTPUT_CPU_VENDOR) - string(STRIP "@OUTPUT_CPU_BRAND@" OUTPUT_CPU_BRAND) - string(STRIP "@OUTPUT_CPU_FAMILY@" OUTPUT_CPU_FAMILY) - string(STRIP "@OUTPUT_CPU_MODEL@" OUTPUT_CPU_MODEL) - string(STRIP "@OUTPUT_CPU_STEPPING@" OUTPUT_CPU_STEPPING) - string(STRIP "@OUTPUT_CPU_FEATURES@" OUTPUT_CPU_FEATURES) + string(STRIP "${OUTPUT_CPU_VENDOR}" OUTPUT_CPU_VENDOR) + string(STRIP "${OUTPUT_CPU_BRAND}" OUTPUT_CPU_BRAND) + string(STRIP "${OUTPUT_CPU_FAMILY}" OUTPUT_CPU_FAMILY) + string(STRIP "${OUTPUT_CPU_MODEL}" OUTPUT_CPU_MODEL) + string(STRIP "${OUTPUT_CPU_STEPPING}" OUTPUT_CPU_STEPPING) + string(STRIP "${OUTPUT_CPU_FEATURES}" OUTPUT_CPU_FEATURES) if(GMX_CPUID_RUN_VENDOR EQUAL 0) - set(BUILD_CPU_VENDOR "@OUTPUT_CPU_VENDOR@" CACHE INTERNAL "Build CPU vendor") + 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_CPUID_RUN_BRAND EQUAL 0) - set(BUILD_CPU_BRAND "@OUTPUT_CPU_BRAND@" CACHE INTERNAL "Build CPU brand") + 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_CPUID_RUN_FAMILY EQUAL 0) - set(BUILD_CPU_FAMILY "@OUTPUT_CPU_FAMILY@" CACHE INTERNAL "Build CPU family") + 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_CPUID_RUN_MODEL EQUAL 0) - set(BUILD_CPU_MODEL "@OUTPUT_CPU_MODEL@" CACHE INTERNAL "Build CPU model") + 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_CPUID_RUN_STEPPING EQUAL 0) - set(BUILD_CPU_STEPPING "@OUTPUT_CPU_STEPPING@" CACHE INTERNAL "Build CPU stepping") + 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_CPUID_RUN_FEATURES EQUAL 0) - set(BUILD_CPU_FEATURES "@OUTPUT_CPU_FEATURES@" CACHE INTERNAL "Build CPU features") + set(BUILD_CPU_FEATURES "${OUTPUT_CPU_FEATURES}" CACHE INTERNAL "Build CPU features") else() set(BUILD_CPU_FEATURES "" CACHE INTERNAL "Build CPU features") endif() -- 2.22.0