summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Utilities/Release: Define NTDDI_VERSION for Windows binariesBrad King2016-05-032-2/+2
| | | | | | LibArchive now defines this explicitly if it is not defined already. Since we define _WIN32_WINNT explicitly, we must now define a consistent value of NTDDI_VERSION explicitly too.
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-05-0249-271/+868
|\ | | | | | | | | Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.
| * LibArchive 2016-04-30 (167e97be)LibArchive Upstream2016-05-0258-345/+1001
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 167e97be1d35c1e0947d768adbf94712244aad6b (master).
* | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-05-020-0/+0
|\ \ | |/
| * LibArchive 2015-10-21 (3bfe5f1f)LibArchive Upstream2016-05-020-0/+0
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 3bfe5f1f8cc7afb63bfb93561a390050ca111c39 (3bfe5f1).
* | libarchive: Remove CMake-specific READMEBrad King2016-05-021-66/+0
| | | | | | | | | | | | We will now manage the libarchive source tree updates using the `Utilities/Scripts/update-libarchive.bash` script. Drop the README that covered the old method.
* | Add script to update LibArchive from upstreamBrad King2016-05-021-0/+31
| |
* | 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.
* | | | | Merge topic 'autogen-message-cleanup'Brad King2016-04-273-113/+174
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9647af3f Autogen: Message tweaks: Compiler type (moc/qrc/ui) added to progress messages 9b58190c Autogen: Message cleanups: Compose messages in std::stringstream
| * | | | | Autogen: Message tweaks: Compiler type (moc/qrc/ui) added to progress messagesSebastian Holtermann2016-04-251-4/+4
| | | | | |
| * | | | | Autogen: Message cleanups: Compose messages in std::stringstreamSebastian Holtermann2016-04-253-109/+170
| |/ / / / | | | | | | | | | | | | | | | | | | | | To avoid Race conditions with other processes writing to stdout/stderr compose the whole message in a std::stringstream then submit the single complete message.
* | | | | Merge topic 'vs-old-express-no-folders'Brad King2016-04-278-17/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 571bedec VS: Ignore USE_FOLDER property on VS versions that do not support it 0c58d2d0 VS: Detect VS 8 and 9 Express editions
generated by cgit v0.12 at 2024-11-14 18:48:17 (GMT)