diff options
author | Brad King <brad.king@kitware.com> | 2012-08-14 12:31:45 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-14 12:31:45 (GMT) |
commit | cd3bd23266a4a6c00595134a17a8bdaea9e28af5 (patch) | |
tree | 515fcf4fdee211067497339acb52de321640c4fc /Modules/CMakeJOMFindMake.cmake | |
parent | 9acb4f118cd9a52aaa66897b1c0cd11dace3851c (diff) | |
parent | 68bc863d5bd64f3e893722e403d4fd56bd2e175a (diff) | |
download | CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.zip CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.gz CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.bz2 |
Merge topic 'cleanup-style'
68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)
Diffstat (limited to 'Modules/CMakeJOMFindMake.cmake')
-rw-r--r-- | Modules/CMakeJOMFindMake.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeJOMFindMake.cmake b/Modules/CMakeJOMFindMake.cmake index 617f3bb..cb3cf12 100644 --- a/Modules/CMakeJOMFindMake.cmake +++ b/Modules/CMakeJOMFindMake.cmake @@ -13,6 +13,6 @@ # License text for the above reference.) -SET (CMAKE_MAKE_PROGRAM "jom" CACHE STRING +set (CMAKE_MAKE_PROGRAM "jom" CACHE STRING "Program used to build from makefiles.") -MARK_AS_ADVANCED(CMAKE_MAKE_PROGRAM) +mark_as_advanced(CMAKE_MAKE_PROGRAM) |