summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-expat'Brad King2017-06-2111-171/+910
|\ | | | | | | | | | | | | | | | | | | d5afb178 expat: Fix compilation on systems without stdint.h 0a40c668 Merge branch 'upstream-expat' into update-expat 4b8a8c22 expat 2017-06-17 (c4446687) d9d191a1 expat: Update script to get Expat 2.2.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !987
| * expat: Fix compilation on systems without stdint.hBrad King2017-06-201-1/+11
| |
| * Merge branch 'upstream-expat' into update-expatBrad King2017-06-1910-169/+897
| |\ | | | | | | | | | | | | * upstream-expat: expat 2017-06-17 (c4446687)
| | * expat 2017-06-17 (c4446687)Expat Upstream2017-06-1911-186/+928
| | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit c4446687cfc6c5fd7f6371aeaf24c69402a3589e (R_2_2_1).
| * | expat: Update script to get Expat 2.2.1Brad King2017-06-191-2/+3
| | |
* | | CMake Nightly Date StampKitware Robot2017-06-211-1/+1
| | |
* | | Merge topic 'FindICU-data-vars'Brad King2017-06-201-24/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3566af83 FindICU: Search for packaged data files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !981
| * | | FindICU: Search for packaged data filesRoger Leigh2017-06-171-24/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files Makefile.inc and pkgdata.inc are installed by ICU to <libdir>/icu and on some distributions to <libdir>/<arch>/icu. These are required by ICU tools like pkgdata, and so are needed by other package build systems at build time, in addition to the libraries and executables already searched for. Search for the files and create cache entries for them, as done for executables.
* | | | Merge topic 'FindwxWidgets-fix-flag-parse'Brad King2017-06-201-19/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7a0bf86 FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -I Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !975
| * | | | FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -IThierry Crozat2017-06-191-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use proper command-line parsing rather than accidentally matching content in the middle of paths that looks like flags. Fixes: #16986
* | | | | Merge topic 'curses-form-advanced'Brad King2017-06-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b53dee2 FindCurses: mark CURSES_FORM_LIBRARY as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !978
| * | | | | FindCurses: mark CURSES_FORM_LIBRARY as advancedDaniel Pfeifer2017-06-171-0/+1
| | |/ / / | |/| | |
* | | | | Merge topic 'vs_dotnet_referenceprop_documentation'Brad King2017-06-201-6/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18443600 Vs: fix documentation for target property VS_DOTNET_REFERENCEPROP_* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !980
| * | | | | Vs: fix documentation for target property VS_DOTNET_REFERENCEPROP_*Michael Stürmer2017-06-171-6/+9
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2017-06-201-1/+1
| | | | |
* | | | | Merge topic 'vs_csharp_fix_win32manifest_param'Brad King2017-06-197-6/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec7b3af7 Vs: remove /nowin32manifest from C# flags to enable default VS behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !969
| * | | | | Vs: remove /nowin32manifest from C# flags to enable default VS behaviorMichael Stürmer2017-06-167-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if /nowin32manifest is specified, it will be preferred over any occurring /win32manifest:<file> parameter Fixes: #16969, #16970
* | | | | | Merge topic 'FindHDF5-parallel-from-wrapper'Brad King2017-06-191-21/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b9d8c4d FindHDF5: Fix parallel detection when primary compiler is an HDF5 wrapper Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !974
| * | | | | | FindHDF5: Fix parallel detection when primary compiler is an HDF5 wrapperChuck Atkins2017-06-161-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is covering a different use case where your primary compilers are HDF5 wrappers, as is the case when using the Cray Programming Environment. The existing code tries to query the compiler using options only available to h5cc and friends, which doesn't work when your wrapper is not h5cc, as is the case with the CrayPE. This change instead pulls strings out of a test binary when testing for "is your regular compiler an HDF5 wrapper" while the "query wrapper for options" is reserved for the "I found the hdf5 wrappers but they're not your main compiler" mode.
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-191-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-181-1/+1
| |_|/ / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-06-171-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release-3.9'Brad King2017-06-160-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'doc-compile-features' into release-3.9Brad King2017-06-152-4/+4
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'doc-dev-maint'Brad King2017-06-161-0/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0725f2f Help/dev: Add review instructions to maintainer guide Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !973
| * | | | | | | Help/dev: Add review instructions to maintainer guideBrad King2017-06-151-0/+30
| | | | | | | |
* | | | | | | | Merge topic 'fix-shadow-field-warnings'Brad King2017-06-165-24/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54c51e79 cmCPackDragNDropGenerator: Drop unused member 7b02cb29 cmCommonTargetGenerator: Rename member to avoid shadowing c1f15e1c cmGlobalGenerator: Rename member to avoid shadowing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !968
| * | | | | | | | cmCPackDragNDropGenerator: Drop unused memberBrad King2017-06-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the unused `InstallPrefix` member that shadows a member in a subclass.
| * | | | | | | | cmCommonTargetGenerator: Rename member to avoid shadowingBrad King2017-06-142-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the `LocalGenerator` and `GlobalGenerator` members to avoid shadowing similar members in subclasses that use more-specific pointer types.
| * | | | | | | | cmGlobalGenerator: Rename member to avoid shadowingBrad King2017-06-142-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CurrentMakefile` member is shadowed by a generate-time member of the same name in `cmGlobalXCodeGenerator`. Rename our member to clarify its configure-time role and avoid the shadow.
* | | | | | | | | Merge topic 'doc-check-compiler-flag'Brad King2017-06-163-60/+90
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa944c88 Check*CompilerFlag: Rewrite documentation of these modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !972
| * | | | | | | | | Check*CompilerFlag: Rewrite documentation of these modulesBrad King2017-06-153-60/+90
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format with modern markup. Clarify that the setting of `CMAKE_REQUIRED_DEFINITIONS` is temporary. Add a note warning about contamination of the checks by `CMAKE_<LANG>_FLAGS`. Issue: #16973
* | | | | | | | | Merge topic 'doc-compile-features'Brad King2017-06-162-4/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4610df0 Help: Document that VS 2017 compile features are recorded 69d50a7e Help: Fix typo in Cray/PGI/XL compile features docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !971
| * | | | | | | Help: Document that VS 2017 compile features are recordedBrad King2017-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were recorded by commit v3.7.0-rc1~156^2~2 (Features: Record features for VS 15 Preview 4, 2016-09-05). Fixes: #16974
| * | | | | | | Help: Fix typo in Cray/PGI/XL compile features docsBrad King2017-06-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported-by: Rolf Eike Beer <eike@sf-mail.de>
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-161-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'doc-test-layout'Brad King2017-06-153-39/+78
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c547152 Tests: Document test directory layout in a README.rst 4e3483c0 Help/dev: Update source code guide to cover source tree layout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !967
| * | | | | | | Tests: Document test directory layout in a README.rstBrad King2017-06-143-40/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross-reference the CMake Source Code Guide document. Also drop the outdated `Tests/README` file.
| * | | | | | | Help/dev: Update source code guide to cover source tree layoutBrad King2017-06-141-0/+45
| | | | | | | |
* | | | | | | | Merge topic 'vs_csharp_prop_for_all_extensions'Brad King2017-06-154-39/+91
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c90630c5 Vs: add support for VS_CSHARP_* target property for additional file extensions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !961
| * | | | | | | | Vs: add support for VS_CSHARP_* target property for additional file extensionsMichael Stürmer2017-06-134-39/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16726
* | | | | | | | | Merge topic 'UseSWIG-avoid-dllimport-repeat'Brad King2017-06-151-4/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76a0286b UseSWIG: Add `-dllimport` only if not already specified Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !958
| * | | | | | | | | UseSWIG: Add `-dllimport` only if not already specifiedRobert Langlois2017-06-141-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SWIG fails with a redefined macro error when `-dllimport` is specified more than once. One case where you would want to specify your own dllimport is when using SWIG with netstandard2.0. .NET Core does not search for shared library like Mono or .NET, so you need a fully qualified shared library name.
* | | | | | | | | | Merge branch 'release-3.9'Brad King2017-06-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'ipo-per-lang' into release-3.9Brad King2017-06-1422-52/+62
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'update-curl' into release-3.9Brad King2017-06-1471-1043/+1515
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'libuv-restore-fmode' into release-3.9Brad King2017-06-141-0/+16
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge topic 'ipo-per-lang'Brad King2017-06-1522-52/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba247cca IPO: Consider support for each language separately Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !964
| * | | | | | | | | | | | IPO: Consider support for each language separatelyBrad King2017-06-1422-52/+62
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only define `INTERPROCEDURAL_OPTIMIZATION` behavior for C, CXX, and Fortran languages. Do not try to enable support for other languages. Furthermore, each language builds with a different compiler, so check for support by CMake and the compiler for each language independently. Fixes: #16944
* | | | | | | | | | | | Merge topic 'update-curl'Brad King2017-06-1571-1043/+1515
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3ef36f1 Merge branch 'upstream-curl' into update-curl 06d6d6c4 curl 2017-06-14 (54b636f1) 91101f10 curl: Update script to get curl 7.54.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !965