diff options
Diffstat (limited to 'Modules/CMakeVS10FindMake.cmake')
-rw-r--r-- | Modules/CMakeVS10FindMake.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/CMakeVS10FindMake.cmake b/Modules/CMakeVS10FindMake.cmake index 695e92f..189b626 100644 --- a/Modules/CMakeVS10FindMake.cmake +++ b/Modules/CMakeVS10FindMake.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\\10.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\\10.0\\Setup\\VS;ProductDir] "$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;CLR Version]/" "c:/WINDOWS/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;CLR Version]/" "$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\10.0;CLR Version]/") -ENDIF() +endif() -MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) -SET(MSVC10 1) -SET(MSVC_VERSION 1600) +mark_as_advanced(CMAKE_MAKE_PROGRAM) +set(MSVC10 1) +set(MSVC_VERSION 1600) |