summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* curl: Fix spelling errors reported by LintianBrad King2014-10-291-1/+1
| | | | | Re-apply change from commit v2.8.3~265^2~1 (Fix spelling errors reported by Lintian, 2010-07-02) on updated upstream curl.
* curl: Fix warnings on 64-bit Mac OS X buildBrad King2014-10-291-1/+2
| | | | | Re-apply change from commit v2.6.0~921 (Fix warnings on 64-bit Mac OS X build, 2007-11-05) on updated upstream curl.
* curl: Remove unused SIZEOF_LONG_DOUBLEBrad King2014-10-293-8/+0
| | | | | Re-apply change from commit v2.8.2~537 (cmcurl: Remove unused SIZEOF_LONG_DOUBLE, 2009-12-17) on updated upstream curl.
* Merge branch 'curl-upstream' into update-curlBrad King2014-10-29261-24915/+81128
|\ | | | | | | | | Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.
| * curl 7.38.0 (reduced)Curl Upstream2014-10-08261-24959/+81174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream curl using the following shell code. url=git://github.com/bagder/curl.git && v=7.38.0 && r=202aa9f7 && paths=" CMake/* CMakeLists.txt COPYING include/curl/*.h include/curl/curlbuild.h.cmake lib/*.c lib/*.h lib/CMakeLists.txt lib/Makefile.inc lib/curl_config.h.cmake lib/libcurl.rc lib/vtls/*.c lib/vtls/*.h " && mkdir curl-$v-g$r-reduced && git clone $url curl-git && date=$(cd curl-git && git log -n 1 --format='%cd' $r) && (cd curl-git && git checkout $r && git archive --format=tar $r -- $paths) | (cd curl-$v-g$r-reduced && tar xv && rm lib/config-*.h) && echo "g$r date: $date"
* | curl: Drop our CMake infrastructure to make room for the upstreamBrad King2014-10-2910-2980/+0
| | | | | | | | | | | | Remove our curl CMake build files since upstream now provides some. After merging the upstream versions we may then port them to build inside CMake and take code from our old build files as needed.
* | Merge branch 'curl-upstream' into update-curlBrad King2014-10-290-0/+0
|\ \ | |/ | | | | | | | | | | Use the '-s ours' merge strategy to keep our side unchanged. This merge brings in the upstream snapshot as of the version of curl on which our source is based. This will allow new snapshots to be merged with our changes.
| * curl 7.16.1 (reduced)Curl Upstream2014-10-08129-0/+50290
| | | | | | | | | | | | | | | | | | | | | | Extract upstream curl using the following shell code. url=git://github.com/bagder/curl.git && v=7.16.1 && r=ef442d58 && paths=" COPYING include/curl/*.h lib/*.c lib/*.h " && mkdir curl-$v-g$r-reduced && git clone $url curl-git && date=$(cd curl-git && git log -n 1 --format='%cd' $r) && (cd curl-git && git checkout $r && git archive --format=tar $r -- $paths) | (cd curl-$v-g$r-reduced && tar xv && rm lib/config-*.h) && echo "g$r date: $date"
* curl: Drop unused testing codeBrad King2014-10-2918-1078/+1
| | | | Remove our "Testing/" directory renames of the upstream examples.
* curl: Move sources back into upstream layoutBrad King2014-10-29131-70/+70
| | | | Update our build files as needed to compensate.
* curl: Disable all whitespace checks in third-party codeBrad King2014-10-291-0/+1
| | | | | Add a .gitattributes file to tell Git to skip whitespace checks in the curl source code.
* Merge topic 'ExternalProject-format-docs'Brad King2014-10-291-188/+277
|\ | | | | | | | | | | d9c2c17b ExternalProject: Use explicit markup and definition lists in docs 98936ae3 ExternalProject: Convert docs to a bracket comment
| * ExternalProject: Use explicit markup and definition lists in docsBrad King2014-10-281-139/+227
| | | | | | | | | | | | | | | | Convert ExternalProject module documentation to use explicit markup blocks for each command. Enumerate command options with definition lists instead of a literal block. This will allow more detail to be added later. Also fix the logic that parses options out of the documentation to be aware of the new layout.
| * ExternalProject: Convert docs to a bracket commentBrad King2014-10-281-187/+188
| | | | | | | | | | | | | | Use a bracket comment to hold the documentation instead of a block of line comments. This will make further updates easier. Also fix the logic that parses options out of the documentation to be aware of the new layout.
* | Merge topic 'add_javascript_coverage_parser'Brad King2014-10-2910-0/+823
|\ \ | | | | | | | | | | | | 220e8134 CTest: Add Javascript coverage parser
| * | CTest: Add Javascript coverage parserJoseph Snyder2014-10-2910-0/+823
| | | | | | | | | | | | | | | | | | | | | Add a coverage parser for the Blanket.js library using the JSON output of the mocha.js test runner. Add a test for the new parser.
* | | Merge topic 'FindCurses-include-CheckLibraryExists'Brad King2014-10-291-1/+2
|\ \ \ | | | | | | | | | | | | | | | | f11f9579 FindCurses: Include CheckLibraryExists before using it (#15220)
| * | | FindCurses: Include CheckLibraryExists before using it (#15220)Brad King2014-10-281-1/+2
| | | | | | | | | | | | | | | | | | | | Include the module at the top unconditionally so that all code paths can use it.
* | | | CMake Nightly Date StampKitware Robot2014-10-291-1/+1
| |_|/ |/| |
* | | Merge topic 'compiler-include-encoding'Brad King2014-10-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 197a026c Fix failing StringFileTest when using unicode characters.
| * | | Fix failing StringFileTest when using unicode characters.Clinton Stimpson2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | Some compilers (e.g. MSVC) can have a different encoding than the build tool. Changing the test to not use a full include path written to a header file by cmake.
* | | | Merge topic 'osx-gnu-fortran-deployment'Brad King2014-10-281-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4fc3367f OS X: Detect deployment target flags from GNU Fortran compilers
| * | | | OS X: Detect deployment target flags from GNU Fortran compilersBrad King2014-10-271-0/+2
| | | | | | | | | | | | | | | | | | | | Reported-by: Bill Somerville <bill@classdesign.com>
* | | | | Merge topic 'cpack-rpm-pre-post-install'Brad King2014-10-281-3/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ed546ff CPackRPM: Support PREUN and POSTUN requirements add4e50d CPackRPM: Support pre(post) install script requirements
| * | | | | CPackRPM: Support PREUN and POSTUN requirementsEvgeny Kalishenko2014-10-271-4/+33
| | | | | |
| * | | | | CPackRPM: Support pre(post) install script requirementsEvgeny Kalishenko2014-10-271-1/+33
| | | | | |
* | | | | | Merge topic 'find-boost-no-reroot'Brad King2014-10-281-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43b8bfb2 FindBoost: fix find_library call when using "re-rooting"
| * | | | | | FindBoost: fix find_library call when using "re-rooting"Guillaume Papin2014-10-261-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using CMAKE_FIND_ROOT_PATH, FindBoost is able to find the first component and cache the full path of the directory in Boost_LIBRARY_DIR so that all components are looked for in same directory. The issue was that, when looking for the other components, Boost_LIBRARY_DIR was re-rooted against CMAKE_FIND_ROOT_PATH even though it was already a path on the host. This change fixes this by disabling the re-rooting in the find_library call when using Boost_LIBRARY_DIR as a hint. See http://www.cmake.org/pipermail/cmake-developers/2014-October/011670.html
* | | | | | CMake Nightly Date StampKitware Robot2014-10-281-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'autorcc-depends'Brad King2014-10-278-24/+385
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 6e1c359f QtAutogen: Regenerate qrc files if their input changes (#15074) a2995318 QtAutogen: Expand rccfiles into a vector early in the autogen process. 506151af QtAutogen: Extract a GetRccExecutable method.
| * | | | QtAutogen: Regenerate qrc files if their input changes (#15074)Stephen Kelly2014-10-248-8/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get dependencies from the output of ``rcc --list`` if using Qt 5. Otherwise process the file in the same way as the qt4_add_resources macro. This does not work for RCC files which are generated. The cmake_autogen build step is implemented as a PRE_BUILD step of the target currently if possible, rather than a standalone custom target. This is to keep the number of (synthesized) custom targets that appear in the UI low, but in some cases it is necessary to fall back to a full custom target. Fall back to a full custom target for the VS builds if autorcc is used.
| * | | | QtAutogen: Expand rccfiles into a vector early in the autogen process.Stephen Kelly2014-10-232-7/+7
| | | | | | | | | | | | | | | | | | | | This can be re-used as a vector.
| * | | | QtAutogen: Extract a GetRccExecutable method.Stephen Kelly2014-10-232-9/+33
| | | | |
* | | | | Merge branch 'release'Brad King2014-10-270-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'revert-definition-map-lookup' into releasev3.1.0-rc1Brad King2014-10-248-24/+276
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'FPHSA-deref'Brad King2014-10-271-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22362c65 FPHSA: remove unneeded variable dereferencing
| * | | | | | | FPHSA: remove unneeded variable dereferencingRolf Eike Beer2014-10-251-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These variables can be dereferenced by if() alone so do not do it here, avoiding the risk of their content being treated as a variable name and dereferenced again.
* | | | | | | Merge topic 'revert-definition-map-lookup'Brad King2014-10-278-24/+276
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1b62185 Merge branch 'parent-scope-tests' into variable-pull-failure 5f414cef Revert "cmDefinitions: Don't store parent lookups" e0c0b1ac test: add a test for PARENT_SCOPE with multiple scopes 064c415d test: add test for PARENT_SCOPE behavior
| * | | | | | Merge branch 'parent-scope-tests' into variable-pull-failureBen Boeckel2014-10-245-0/+266
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * parent-scope-tests: test: add a test for PARENT_SCOPE with multiple scopes test: add test for PARENT_SCOPE behavior Conflicts: Tests/RunCMake/set/RunCMakeTest.cmake
| | * | | | | | test: add a test for PARENT_SCOPE with multiple scopesBen Boeckel2014-10-243-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the comment in the test for what is being tested here.
| | * | | | | | test: add test for PARENT_SCOPE behaviorBen Boeckel2014-10-243-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test code courtesy of Alex Merry <alex.merry@kde.org>.
| * | | | | | | Revert "cmDefinitions: Don't store parent lookups"Ben Boeckel2014-10-243-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5abfde6cb8a1ae0b2825797eab6c2e9842eb7c49. The behaviors associated with implicit pulldown on variable lookup seriously conflict with the optimizations made in these commits. Basically, since values were copied upon variable lookup, not just on PARENT_SCOPE, coupled with PARENT_SCOPE's behavior based on whether the variable is in the current scope or not causes serious problems with not storing a value for every variable at every scope. The commit changed behavior of the following example, among other cases: function(test_set) set(blah "value2") message("before PARENT_SCOPE blah=${blah}") set(blah ${blah} PARENT_SCOPE) message("after PARENT_SCOPE blah=${blah}") endfunction() set(blah value1) test_set() message("in parent scope, blah=${blah}") Reported-by: Alex Merry <alex.merry@kde.org> Reported-by: Ben Cooksley <bcooksley@kde.org>
* | | | | | | | CMake Nightly Date StampKitware Robot2014-10-271-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-10-261-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-10-251-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-10-241-1/+1
| | | | | |
* | | | | | Merge branch 'release'Brad King2014-10-230-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | Merge branch 'xcode-ios-compiler-id' into releaseBrad King2014-10-222-3/+19
| |\ \ \ \
| * \ \ \ \ Merge branch 'doc-line-lengths' into releaseBrad King2014-10-2223-211/+308
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'xcode-ios-compiler-id'Brad King2014-10-232-3/+19
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | b91020f6 Xcode: Fix compiler id detection when code signing is required c48f6e12 Xcode: Fix compiler id detection for iOS tools (#15214)
generated by cgit v0.12 at 2025-01-08 16:50:36 (GMT)