summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | | | | | | Merge topic 'archive-null-error'Brad King2014-04-171-14/+21
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b508de59 cmArchiveWrite: Handle NULL error string (#14882)
| * | | | | | | | | | cmArchiveWrite: Handle NULL error string (#14882)Brad King2014-04-161-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If archive_error_string returns NULL, use a placeholder string instead of crashing.
* | | | | | | | | | | Merge topic 'implicit-libNN-dirs'Brad King2014-04-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc57ff5c Drop /lib32 and /lib64 from link directories and RPATH (#14875)
| * | | | | | | | | | Drop /lib32 and /lib64 from link directories and RPATH (#14875)Brad King2014-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES with these paths. We already have the equivalents under /usr. Systems that have these directories have their dynamic loaders configured already. Do not allow them to appear in the RPATH explicitly.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2014-04-171-1/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2014-04-161-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'cxx11-features'Brad King2014-04-1547-1/+796
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60c0d2dd Features: Add cxx_defaulted_move_initializers. c4e67235 Features: Add cxx_long_long_type. dcaafada Features: Add cxx_func_identifier. 251a1f02 Features: Add cxx_local_type_template_args. 53fe7773 Features: Add cxx_extended_friend_declarations. 16603f7c Features: Add cxx_enum_forward_declarations. adf22f61 Features: Add cxx_default_function_template_args. 7b3e8a05 Features: Add cxx_right_angle_brackets. 9a49fd21 Features: Add cxx_decltype_incomplete_return_types. 1889045c Features: Add cxx_sizeof_member. ab455eba Features: Add cxx_thread_local. 300ce248 Features: Add cxx_inline_namespaces. f9d04a96 Features: Add cxx_variadic_macros. 3d76656f Features: Add cxx_uniform_initialization. e74b216c Features: Add cxx_generalized_initializers. ff80c3b4 Features: Add cxx_attributes. ...
| * | | | | | | | | Features: Add cxx_defaulted_move_initializers.Stephen Kelly2014-04-084-0/+14
| | | | | | | | | |
| * | | | | | | | | Features: Add cxx_long_long_type.Stephen Kelly2014-04-084-0/+12
| | | | | | | | | |
generated by cgit v0.12 at 2025-09-11 17:23:54 (GMT)