Commit Graph

32281 Commits

Author SHA1 Message Date
Brad King f45befed3a Merge topic 'FindBoost-extras'
cb1a434c FindBoost: Add check headers for `zlib` and `bzip2`
2016-07-06 09:35:47 -04:00
Brad King 50adbfcacb Merge topic 'reorganize-cmCTest'
61fcd08a Help: Fix documentation of ctest --build-and-test
7c67d401 Help: Consistently use quotes and fix punctuation in ctest(1) manual
0076fb10 cmCTest: Update doxygen to be consistent
30c5f94c cmCTest: Rename "ProcessTests()" to "ProcessSteps()" and improve doxygen
7c87ab75 cmCTest: Facilitate code reading adding consistent comments in Run()
6d8b9aa6 cmCTest: Improve readability adding "HandleTest(Action|Model)Argument()"
280d0a69 cmCTest: Improve readability adding "RunCMakeAndTest()" and "ExecuteTests()"
898cb987 cmCTest: Fix typo
2016-07-06 09:35:38 -04:00
Brad King 8df2e68614 Merge topic 'cpack-rpm-better-directive-match'
a351edd2 CPackRPM: Handle directives of form %foo and %foo(anything)
2016-07-06 09:35:29 -04:00
Brad King 0219743a01 Merge topic 'cpack-ifw-fix-repo-attributes'
7a30fa1a CPackIFW: Fix attributes for Promoting Updates repository replacement
2016-07-06 09:35:19 -04:00
Brad King 06af626ef2 Merge topic 'cpack-ifw-list-variable'
9e505285 CPackIFW: Using cpack_append_list_variable_set_command
cd1415b5 CPackComponents: add cpack_append_list_variable_set_command
2016-07-06 09:35:06 -04:00
Kitware Robot 7d3fe197f8 CMake Nightly Date Stamp 2016-07-06 00:01:03 -04:00
Brad King 6643fe1481 Merge branch 'cpack-ifw-fix-repo-attributes' into release 2016-07-05 15:56:04 -04:00
Konstantin Podsvirov 7a30fa1a41 CPackIFW: Fix attributes for Promoting Updates repository replacement
Fix spelling of attributes added by commit v3.6.0-rc1~52^2 (CPackIFW:
Add support for Promoting Updates, 2016-05-17).
2016-07-05 15:55:42 -04:00
Andrew Fuller a351edd245 CPackRPM: Handle directives of form %foo and %foo(anything)
Directives that are legal inside the %files section of an RPM spec may
contain a variety of characters particularly when specifying %caps which
can include +, _, and space.  Watch for parenthesis to determine what
forms the prefix vs. path.

Fixes #14362.
2016-07-05 15:27:56 -04:00
Yury Zhuravlev f8d4e3d7f8 bindexplib: Export symbols from objects even with explicit markup
Drop our `HaveExportedObjects` check before dumping exports for an
object file.  It is possible for only a subset of needed symbols to have
explicit markup, and re-exporting the marked symbols does not hurt.

This leaves no callers of `HaveExportedObjects`, but leave the
method in place anyway because it may be useful in the future.

Fixes #16161.
2016-07-05 15:19:56 -04:00
Brad King 8d330277d6 Merge topic 'cmake-gui-static-xcb'
5de1d406 Source/QtDialog: Run clang-format
2016-07-05 15:16:29 -04:00
Brad King 5de1d406f1 Source/QtDialog: Run clang-format 2016-07-05 15:15:57 -04:00
Brad King 57c337e2ef ExternalProject: Match filenames in URLs with query strings and anchors
While at it, refactor logic to consolidate the filename extraction
and verification into a single match.

