summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* curl: Fix passing _WINSOCKAPI_ macro to compilerBrad King2017-02-071-1/+1
| | | | | | | | | | Define `_WINSOCKAPI_` blank rather than to 1 in order to match the value used by Microsoft's winsock header files. Backported from upstream curl commit 192466e0 (cmake: Fix passing _WINSOCKAPI_ macro to compiler, 2017-01-09). Fixes: #16545
* Merge branch 'upstream-curl' into update-curlBrad King2017-02-07131-2509/+4156
|\ | | | | | | | | * upstream-curl: curl 2016-12-22 (44b9b4d4)
| * curl 2016-12-22 (44b9b4d4)Curl Upstream2017-02-07131-2509/+4156
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 44b9b4d4f56d6f6de92c89636994c03984e9cd01 (curl-7_52_1).
* | curl: Update script to get curl 7.52.1Brad King2017-02-071-1/+1
| |
* | Merge topic 'determine_id_without_user_specified_flags'Brad King2017-02-073-23/+32
|\ \ | | | | | | | | | | | | 72ed051b CMakeDetermineCompilerId: check with and without user-specified flags
| * | CMakeDetermineCompilerId: check with and without user-specified flagsMichael Maltese2017-02-063-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang may raise an error when passed a `-march=` option that doesn't correspond to the current target triple. CMake cannot pass the target triple when determining the compiler id because it doesn't know how yet, but it does pass along user-specified flags. This breaks when those user-specified flags include `-march=`. Fix this use case by also trying to find the compiler id without the user-specified flags. Fixes: #16587
* | | Merge topic 'FindProtobuf-static-libs'Brad King2017-02-072-0/+32
|\ \ \ | | | | | | | | | | | | | | | | a3f71349 FindProtobuf: Add option to find static libraries on UNIX
| * | | FindProtobuf: Add option to find static libraries on UNIXSébastien GALLOU2017-02-062-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | Add a `Protobuf_USE_STATIC_LIBS` input variable to optionally restrict searches to static library names. This follows the approach of `FindBoost`.
* | | | Merge topic 'FeatureSummary_description'Brad King2017-02-077-14/+437
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28e87033 FeatureSummary: Update release notes 6f62c66b FeatureSummary: Add FeatureSummary_<TYPE>_DESCRIPTION global properties f9bc8cfe FeatureSummary: Add DEFAULT_DESCRIPTION option to feature_summary
| * | | | FeatureSummary: Update release notesDaniele E. Domenichelli2017-02-061-0/+11
| | | | |
| * | | | FeatureSummary: Add FeatureSummary_<TYPE>_DESCRIPTION global propertiesDaniele E. Domenichelli2017-02-064-2/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The global property FeatureSummary_<TYPE>_DESCRIPTION can be defined for each type to replace the type name with the specified string whenever the package type is used in an output string.
| * | | | FeatureSummary: Add DEFAULT_DESCRIPTION option to feature_summaryDaniele E. Domenichelli2017-02-064-14/+161
| |/ / / | | | | | | | | | | | | | | | | If enabled and only one package type is selected, it will print the default title for the selected package type.
* | | | Merge topic 'wix-custom-root-id'Brad King2017-02-074-6/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 558a69fc CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variable
| * | | | CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variableNils Gladitz2017-02-064-6/+34
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new variable allows specification of a custom root folder ID. The implicit default is "ProgramFiles<64>Folder". The "<64>" token is replaced by "" for 32-bit and "64" for 64-bit builds. Inspired-By: Eric Backus Fixes: #16573
* | | | Merge topic 'update-kwsys'Brad King2017-02-073-1/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | c2645e19 Merge branch 'upstream-KWSys' into update-kwsys 95983ed8 KWSys 2017-02-06 (ef673998)
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-02-063-1/+28
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-02-06 (ef673998)
| | * | | KWSys 2017-02-06 (ef673998)KWSys Upstream2017-02-063-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit ef6739982f686648ef5ae6902aaf5fbaad891bce (master). Upstream Shortlog ----------------- Ben Boeckel (1): 8d8c86b5 testConsoleBuf: tighten the check for the /utf-8 flag Gregor Jasny (1): d6b87625 SystemTools: Add helper function to check for FIFO file type
* | | | | CMake Nightly Date StampKitware Robot2017-02-071-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release'Brad King2017-02-060-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'FeatureSummary-doc-cleanup' into releasev3.8.0-rc1Brad King2017-02-061-8/+10
| |\ \ \ \
* | \ \ \ \ Merge topic 'FeatureSummary-doc-cleanup'Brad King2017-02-061-8/+10
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | 6cffc98c FeatureSummary: Fix documentation
| * | | | FeatureSummary: Fix documentationDaniele E. Domenichelli2017-02-061-8/+10
| | | | |
* | | | | Begin post-3.8 developmentBrad King2017-02-063-2/+11
| | | | |
* | | | | Merge branch 'release'Brad King2017-02-064-13/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | CMake 3.8.0-rc1 version updateBrad King2017-02-062-4/+4
| | | |
| * | | Help: Drop development topic notes to prepare releaseBrad King2017-02-062-9/+0
|/ / / | | | | | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | | Merge topic 'doc-3.8-relnotes'Brad King2017-02-0665-499/+422
|\ \ \ | | | | | | | | | | | | | | | | | | | | c2f7ef63 Help: Organize and revise 3.8 release notes 3f5e4f19 Help: Consolidate 3.8 release notes
| * | | Help: Organize and revise 3.8 release notesBrad King2017-02-061-266/+306
| | | | | | | | | | | | | | | | | | | | Add section headers similar to the 3.7 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * | | Help: Consolidate 3.8 release notesBrad King2017-02-0665-499/+382
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all development release notes into a new version-specific document: tail -q -n +3 Help/release/dev/* > Help/release/3.8.rst git rm -- Help/release/dev/* except the sample topic: git checkout HEAD -- Help/release/dev/0-sample-topic.rst Reference the new document from the release notes index document. Add a title and intro sentence to the new document by hand.
* | | Merge topic 'vs-quote-rerun-paths'Brad King2017-02-062-6/+6
|\ \ \ | | | | | | | | | | | | | | | | f8f3cb8d VS: Fix quoting of special characters in cmake re-run check commands
| * | | VS: Fix quoting of special characters in cmake re-run check commandsBrad King2017-02-062-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix our calls to `AddCustomCommandToOutput` for adding cmake re-run check commands to disable old-style quoting in favor of the full quoting logic. This is necessary when paths contain special characters like `&` that old-style quoting logic does not handle. This also requires us to expand the `$(SolutionPath)` placeholder explicitly because otherwise its expanded value will no longer be quoted correctly. As a side effect, this fixes the value in VS 10 and above where the placeholder may be undefined when driving the build through MSBuild without the `.sln` file. Reported-by: Steven Cook <sc@harshbutfair.org> Fixes: #16585
* | | | Merge topic 'productbuild_signing'Brad King2017-02-063-0/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 48aad9cd CPackProductBuild: Add options to sign packages
| * | | | CPackProductBuild: Add options to sign packagesRoman Wüger2017-02-043-0/+50
| |/ / /
* | | | Merge topic 'androidtestutilities_cleanup'Brad King2017-02-065-6/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 8a5cb84b AndroidTestUtilities: do not require ExternalData unconditionally 9d34e51c AndroidTestUtilities: ignore exit status of ls
| * | | | AndroidTestUtilities: do not require ExternalData unconditionallyZack Galbreath2017-02-044-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to use AndroidTestUtilities to simply install some local files on device can result in the following error: Neither ExternalData_URL_TEMPLATES nor ExternalData_OBJECT_STORES is set We no longer require these ExternalData-specific variables to be set if no such remote data files are requested. Fixes: #16529
| * | | | AndroidTestUtilities: ignore exit status of lsZack Galbreath2017-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adb used to suffer from a bug where `adb shell` would return 0 irrespective the exit status of the underlying process that it executed. This is now fixed for newer versions of Android (N+). As a result, attempting to `adb shell ls` a nonexistent file can now result in a non-zero exit status. Updating check_device_file_exists to ignore the exit status of `adb shell` fixes this bug for newer Android devices.
* | | | | Merge topic 'FindHDF5-fix-HDF5_ROOT'Brad King2017-02-061-83/+102
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf0d8f1f FindHDF5: Restore HDF5_INCLUDE_DIR in all code paths 5564c017 FindHDF5: Restore fallback to static libraries 4908969f FindHDF5: Fix search with HDF5_ROOT 77f6d22a FindHDF5: Use keywords in find_library calls 3d5ad723 FindHDF5: Initialize/finalize internal search options variable ae89967f FindHDF5: Fix command-line parsing argument extraction order
| * | | | | FindHDF5: Restore HDF5_INCLUDE_DIR in all code pathsBrad King2017-02-031-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This compatibility variable should be set no matter which method was used to find HDF5. Even if `HDF5_INCLUDE_DIRS` was set by copying the `HDF5_INCLUDE_DIR` value from `hdf5-config.cmake` it will not hurt to copy the same value back. Issue: #16566
| * | | | | FindHDF5: Restore fallback to static librariesBrad King2017-02-031-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.6.1~6^2~2 (FindHDF5: Fix h5cc arg parsing to work with homebrew on Mac, 2016-07-11) we treated `HDF5_USE_STATIC_LIBRARIES` OFF as a requirement for shared libraries. It is just supposed to be a preference. Even if `HDF5_USE_STATIC_LIBRARIES` is not set we should still fall back to finding static libraries if shared libraries are not available. Issue: #16566
| * | | | | FindHDF5: Fix search with HDF5_ROOTBrad King2017-02-031-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching to correctly find HL for all bindings, 2016-05-12) turned off a large amount of its logic when HDF5_ROOT is set. This caused use of the hdf5 compiler wrapper to extract all needed libraries (e.g. z, dl as dependencies of hdf5 static libraries) to be skipped when using HDF5_ROOT. Fix the search logic to honor HDF5_ROOT in all code paths. Restrict the search for hdf5-specific components to this root, but allow external libraries to be found anywhere. Fixes: #16566
| * | | | | FindHDF5: Use keywords in find_library callsBrad King2017-02-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Clarify the purpose of each argument.
| * | | | | FindHDF5: Initialize/finalize internal search options variableBrad King2017-02-031-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | While at it, use a more private name.
| * | | | | FindHDF5: Fix command-line parsing argument extraction orderBrad King2017-02-031-55/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-implement our internal `_HDF5_parse_compile_line` helper to process command line arguments all at once and in order. Otherwise the libraries named by absolute path and those named by `-l` arguments are not kept in order. The new implementation will not handle separate arguments like `-I /path/to/include/dir` but I have not seen the HDF5 compiler wrappers produce this form. If necessary the parsing loop can be extended with a state variable to keep track of such pairs.
* | | | | | Merge topic 'findmpi-flags-fix'Brad King2017-02-061-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2a73935 FindMPI: Remove leading spaces from flags 93f29be2 FindMPI: Reset MPI_INCLUDE_PATH_WORK before use
| * | | | | | FindMPI: Remove leading spaces from flagsChristian Pfeiffer2017-02-021-0/+2
| | | | | | |
| * | | | | | FindMPI: Reset MPI_INCLUDE_PATH_WORK before useChristian Pfeiffer2017-02-011-0/+2
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-02-061-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-02-051-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-02-041-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'gcc-features'Brad King2017-02-036-23/+39
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37ed860a GNU C++: record that -fvisibility-inlines-hidden is available since 4.0 94a8ee6f GNU C: record that C99 is available since at least 3.4 940bf6a4 Tests/Module/WCDH: only use -Werror=undef compiler flag if actually supported f26ca5a1 Tests/Module/WCDH: write multi_file_compiler_detection.h before using it
generated by cgit v0.12 at 2025-02-09 01:40:02 (GMT)