summaryrefslogtreecommitdiffstats
path: root/Utilities
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-curl'Brad King2016-08-04261-7481/+11916
|\ | | | | | | | | | | | | | | | | | | | | f59ab433 curl: Remove CMake-specific README f53f4a8a Merge branch 'upstream-curl' into update-curl 202adcfe curl 2016-08-03 (f2cb3a01) e1c11352 curl: Update script to get curl 7.50.1 a51c6c53 Merge branch 'upstream-curl' into update-curl 7ec709d3 curl 2015-08-11 (1a7f66a3) 3e9b0343 Add script to update curl from upstream
| * curl: Remove CMake-specific READMEBrad King2016-08-031-66/+0
| | | | | | | | | | | | We will now manage the curl source tree updates using the `Utilities/Scripts/update-curl.bash` script. Drop the README that covered the old method.
| * Merge branch 'upstream-curl' into update-curlBrad King2016-08-03259-7415/+11878
| | | | | | | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
| * curl: Update script to get curl 7.50.1Brad King2016-08-031-1/+3
| |
| * Add script to update curl from upstreamBrad King2016-08-031-0/+36
| |
| * Merge branch 'clang-format-script' into releaseBrad King2016-06-301-4/+8
| |\
| * \ Merge branch 'update-libarchive' into releaseBrad King2016-06-2019-49/+88
| |\ \
| * \ \ Merge branch 'fix-libarchive-openssl-no-hashes' into releaseBrad King2016-06-071-0/+1
| |\ \ \
| * \ \ \ Merge branch 'update-expat' into releaseBrad King2016-06-068-295/+433
| |\ \ \ \
* | | | | | Utilities/Sphinx: Remove use of continue() methodKonstantin Podsvirov2016-08-021-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | We currently only require CMake 2.8.4 which does not provide it.
* | | | | | Utilities/Release: Update Windows binary host path to CMakeBrad King2016-07-132-2/+2
| | | | | |
* | | | | | Utilities/Release: Switch to Qt 5.7 for Linux x86_64 binaryBrad King2016-07-061-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile as C++11 since Qt 5.7 requires it. Limit use of glibc to 2.6 APIs and lower.
* | | | | | Utilities/Release: Compile OS X binary as C++11Brad King2016-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already compile with `-stdlib=libc++` as required for Qt 5.6. We can compile as C++11 and still deploy to OS X 10.7.
* | | | | | Merge topic 'clang-format-script'Brad King2016-07-011-4/+8
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | a77d597b clang-format.bash: Fix filter-branch example documentation
| * | | | | clang-format.bash: Fix filter-branch example documentationBrad King2016-06-301-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inside `git filter-branch --tree-filter` we must format all tracked files because formatting of the tree for each commit is independent from earlier commits.
* | | | | | Merge branch 'upstream-liblzma' into update-liblzmaBrad King2016-06-295-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-liblzma: liblzma 2014-12-21 (265e5ffb)
* | | | | | liblzma: Revise update script to get version 5.0.8Brad King2016-06-291-1/+1
| | | | | |
* | | | | | liblzma: Remove CMake-specific READMEBrad King2016-06-291-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will now manage the liblzma source tree updates using the `Utilities/Scripts/update-liblzma.bash` script. Drop the README that covered the old method.
* | | | | | Add script to update liblzma from upstreamDaniel Pfeifer2016-06-291-0/+30
| | | | | |
* | | | | | cmliblzma: always build as static libraryDaniel Pfeifer2016-06-281-5/+1
| | | | | |
* | | | | | Merge topic 'update-libarchive'Brad King2016-06-2119-49/+88
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 52f58267 Merge branch 'upstream-LibArchive' into update-libarchive 2b94d71d LibArchive 2016-06-19 (139d0576)
| * | | | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-06-2019-49/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2016-06-19 (139d0576)
* | | | | | cmake-gui: Reference LGPLv3 when redistributing QtBrad King2016-06-175-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Download http://www.gnu.org/licenses/lgpl.txt and place it as Licenses/LGPLv3.txt in our source tree. When building cmake-gui, use option CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL to enable notification in the "About" dialog of how the distribution of Qt is licensed. Install the license file as ${CMAKE_ROOT}/Licenses/LGPLv3.txt so that the dialog can display a path to it.
* | | | | | Merge topic 'fix-libarchive-openssl-no-hashes'Brad King2016-06-081-0/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | dbc9f73d libarchive: Restore OpenSSL include directory from upstream
| * | | | | libarchive: Restore OpenSSL include directory from upstreamBrad King2016-06-071-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto library, 2016-05-03) we accidentally dropped the include directory for OpenSSL as well as the library. Without that, it works only accidentally when CHECK_CRYPTO happens to choose the OpenSSL implementation and add the include directory. Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
* | | | | Merge topic 'update-expat'Brad King2016-06-078-295/+433
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | 182f6458 Merge branch 'upstream-expat' into update-expat eb831123 expat 2016-06-05 (2b9cb7f5)
| * | | Merge branch 'upstream-expat' into update-expatBrad King2016-06-068-295/+433
| |/ / | | | | | | | | | | | | * upstream-expat: expat 2016-06-05 (2b9cb7f5)
* | | CMake 3.6.0-rc1 version updateBrad King2016-06-011-1/+1
|/ /
* | liblzma: Avoid possible overflow on signed left shiftBrad King2016-05-251-1/+1
|/ | | | Use an unsigned value to produce the needed mask.
* clang-format.bash: Limit formatting to files selected by optionsBrad King2016-05-201-2/+45
| | | | | | | Now that our one-shot clang-format run is complete we rarely need to filter the entire tree anymore. Filter nothing if no options are given and just print the usage message. Offer options to specify selection of some set of files from Git as needed for various workflows.
* Revise C++ coding style using clang-formatKitware Robot2016-05-1612-36/+33
| | | | | | | | | | | | | Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
* Add a script to run clang-format on the entire source treeBrad King2016-05-161-0/+91
| | | | | | List all sources in version control and filter out those that we should not format for various reasons. Then run the clang-format tool to do an in-place update.
* 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.
* 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: 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
| |
* | 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.
* 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: 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
|
* 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.