Inspired-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
2016-07-05 14:57:13 -04:00
O Libre 4e11c9660f FindJNI: Improve formatting of FPHSA call
Pass one argument per line for better readability.
2016-07-05 14:35:24 -04:00
Brad King c7e0c3005b Merge branch 'FindJNI-ubuntu-paths' into release 2016-07-05 14:34:02 -04:00
O Libre 26d16380b0 FindJNI: Fix support for Ubuntu 15.10
The library search paths added by commit v3.6.0-rc1~281^2~1 (FindJNI:
Add support for Ubuntu 15.10, 2016-03-08) were incorrect.  Fix them.
2016-07-05 14:33:46 -04:00
Alex Turbov cb1a434ce0 FindBoost: Add check headers for `zlib` and `bzip2`
The official Windows builds of Boost have internal implementations for
`zlib` and `bzip2` libraries used by Boost::iostreams library, e.g.

* boost_bzip2-vc140-mt-1_59.lib
* boost_zlib-vc140-mt-1_59.lib

Add check headers for these so that users can specify them as
components without any warnings.

Reviewed-by: Roger Leigh <rleigh@dundee.ac.uk>
2016-07-05 14:22:01 -04:00
Brad King 10a7459a22 FindJava: Do not document variables we do not provide
Drop Java_INCLUDE_DIRS and Java_LIBRARIES from the documentation since
we do not provide them.  Also add a link to FindJNI to help users find
it.  Fixes #16180.
2016-07-05 14:18:21 -04:00
Brad King f9dbe22ca2 Intel: Do not use GNU-like flags on Windows
Refactor options out of `Modules/Compiler/Intel-{ASM,C,CXX,Fortran}.cmake`
into a common helper in `Modules/Compiler/Intel.cmake`.  Condition
them to be used only on non-Windows hosts where the Intel compiler
is GNU-like instead of MSVC-like.

Previously this worked only because the options were later overridden
by `Modules/Platform/Windows-Intel*.cmake`, but it is cleaner to not
set the options in the first place.
2016-07-05 13:58:42 -04:00
Brad King 5a3ed0d780 Intel: Do not use MSVC-like flags for Fortran
Teach `Modules/Platform/Windows-MSVC.cmake` not to use MSVC options
for Fortran.  We use the `__windows_compiler_msvc` for the Intel
Fortran compiler on Windows for other settings, but we do not want
the flags.

Previously this worked only because the options were later overridden
by `Modules/Platform/Windows-Intel*.cmake`, but it is cleaner to not
set the options in the first place.
2016-07-05 13:58:36 -04:00
Brad King 909048e534 Merge topic 'strip-flag-whitespace'
3643390d Strip CMAKE_<LANG>_FLAGS[_<CONFIG>] initializer whitespace
2016-07-05 11:29:17 -04:00
Brad King d169b13975 Merge topic 'update-osx-release'
e1e54295 Utilities/Release: Compile OS X binary as C++11
2016-07-05 11:29:14 -04:00
Brad King f8751753e3 Merge topic 'update-kwsys'
aec1d43f Merge branch 'upstream-KWSys' into update-kwsys
f7d23e67 KWSys 2016-06-30 (96f06c8e)
2016-07-05 11:29:11 -04:00
Jean-Christophe Fillion-Robin 61fcd08a49 Help: Fix documentation of ctest --build-and-test
Since commit v3.0.0-rc1~260^2~14 (ctest: Make the --build-makeprogram
optional for --build-and-test, 2013-11-14), binary dictionary is also
required to run CTest given the option `--build-nocmake`.
2016-07-05 11:19:01 -04:00
Jean-Christophe Fillion-Robin 7c67d4011e Help: Consistently use quotes and fix punctuation in ctest(1) manual 2016-07-05 11:19:01 -04:00
Jean-Christophe Fillion-Robin 0076fb100b cmCTest: Update doxygen to be consistent 2016-07-05 11:19:01 -04:00
Jean-Christophe Fillion-Robin 30c5f94c5b cmCTest: Rename "ProcessTests()" to "ProcessSteps()" and improve doxygen 2016-07-05 11:19:00 -04:00
Jean-Christophe Fillion-Robin 7c87ab755c cmCTest: Facilitate code reading adding consistent comments in Run() 2016-07-05 11:19:00 -04:00
Jean-Christophe Fillion-Robin 6d8b9aa65a cmCTest: Improve readability adding "HandleTest(Action|Model)Argument()" 2016-07-05 11:19:00 -04:00
Jean-Christophe Fillion-Robin 280d0a6947 cmCTest: Improve readability adding "RunCMakeAndTest()" and "ExecuteTests()" 2016-07-05 11:19:00 -04:00
Jean-Christophe Fillion-Robin 898cb987b4 cmCTest: Fix typo 2016-07-05 11:18:53 -04:00
Kitware Robot b9eb3408b4 CMake Nightly Date Stamp 2016-07-05 00:01:03 -04:00
Kitware Robot 7523267ca0 CMake Nightly Date Stamp 2016-07-04 00:01:03 -04:00
Kitware Robot a24cd6525a CMake Nightly Date Stamp 2016-07-03 00:01:02 -04:00
Kitware Robot b02814ed74 CMake Nightly Date Stamp 2016-07-02 00:01:08 -04:00
Brad King 3643390d49 Strip CMAKE_<LANG>_FLAGS[_<CONFIG>] initializer whitespace 2016-07-01 14:01:41 -04:00
Brad King e1e54295e8 Utilities/Release: Compile OS X binary as C++11
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.
2016-07-01 11:17:09 -04:00
KWSys Upstream f7d23e6753 KWSys 2016-06-30 (96f06c8e)
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 96f06c8e93d2b5e0395c9f413d1649563a2015d8 (master).

