summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindBoost-no-system-env-paths'Brad King2016-05-031-2/+2
|\ | | | | | | | | 5a9b2b3b FindBoost: Fix Boost_NO_SYSTEM_PATHS to not consider environment (#15702)
| * FindBoost: Fix Boost_NO_SYSTEM_PATHS to not consider environment (#15702)Brad King2016-05-021-2/+2
| | | | | | | | | | | | Previously we added only NO_CMAKE_SYSTEM_PATH to find command calls. Add NO_SYSTEM_ENVIRONMENT_PATH too so that paths found from system environment variables are not considered either.
* | Merge topic 'clang-format-include-order'Brad King2016-05-0317-15/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 54f71cd7 Source: Sort includes the way clang-format would 7b6ffa59 Source: Sort includes of sys/types.h as clang-format would be14fe48 Source: Stabilize include order of sys/types.h before sys/stat.h 5e871f70 Tests: Sort includes of sys/types.h as clang-format would a20d7d48 Tests: Fix Plugin test include order
| * | Source: Sort includes the way clang-format wouldBrad King2016-05-034-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply the approach from commit e1c77472 (Format include directive blocks and ordering with clang-format, 2016-04-29) but this time be more careful about exclusion of parser generator sources: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '^Source/cmCommandArgumentLexer\.' | egrep -z -v '^Source/cmCommandArgumentParser\.' | egrep -z -v '^Source/cmDependsJavaLexer\.' | egrep -z -v '^Source/cmDependsJavaParser\.' | egrep -z -v '^Source/cmExprLexer\.' | egrep -z -v '^Source/cmExprParser\.' | egrep -z -v '^Source/cmFortranLexer\.' | egrep -z -v '^Source/cmFortranParser\.' | egrep -z -v '^Source/cmListFileLexer\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i Also drop use of custom sorting for `sys/types.h`.
| * | Source: Sort includes of sys/types.h as clang-format wouldBrad King2016-05-034-4/+4
| | | | | | | | | | | | | | | When this header is included in blocks where order does not matter, just place it in lexicographic order as clang-format would by default.
| * | Source: Stabilize include order of sys/types.h before sys/stat.hBrad King2016-05-037-4/+13
| | | | | | | | | | | | | | | Include the two headers in an isolated block with a comment separating them so that tools that re-order includes do not re-order these.
| * | Tests: Sort includes of sys/types.h as clang-format wouldBrad King2016-05-031-1/+1
| | |
| * | Tests: Fix Plugin test include orderBrad King2016-05-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix the order accidentally broken by commit e1c77472 (Format include directive blocks and ordering with clang-format, 2016-04-29). Include the KWSys header first in its own block so that it is not moved by tools that re-order includes. It must be included first to define large file support macros consistently.
* | | Merge topic 'FindHDF5-debug-suffix'Brad King2016-05-031-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 313676c9 FindHDF5: Add another debug suffix
| * | | FindHDF5: Add another debug suffixFARBOS Arnaud2016-05-021-2/+2
| | |/ | |/| | | | | | | | | | HDF5 1.8.16 (and likely others) names its debug libraries with a `_debug` suffix intsead of `d`.
* | | CMake Nightly Date StampKitware Robot2016-05-031-1/+1
|/ /
* | Merge topic 'test-watcom-workaround'Brad King2016-05-023-2/+3
|\ \ | | | | | | | | | | | | | | | 47c29885 Tests: Fix RunCMake.BuildDepends filesystem delay for Watcom WMake 26790ad9 Tests: Add workaround to Wrapping test for Watcom failure
| * | Tests: Fix RunCMake.BuildDepends filesystem delay for Watcom WMakeBrad King2016-04-291-1/+2
| | | | | | | | | | | | | | | Our 1.125s delay does not seem to be long enough to be reliable with the Watcom `wmake` tool. Use a longer delay for Watcom.
| * | Tests: Add workaround to Wrapping test for Watcom failureBrad King2016-04-282-1/+1
| | | | | | | | | | | | | | | | | | The Watcom tools do not seem to like our wrapFLTK executable to mix C and C++ sources. Work around this by using C++ for both sources.
* | | Merge topic 'clang-format-include-order'Brad King2016-05-02426-878/+1099
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | e1c77472 Format include directive blocks and ordering with clang-format 180538c7 Source: Stabilize include order 0e7bca92 Utilities/Release: Stabilize include order in WiX custom action eb817be0 Tests: Stabilize include order in MFC, VSXaml, and VSWinStorePhone eda313b4 Tests: Stabilize include order in StringFileTest 7110b754 CursesDialog: add missing cmState include d7a5f255 Modules: Remove unused CMakeTestWatcomVersion.c file
| * | Format include directive blocks and ordering with clang-formatBrad King2016-04-29280-768/+767
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
| * | Source: Stabilize include orderBrad King2016-04-29254-114/+322
| | | | | | | | | | | | | | | Each source file has a logical first include file. Include it in an isolated block so that tools that sort includes do not move them.
| * | Utilities/Release: Stabilize include order in WiX custom actionBrad King2016-04-291-0/+1
| | | | | | | | | | | | | | | | | | In `detect_nsis_overwrite.cpp` we include windows.h first, and we must preserve that. Place the include in an isolated block so that tools that sort includes do not move it.
| * | Tests: Stabilize include order in MFC, VSXaml, and VSWinStorePhoneBrad King2016-04-2911-1/+13
| | | | | | | | | | | | | | | | | | These tests use a precompiled header that must be included first. Include the header in an isolated block so that tools that sort includes do not move it.
| * | Tests: Stabilize include order in StringFileTestDaniel Pfeifer2016-04-291-0/+1
| | | | | | | | | | | | | | | | | | This test generates a header file which is not self-contained. Include it in a separate block of includes so that tools that sort includes do not move it.
| * | CursesDialog: add missing cmState includeDaniel Pfeifer2016-04-291-0/+1
| | |
| * | Modules: Remove unused CMakeTestWatcomVersion.c fileBrad King2016-04-291-1/+0
| |/ | | | | | | | | This file has not been used since commit v2.8.10~218^2~7^2 (Watcom: Simplify compiler version detection, 2012-08-13).
* | CMake Nightly Date StampKitware Robot2016-05-021-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-05-011-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-04-301-1/+1
| |
* | Merge topic 'vs-2015-update-2-features'Brad King2016-04-291-1/+4
|\ \ | | | | | | | | | | | | d2a06159 Features: Record features for VS 2015 Update 2
| * | Features: Record features for VS 2015 Update 2Brad King2016-04-281-1/+4
| |/
* | Merge topic 'vs71-deprecate'Brad King2016-04-2910-14/+42
|\ \ | | | | | | | | | | | | | | | ce82e0a5 Deprecate Visual Studio 7 .NET 2003 generator 6a501b65 Tests: Drop test for VS 7.0 generator deprecation warnings
| * | Deprecate Visual Studio 7 .NET 2003 generatorBrad King2016-04-289-2/+45
| | | | | | | | | | | | | | | Update documentation to mark the generator deprecated. Add a warning at the end of generation plus an option to turn off the warning.
| * | Tests: Drop test for VS 7.0 generator deprecation warningsBrad King2016-04-285-15/+0
| |/ | | | | | | | | We removed this generator but forgot to remove this now-unused test case.
* | Merge topic 'clang-tidy-argv0'Brad King2016-04-291-2/+4
|\ \ | | | | | | | | | | | | 304ab71d Clang-Tidy: Give entire compiler command line to clant-tidy tool
| * | Clang-Tidy: Give entire compiler command line to clant-tidy toolDaniel Pfeifer2016-04-281-2/+4
| |/ | | | | | | | | The tool expects the entire compiler command, including `cc`. It will automatically skip that and extract the options it needs.
* | CMake Nightly Date StampKitware Robot2016-04-291-1/+1
|/
* Merge topic 'intel-compiler-features'Brad King2016-04-2810-8/+345
|\ | | | | | | | | | | | | | | | | | | | | 21b1fa5c Help: Add notes for topic 'intel-compiler-features' 9addce99 Features: Record standard flags for Intel C/C++ on Windows 15a6c950 WCDH: Add Intel to list of supported compilers 36f32ede Features: Record standards and features for Intel C on UNIX d028b948 Features: Specify minimum version Intel C++ 12.1 be910f00 Features: Record standards and features for Intel C++ on UNIX 7f401ae4 Features: Detect C default dialect on MSVC-like compilers
| * Help: Add notes for topic 'intel-compiler-features'Brad King2016-04-281-0/+6
| |
| * Features: Record standard flags for Intel C/C++ on WindowsBrad King2016-04-282-32/+44
| | | | | | | | | | Select the `-std=` or `-Qstd=` flag based on whether Intel is GNU-like or MSVC-like, respectively.
| * WCDH: Add Intel to list of supported compilersRobert Maynard2016-04-282-7/+12
| |
| * Features: Record standards and features for Intel C on UNIXRobert Maynard2016-04-283-0/+83
| | | | | | | | | | Record features for Intel C 12.1 and above. Skip this for now on Windows (where Intel C simulates MSVC).
| * Features: Specify minimum version Intel C++ 12.1Robert Maynard2016-04-282-22/+19
| | | | | | | | | | | | Versions below 12.1 do not provide enough information to properly detect if compiling with c++98 or c++0x enabled so remove them from the supported list.
| * Features: Record standards and features for Intel C++ on UNIXLevi Morrison2016-04-283-0/+230
| | | | | | | | Skip this for now on Windows (where Intel C++ simulates MSVC).
| * Features: Detect C default dialect on MSVC-like compilersBrad King2016-04-281-1/+5
| | | | | | | | | | | | These compilers default to C 90 but do not define __STDC__. While MSVC itself has no option to change the dialect, compilers that document compatibility with MSVC and define _MSC_VER may (e.g. Intel).
* | Merge topic 'ExternalProject-git-clone-shallow'Brad King2016-04-283-3/+42
|\ \ | | | | | | | | | | | | 7db9f3f2 ExternalProject: Add option to perform a shallow Git clone (#15291)
| * | ExternalProject: Add option to perform a shallow Git clone (#15291)Brad King2016-04-273-3/+42
| | | | | | | | | | | | Inspired-by: Ilya Kulakov <kulakov.ilya@gmail.com>
* | | Merge topic 'hyperlink-documentation'Brad King2016-04-2810-29/+34
|\ \ \ | | | | | | | | | | | | | | | | 2d7d33ec Help: Hyperlink properties
| * | | Help: Hyperlink propertiesGregor Jasny2016-04-2710-29/+34
| | | |
* | | | Merge topic 'clang-tidy-output-cleanup'Brad King2016-04-281-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 04d74a7f Clang-Tidy: copy stdout to sterr; ignore original stderr
| * | | | Clang-Tidy: copy stdout to sterr; ignore original stderrDaniel Pfeifer2016-04-271-3/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang-Tidy writes the number of warnings, the number of suppressed warnings, and instructions on how to suppress warnings to stderr. Since each source file is checked individually, this repetitive information is disturbing and should be suppressed. The actual warning messages are written to stdout. Some IDEs (eg. QtCreator) analyze only stderr for issues. Redirecting Clang-Tidy's stdout to stderr makes sure the warnings are correctly displayed.
* | | | CMake Nightly Date StampKitware Robot2016-04-281-1/+1
| |/ / |/| |
* | | Merge topic 'ghs-duplicate-objects'Brad King2016-04-277-0/+84
|\ \ \ | | | | | | | | | | | | | | | | 1703a6d2 GHS: Fix handling of duplicate source filenames (#16046)
| * | | GHS: Fix handling of duplicate source filenames (#16046)Geoff Viola2016-04-257-0/+84
| | | | | | | | | | | | | | | | | | | | Green Hills MULTI project files must specify explicitly distinct object file names for source files with the same name.