summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ExternalData-missing-not-fatal'Brad King2014-04-2114-25/+96
|\ | | | | | | | | ccd29b9a ExternalData: Warn on missing file instead of failing
| * ExternalData: Warn on missing file instead of failingBrad King2014-04-1714-25/+96
| | | | | | | | | | | | | | | | | | | | | | | | When the primary source tree path named by a DATA{} reference does not exist, produce an AUTHOR_WARNING instead of a FATAL_ERROR. This is useful when writing a new DATA{} reference to a test reference output that has not been created yet. This way the developer can run the test, manually verify the output, and then copy it into place to provide the reference and eliminate the warning. If the named source tree path is expected to be a file but exists as a directory, we still need to produce a FATAL_ERROR.
* | Merge topic 'CMP0052-docs'Brad King2014-04-212-1/+14
|\ \ | | | | | | | | | | | | | | | 692228e4 Help: Link to cmake-buildsystem from CMP0052 docs. e5e9b8e9 Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.
| * | Help: Link to cmake-buildsystem from CMP0052 docs.Stephen Kelly2014-04-171-0/+3
| | |
| * | Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem.Stephen Kelly2014-04-171-1/+11
| |/
* | Merge topic 'internal-error-backtrace'Brad King2014-04-211-0/+17
|\ \ | | | | | | | | | | | | 3de4c295 cmake: Print C++ stack trace after INTERNAL_ERROR messages
| * | cmake: Print C++ stack trace after INTERNAL_ERROR messagesBrad King2014-04-171-0/+17
| | | | | | | | | | | | | | | Since an INTERNAL_ERROR is always a bug, it will be useful to have the program stack trace available in the report.
* | | Merge topic 'autorcc-target-dir'Brad King2014-04-213-2/+12
|\ \ \ | | | | | | | | | | | | | | | | 33774ca2 QtAutogen: Put generated qrc files in a target-specific dir.
| * | | QtAutogen: Put generated qrc files in a target-specific dir.Stephen Kelly2014-04-183-2/+12
| | |/ | |/|
* | | Merge topic 'FindGTK2_fix_bsd'Brad King2014-04-211-10/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | d5a6069a FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes ef9366b0 FindGTK2: Add /usr/X11R6/ to include paths
| * | | FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includesDaniele E. Domenichelli2014-04-211-10/+26
| | | |
| * | | FindGTK2: Add /usr/X11R6/ to include pathsDaniele E. Domenichelli2014-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | Should fix builds on OpenBSD, see http://open.cdash.org/viewTest.php?onlyfailed&buildid=3286713
* | | | Merge topic 'UseSWIG-guess_module_name'Brad King2014-04-211-17/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 2c96192f UseSWIG: Revise and format documentation e147c5c5 UseSWIG: Detect module name from interface file (#10080)
| * | | | UseSWIG: Revise and format documentationJulien Schueller2014-04-211-16/+32
| | | | | | | | | | | | | | | | | | | | Also add some documentation of SWIG_MODULE_NAME.
| * | | | UseSWIG: Detect module name from interface file (#10080)Julien Schueller2014-04-211-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | If no SWIG_MODULE_NAME is specified explicitly and the .i file exists, scan it for the module name declaration.
* | | | | CMake Nightly Date StampKitware Robot2014-04-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-04-201-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-04-191-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2014-04-180-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'sphinx-python3' into releaseBrad King2014-04-182-4/+4
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'release'Brad King2014-04-180-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | CMake 3.0.0-rc4v3.0.0-rc4Brad King2014-04-161-1/+1
| | | | | | |
* | | | | | | Merge topic 'sphinx-python3'Brad King2014-04-182-4/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | 69069cfb Utilities/Sphinx: Port documentation generation to python3 (#14886)
| * | | | | | Utilities/Sphinx: Port documentation generation to python3 (#14886)Uwe L. Korn2014-04-182-4/+4
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2014-04-181-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'release'Brad King2014-04-170-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'archive-null-error' into releaseBrad King2014-04-161-14/+21
| |\ \ \ \
| * \ \ \ \ Merge branch 'implicit-libNN-dirs' into releaseBrad King2014-04-161-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'fix-CMP0052'Brad King2014-04-177-5/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b673586 CMP0052: Make the warning message more informative. 5baa8159 CMP0052: Test that include dirs in install locations cause no warnings. 9e0b3153 CMP0052: Do not warn when include dir is not in source or build tree
| * | | | | | | CMP0052: Make the warning message more informative.Stephen Kelly2014-04-173-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print the reason for the offending entry in the INTERFACE_INCLUDE_DIRECTORIES.
| * | | | | | | CMP0052: Test that include dirs in install locations cause no warnings.Stephen Kelly2014-04-174-0/+14
| | | | | | | |
| * | | | | | | CMP0052: Do not warn when include dir is not in source or build treeBrad King2014-04-161-4/+6
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the policy was added by commit 783bce29 (Export: Disallow exported interface includes in src/build tree, 2014-03-31) it accidentally left a code path that would warn when the include dir is in the install tree but *not* in the source or build tree. Fix that.
* | | | | | | Merge topic 'FindGTest-typed-test'Brad King2014-04-171-9/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f3e95ba FindGTest: Teach GTEST_ADD_TESTS about TYPED_TEST
| * | | | | | | FindGTest: Teach GTEST_ADD_TESTS about TYPED_TESTJack Morrison2014-04-161-9/+15
| |/ / / / / /
* | | | | | | Merge topic 'update-libarchive'Brad King2014-04-1711-146/+197
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67f5f0a9 libarchive: Use _snprintf on Windows, not snprintf fcfbb0a9 libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need it 61a649d9 libarchive: Update README-CMake.txt for new snapshot 4533560c Merge branch 'libarchive-upstream' into update-libarchive 44d6b82f libarchive: Disable all whitespace checks in third-party code 37f225b7 libarchive 3.1.2-246-ga5a5d28b (reduced) 6ab7c326 libarchive: Avoid left-shift overflow of signed integer
| * | | | | | | libarchive: Use _snprintf on Windows, not snprintfBrad King2014-04-151-0/+4
| | | | | | | |
| * | | | | | | libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need itBrad King2014-04-151-6/+0
| | | | | | | |
| * | | | | | | libarchive: Update README-CMake.txt for new snapshotBrad King2014-04-151-4/+4
| | | | | | | |
| * | | | | | | Merge branch 'libarchive-upstream' into update-libarchiveBrad King2014-04-159-139/+192
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as appropriate.
| | * | | | | | | libarchive 3.1.2-246-ga5a5d28b (reduced)LibArchive Upstream2014-04-159-139/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream libarchive using the following shell code. url=git://github.com/libarchive/libarchive.git && v=3.1.2-246-ga5a5d28b && r=a5a5d28b && paths=" CMakeLists.txt COPYING CTestConfig.cmake build/cmake build/pkgconfig build/utils build/version libarchive/*.* " && mkdir libarchive-$v-g$r-reduced && git clone $url libarchive-git && date=$(cd libarchive-git && git log -n 1 --format='%cd' $r) && (cd libarchive-git && git archive --format=tar $r -- $paths) | (cd libarchive-$v-g$r-reduced && tar xv) && fromdos libarchive-$v-g$r-reduced/build/cmake/Find*.cmake && echo "g$r date: $date"
| * | | | | | | | libarchive: Disable all whitespace checks in third-party codeBrad King2014-04-151-1/+1
| | | | | | | | |
| * | | | | | | | libarchive: Avoid left-shift overflow of signed integerBrad King2014-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In libarchive/archive_write_set_format_zip.c there are two calls to archive_le32enc whose second argument is of the form archive_entry_mode(zip->entry) << 16 However, the return type from archive_entry_mode may be a signed integer so the shift may overflow. Since the second argument of archive_le32enc expects uint32_t anyway, simply cast to that prior to shifting.
* | | | | | | | | Merge topic 'update-prebuilt-openssl'Brad King2014-04-173-9/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b84ee41a Utilities/Release: Update to openssl-1.0.1g
| * | | | | | | | | Utilities/Release: Update to openssl-1.0.1gBrad King2014-04-153-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | | | | | | | Merge topic 'codelite-simplify'Brad King2014-04-171-8/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8e565a0 CodeLite generator: simplify code a bit
| * | | | | | | | | | CodeLite generator: simplify code a bitRolf Eike Beer2014-04-151-8/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'vs-use-full-paths'Brad King2014-04-171-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d048384 VS: Use full path to sources to allow deeper trees with VS >= 10
| * | | | | | | | | | VS: Use full path to sources to allow deeper trees with VS >= 10Brad King2014-04-151-2/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As explained in cmVisualStudio10TargetGenerator::WriteSource comments, VS tools append relative paths to the current directory, e.g. c:\path\to\current\dir\..\..\..\relative\path\to\source.c and fail if this is over 250 charaters or so. Previously we used a full path only if no relative path could be constructed with a leading "../" sequence that does not escape the source or build tree. This means that long relative paths can be generated when the build tree is inside the source tree, and can cause build failures due to the above path concatenation problem. Teach cmVisualStudio10TargetGenerator::ConvertPath to ask the Convert method to honor CMAKE_USE_RELATIVE_PATHS. This will cause it to use full paths by default but still give users the option of getting the relative paths when possible. Suggested-by: Josh Green <inbilla@gmail.com>
* | | | | | | | | | Merge topic 'ar-no-replace'Brad King2014-04-173-6/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ec6485c Support duplicate object names in large archives (#14874)
| * | | | | | | | | | Support duplicate object names in large archives (#14874)Brad King2014-04-163-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the change from commit 39d0ade0 (Windows-GNU: Support duplicate object names in large archives, 2014-04-14) to the default archive rules. These rules have used an incremental append approach since commit v2.8.0~1856 (Build large archives incrementally, 2008-08-04). Switch from "ar r" to "ar q" to be sure we always append objects instead of replacing them.