Upstream Shortlog
-----------------

Brad King (1):
      96f06c8e Drop the auto_ptr.hxx component of KWSys
2016-07-01 09:13:38 -04:00
Brad King aec1d43f5d Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-06-30 (96f06c8e)
2016-07-01 09:13:38 -04:00
Brad King 4c476cc9b2 Merge topic 'clang-format-script'
a77d597b clang-format.bash: Fix filter-branch example documentation
2016-07-01 09:12:43 -04:00
Brad King 6e55605db1 Merge topic 'cmake-gui-static-xcb'
73a3c0cd cmake-gui: Add build option to use Qt5 xcb plugin statically
2016-07-01 09:12:40 -04:00
Brad King cff9c11de7 Merge topic 'doc-updates'
c05d240e Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES example
dab3ccf2 InstallRequiredSystemLibraries: Document UCRT option use case
2016-07-01 09:12:36 -04:00
Kitware Robot f408a5b1b9 CMake Nightly Date Stamp 2016-07-01 00:01:05 -04:00
Brad King 48680ade09 Merge branch 'clang-format-script' into release 2016-06-30 16:13:46 -04:00
Brad King a77d597b86 clang-format.bash: Fix filter-branch example documentation
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.
2016-06-30 16:11:36 -04:00
Brad King 73a3c0cd98 cmake-gui: Add build option to use Qt5 xcb plugin statically
This will enable builds against a static Qt5.
2016-06-30 11:26:53 -04:00
Brad King b1883bc8b7 Merge topic 'try_compile-config-flags'
d582c23a try_compile: Add policy CMP0066 to honor CMAKE_<LANG>_FLAGS_<CONFIG>
2016-06-30 09:47:41 -04:00
Brad King 2bef377427 Merge topic 'refactor-auto_ptr'
b5ec5b09 Avoid using KWSys auto_ptr by adopting it ourselves
2016-06-30 09:47:38 -04:00
Brad King 21afc0291e Merge topic 'update-liblzma'
60212979 Merge branch 'upstream-liblzma' into update-liblzma
e4d39146 liblzma 2014-12-21 (265e5ffb)
d4f52404 liblzma: Revise update script to get version 5.0.8
bf969198 Merge branch 'upstream-liblzma' into update-liblzma
ca4276e4 liblzma: Remove CMake-specific README
d38a37ea liblzma 2013-06-30 (b69900ed)
ec8f744a Add script to update liblzma from upstream
2016-06-30 09:47:33 -04:00
Brad King b399d13568 Merge topic 'CM_OVERRIDE-cmTypeMacro'
4e8480db cmTypeMacro: mark overridden functions with CM_OVERRIDE
2016-06-30 09:47:31 -04:00