Merge branch 'ninja_fix_rerun' into release
CMake Nightly Date Stamp
fix line length
Merge topic 'cmmakefile-const' into next

bde3b4d4 fix line length
allow to mark a test as "Not Run" with a specific return code (#8466)
make some methods of cmMakefile take const std::string& instead of const char*

Most callers already have a std::string, on which they called c_str() to pass it
into these methods, which internally converted it back to std::string. Pass a
std::string directly to these methods now, avoiding all these conversions.
Those methods that only pass in a const char* will get the conversion to
std::string now only once.
Merge topic 'cmmakefile-const' into next

ad01f6ac make some methods of cmMakefile take const std::string& instead of const char*
3e6d6728 allow to mark a test as "Not Run" with a specific return code (#8466)
cmake-gui: Remember variable type in Add Entry

Store variable types together with their names in the variable completion
list so that the type is automatically recovered when you select a variable.

Keep variable names and types in separate lists.  This removes the :TYPE
string from completion list and the Name field and makes variable search
easier.  The variable names and types are now kept in two different
settings - AddVariableNames and AddVariableTypes.  Drop the old
AddVariableCompletionEntries setting.
Merge topic 'var-type-autofill' into next

cfec180d cmake-gui: Remember variable type in Add Entry
Merge topic 'var-type-autofill'

cfec180d cmake-gui: Remember variable type in Add Entry
Merge topic 'revert-ninja_fix_rerun'

79859689 Revert "Ninja: Avoid re-running CMake on next build after regeneration"
Merge topic 'ninja_fix_rerun'

20e595ab Revert "Ninja: Track configured files so we can regenerate them."
Merge topic 'fix-help-if-typo'

5968b6e0 Help: Fix typo in 'if()' command documentation
Merge topic 'GNUInstallDirs_debian-multiarch-fix'

620939e4 GNUInstallDirs: Fix CMAKE_INSTALL_LIBDIR on Debian
Merge branch 'master' into next
cmMakefile: make some methods take const std::string& instead of const char*

Most callers already have a std::string, on which they called c_str() to pass it
into these methods, which internally converted it back to std::string. Pass a
std::string directly to these methods now, avoiding all these conversions.
Those methods that only pass in a const char* will get the conversion to
std::string now only once.
Merge topic 'cmmakefile-const' into next

c768e398 cmMakefile: make some methods take const std::string& instead of const char*
CMake 2.8.12.2
Merge branch 'release' into test-release
Merge topic 'test-release' into next

eb4c3767 Merge branch 'release' into test-release
0b3781e4 CMake 2.8.12.2
80e40485 Merge branch 'ninja_fix_rerun' into release