diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 17:47:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-13 18:19:16 (GMT) |
| commit | 77543bde41b0e52c3959016698b529835945d62d (patch) | |
| tree | ff63e5fbec326c4a5d821e7496c6d2cb52f75b92 /Modules/CMakeVS11FindMake.cmake | |
| parent | 7bbaa4283de26864b2e55e819db0884771585467 (diff) | |
| download | CMake-77543bde41b0e52c3959016698b529835945d62d.zip CMake-77543bde41b0e52c3959016698b529835945d62d.tar.gz CMake-77543bde41b0e52c3959016698b529835945d62d.tar.bz2 | |
Convert CMake-language commands to lower case
Ancient CMake versions required upper-case commands. Later command
names became case-insensitive. Now the preferred style is lower-case.
Run the following shell code:
cmake --help-command-list |
grep -v "cmake version" |
while read c; do
echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
Diffstat (limited to 'Modules/CMakeVS11FindMake.cmake')
| -rw-r--r-- | Modules/CMakeVS11FindMake.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/CMakeVS11FindMake.cmake b/Modules/CMakeVS11FindMake.cmake index 302efaa..c55a4c5 100644 --- a/Modules/CMakeVS11FindMake.cmake +++ b/Modules/CMakeVS11FindMake.cmake @@ -15,7 +15,7 @@ # Look for devenv as a build program. We need to use this to support # Intel Fortran integration into VS. MSBuild can not be used for that case # since Intel Fortran uses the older devenv file format. -FIND_PROGRAM(CMAKE_MAKE_PROGRAM +find_program(CMAKE_MAKE_PROGRAM NAMES devenv HINTS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VS;EnvironmentDirectory] @@ -39,16 +39,16 @@ FIND_PROGRAM(CMAKE_MAKE_PROGRAM # causes the compiler checks and try-compile stuff to fail. MSbuild # is a better choice for this. However, VCExpress does not support # cross compiling needed for Win CE. -IF(NOT CMAKE_CROSSCOMPILING) - FIND_PROGRAM(CMAKE_MAKE_PROGRAM +if(NOT CMAKE_CROSSCOMPILING) + find_program(CMAKE_MAKE_PROGRAM NAMES MSBuild HINTS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VS;ProductDir] "$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;CLR Version]/" "c:/WINDOWS/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0;CLR Version]/" "$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\11.0;CLR Version]/") -ENDIF() +endif() -MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) -SET(MSVC11 1) -SET(MSVC_VERSION 1700) +mark_as_advanced(CMAKE_MAKE_PROGRAM) +set(MSVC11 1) +set(MSVC_VERSION 1700) |