summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Document `cmake --find-package` as a separate command modeBrad King2016-05-101-6/+19
|
* Merge topic 'clang-format-prep'Brad King2016-05-09221-2631/+0
|\ | | | | | | | | 0ac18d40 Remove `//------...` horizontal separator comments
| * Remove `//------...` horizontal separator commentsBrad King2016-05-09221-2631/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | Modern editors provide plenty of ways to visually separate functions. Drop the explicit comments that previously served this purpose. Use the following command to automate the change: $ git ls-files -z -- \ "*.c" "*.cc" "*.cpp" "*.cxx" "*.h" "*.hh" "*.hpp" "*.hxx" | egrep -z -v "^Source/cmCommandArgumentLexer\." | egrep -z -v "^Source/cmCommandArgumentParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmDependsJavaLexer\." | egrep -z -v "^Source/cmDependsJavaParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmExprLexer\." | egrep -z -v "^Source/cmExprParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmFortranLexer\." | egrep -z -v "^Source/cmFortranParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmListFileLexer\." | egrep -z -v "^Source/cm_sha2" | egrep -z -v "^Source/(kwsys|CursesDialog/form)/" | egrep -z -v "^Utilities/(KW|cm).*/" | xargs -0 sed -i '/^\(\/\/---*\|\/\*---*\*\/\)$/ {d;}' This avoids modifying third-party sources and generated sources.
* Merge topic 'custom-command-CROSSCOMPILING_EMULATOR'Brad King2016-05-0914-10/+187
|\ | | | | | | | | 8c2cedc6 CustomCommandGenerator: Add support for CROSSCOMPILING_EMULATOR
| * CustomCommandGenerator: Add support for CROSSCOMPILING_EMULATORJean-Christophe Fillion-Robin2016-05-0914-10/+187
| | | | | | | | | | | | Teach the `add_custom_command` and `add_custom_target' commands to substitute argv0 with the crosscompiling emulator if it is a target with the `CROSSCOMPILING_EMULATOR` property set.
* | Merge topic 'clang-format-prep'Brad King2016-05-0956-14/+319
|\ \ | | | | | | | | | | | | | | | | | | afca3735 Help clang-format wrap after braces on long initializer lists 85425a3e Move comments off of class access specifier lines 64b55203 Isolate formatted streaming blocks with clang-format off/on
| * | Help clang-format wrap after braces on long initializer listsBrad King2016-05-066-1/+9
| | | | | | | | | | | | | | | | | | Add a long comment inside a few braced initializer lists in order to convince clang-format to break after the opening brace and format the list without indenting every value past the opening brace.
| * | Move comments off of class access specifier linesBrad King2016-05-065-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clang-format tool may turn this: public: // comment about access specifier // unrelated comment indented with code ... Into: public: // comment about access specifier // unrelated comment indented with code ... Avoid this by moving comments off of access specifier lines.
| * | Isolate formatted streaming blocks with clang-format off/onBrad King2016-05-0646-0/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clang-format tool can do a good job formatting most code, but well-organized streaming blocks are best left manually formatted. Find blocks of the form os << "...\n" "...\n" ; using the command $ git ls-files -z -- Source | egrep -v -z '^Source/kwsys/' | xargs -0 pcregrep -M --color=always -B 1 -A 1 -n \ '<<[^\n]*\n(^ *("[^\n]*("|<<|;)$|;)\n){2,}' Find blocks of the form os << "...\n" << "...\n" << "...\n"; using the command $ git ls-files -z -- Source | egrep -v -z '^Source/kwsys/' | xargs -0 pcregrep -M --color=always -B 1 -A 1 -n \ '<<[^\n]*\n(^ *<<[^\n]*(\\n"|<<|;)$\n){2,}' Surround such blocks with the pair /* clang-format off */ ... /* clang-format on */ in order to protect them from update by clang-format. Use the C-style `/*...*/` comments instead of C++-style `//...` comments in order to prevent them from ever being swallowed by re-formatting of surrounding comments.
* | | Merge topic 'fix-export-unset'Brad King2016-05-091-0/+3
|\ \ \ | | | | | | | | | | | | | | | | f45c16e7 Fix export file variable pollution
| * | | Fix export file variable pollutionMatthew Woehlke2016-05-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing unset of scratch variables to generated export file for case that the file was already included. We already unset these when parsing the file normally, but the multiple inclusion case was leaving them around.
* | | | Merge topic 'update-osx-release'Brad King2016-05-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ea8428a2 Utilities/Release: Switch to OS X 10.7 and Qt 5.6 for Mac binary
| * | | | Utilities/Release: Switch to OS X 10.7 and Qt 5.6 for Mac binaryBrad King2016-05-061-2/+2
| | |/ / | |/| | | | | | | | | | | | | | Use a new build machine to produce the OS X binary targeting OS X 10.7 and using Qt 5.6.
* | | | CMake Nightly Date StampKitware Robot2016-05-091-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-05-081-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-05-071-1/+1
|/ / /
* | | Merge topic 'ghs-hash-object-locations'Brad King2016-05-064-24/+85
|\ \ \ | | | | | | | | | | | | | | | | 5e428713 GHS: Shorten long object paths with duplicate source names
| * | | GHS: Shorten long object paths with duplicate source namesGeoff Viola2016-05-064-24/+85
| |/ / | | | | | | | | | | | | Detect when the resulting object path is too long and compute an alternative name using a hash.
* | | Merge topic 'update-expat'Brad King2016-05-0634-6923/+9514
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58216d16 expat: Suppress compiler warnings f177c8a0 expat: Re-write CMake build system for our needs 4544c68a expat: Hard-code configuration options for our needs 9f7de396 expat: Drop upstream test/install/packaging code b4678e1c expat: Update cm_expat.h wrapper for new header location 94c62680 Merge branch 'upstream-expat' into update-expat 318b1c17 expat 2016-05-01 (379213ca) 48764630 expat: Disable all whitespace checks in third-party code f4bd9d43 Add script to update Expat from upstream 7eb7a189 Drop old expat sources to make room for a fresh import
| * | | expat: Suppress compiler warningsBrad King2016-05-052-0/+13
| | | | | | | | | | | | | | | | We are not developing expat so we do not care about warnings.
| * | | expat: Re-write CMake build system for our needsBrad King2016-05-052-33/+14
| | | | | | | | | | | | | | | | Hard-code production of a static library. Rename to `cmexpat`.
| * | | expat: Hard-code configuration options for our needsBrad King2016-05-053-28/+4
| | | | | | | | | | | | | | | | | | | | Also include our configured header on Windows too to get the same configuration.
| * | | expat: Drop upstream test/install/packaging codeBrad King2016-05-052-82/+0
| | | |
| * | | expat: Update cm_expat.h wrapper for new header locationBrad King2016-05-051-1/+1
| | | |
| * | | Merge branch 'upstream-expat' into update-expatBrad King2016-05-0523-0/+13896
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2016-05-01 (379213ca)
| | * | | expat 2016-05-01 (379213ca)Expat Upstream2016-05-0523-0/+13896
| | / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://git.code.sf.net/p/expat/code_git at commit 379213ca196f82d19ae72195c4a9bec0553d0bb2 (master).
| * | | expat: Disable all whitespace checks in third-party codeBrad King2016-05-051-0/+1
| | | |
| * | | Add script to update Expat from upstreamBrad King2016-05-051-0/+49
| | | |
| * | | Drop old expat sources to make room for a fresh importBrad King2016-05-0521-11243/+0
| |/ /
* | | Merge topic 'update-prebuild-openssl'Brad King2016-05-062-6/+6
|\ \ \ | | | | | | | | | | | | | | | | 3a67167a Utilities/Release: Update to openssl-1.0.2h
| * | | Utilities/Release: Update to openssl-1.0.2hBrad King2016-05-052-6/+6
| |/ / | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | CMake Nightly Date StampKitware Robot2016-05-061-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2016-05-051-1/+1
| |
* | 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
| | | |
generated by cgit v0.12 at 2024-10-19 08:42:22 (GMT)