summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-libarchive'Brad King2016-05-0453-339/+899
|\ | | | | | | | | | | | | | | | | | | | | | | 59d28b28 libarchive: Drop early use of crypto library fa425910 Utilities/Release: Define NTDDI_VERSION for Windows binaries e9bc469b Merge branch 'upstream-LibArchive' into update-libarchive db9c40b4 Merge branch 'upstream-LibArchive' into update-libarchive b2675cde libarchive: Remove CMake-specific README 501345e4 LibArchive 2016-04-30 (167e97be) 91e6da10 Add script to update LibArchive from upstream fc8fc40f LibArchive 2015-10-21 (3bfe5f1f)
| * libarchive: Drop early use of crypto libraryBrad King2016-05-031-2/+0
| | | | | | | | | | | | | | | | We already add the crypto library after the ssl library when using OpenSSL. Do not add it to the list of libraries individually or we may end up with the wrong order later. Further investigation will be needed to see how this change can be reconciled with the upstream need for the original line.
| * 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-CROSSCOMPILING_EMULATOR'Brad King2016-05-046-9/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | eccfc0d1 Tests: Improve source file name in RunCMake.CrosscompilingEmulator 8de77811 Tests: Cover genex behavior in CROSSCOMPILING_EMULATOR test case
| * | | Tests: Improve source file name in RunCMake.CrosscompilingEmulatorJean-Christophe Fillion-Robin2016-05-035-7/+9
| | | | | | | | | | | | | | | | | | | | The test executable returns with an error, so indicate this in the source name.
| * | | Tests: Cover genex behavior in CROSSCOMPILING_EMULATOR test caseJean-Christophe Fillion-Robin2016-05-033-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A `$<TARGET_FILE:tgt>` generator expression does not cause insertion of the emulator. Add a test covering this. While at it, extend the test case to cover executables in a subdirectory. Also make the test matching expressions more robust to support multiple add_test calls without mixing them while matching.
* | | | Merge topic 'clang-cl-showincludes'Brad King2016-05-041-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 66de0866 Ninja: Fix clang-cl /showIncludes prefix detection
| * | | | Ninja: Fix clang-cl /showIncludes prefix detectionBrad King2016-05-031-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We run MSVC-like compilers with the `/showIncludes` option and match the output to extract the corresponding message. Fix the matching to support compilers like `clang-cl` that print the message on the first line such that it is not preceded by a newline. LLVM-Issue: https://llvm.org/bugs/show_bug.cgi?id=27226
* | | | CMake Nightly Date StampKitware Robot2016-05-041-1/+1
| |/ / |/| |
* | | Merge topic 'doc-cmake-E-updates'Brad King2016-05-032-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | 960afaad Help: Improve 'cmake -E md5sum' documentation 25ee2c86 Help: Add missing space in cmake(1) manual
| * | | Help: Improve 'cmake -E md5sum' documentationBartosz Kosiorek2016-05-022-2/+5
| | | |
| * | | Help: Add missing space in cmake(1) manualBartosz Kosiorek2016-05-021-1/+1
| |/ /
* | | Merge topic 'ExternalProject-git-recursive-init'Brad King2016-05-032-2/+9
|\ \ \ | | | | | | | | | | | | | | | | 79410eeb ExternalProject: Initialize Git submodules recursively and on update (#16083)
| * | | ExternalProject: Initialize Git submodules recursively and on update (#16083)Ilya Kulakov2016-05-032-2/+9
| |/ /
* | | Merge topic 'doc-cmake-policies-manual-improvements'Brad King2016-05-036-75/+128
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f948d2a Help: Add policy summaries to cmake-policies(7) b74d73e5 Help: Organize cmake-policies(7) manual by version of introduction de370656 cmRST: Parse toctree lines with Sphinx cross-reference syntax 845cb217 CMP0059: Fix typo in policy description
| * | | Help: Add policy summaries to cmake-policies(7)Brad King2016-05-021-66/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Sphinx output formats that print the toctree the policy numbers in links from the cmake-policies(7) manual are not descriptive. Convert the toctree entries to cross-reference syntax and add the summary of each policy. For now simply duplicate the policy summary line. We already maintain copies in `cmPolicies.h` and `Help/policy/*.rst` docs.
| * | | Help: Organize cmake-policies(7) manual by version of introductionBrad King2016-05-021-67/+109
| | | |
| * | | cmRST: Parse toctree lines with Sphinx cross-reference syntaxBrad King2016-05-022-3/+14
| | | |
| * | | CMP0059: Fix typo in policy descriptionBrad King2016-05-023-4/+4
| |/ /
* | | 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
| | |
generated by cgit v0.12 at 2024-10-19 16:44:46 (GMT)