summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add additional <= and >= comparison operatorsChuck Atkins2016-08-0918-79/+693
| | | | | This adds the LESS_EQUAL, GREATER_EQUAL, and associated STR and VERSION equivalents to use the combined <= and >= functionality.
* Merge topic 'ninja-clang-rsp-format'Brad King2016-08-051-5/+7
|\ | | | | | | | | e555480c Ninja: Fix response file format for GNU-like Clang on Windows
| * Ninja: Fix response file format for GNU-like Clang on WindowsBrad King2016-08-041-5/+7
| | | | | | | | | | | | | | | | The `CMAKE_<LANG>_SIMULATE_ID` variables are not set to "GNU" for a GNU-like Clang compiler on Windows. They are only set to "MSVC" for a MSVC-like Clang. Revise our response file format selection accordingly. Reported-by: Chaoren Lin <chaorenl@google.com>
* | Merge topic 'update-kwsys'Brad King2016-08-053-0/+73
|\ \ | | | | | | | | | | | | | | | 8abca140 Merge branch 'upstream-KWSys' into update-kwsys 6c0820a8 KWSys 2016-08-03 (6d23dd7e)
| * \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-043-0/+73
| |\ \ | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-08-03 (6d23dd7e)
| | * | KWSys 2016-08-03 (6d23dd7e)KWSys Upstream2016-08-043-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 6d23dd7e455a7b2088c4ec6dce760d8243b84ee6 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 6d23dd7e SystemTools: add a PathExists method
* | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-08-051-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4ada475e VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset
| * | | | VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolsetBrad King2016-08-041-1/+4
| | | | | | | | | | | | | | | | | | | | Closes: #16213
* | | | | CMake Nightly Date StampKitware Robot2016-08-051-1/+1
| |/ / / |/| | |
* | | | Merge topic 'find-module-imported-fallback-to-release'Brad King2016-08-047-63/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ff386d11 Modules: Make imported targets fall back to `Release`
| * | | | Modules: Make imported targets fall back to `Release`Brad King2016-08-037-63/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find modules only detect Debug and Release configurations. All other configurations will fall back to the configuration listed as the first entry in `IMPORTED_CONFIGURATIONS`. Switch the order so that `Release` is listed first, as this is a better fallback than `Debug` for the `RelWithDebInfo` and `MinSizeRel` configurations. See issue #16091. This approach is recommended by documentation in `cmake-developer(7)` added by commit v3.2.0-rc1~286^2~1 (Help: Document IMPORTED_CONFIGURATIONS target property for Find modules, 2014-12-04).
* | | | | Merge topic 'extra-generator-factories'Brad King2016-08-0416-235/+285
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd52a225 Report more information about extra generators in generator factories a354f60c Refactor extra generator registration to use factories
| * | | | | Report more information about extra generators in generator factoriesTobias Hunger2016-08-032-0/+9
| | | | | |
| * | | | | Refactor extra generator registration to use factoriesTobias Hunger2016-08-0316-235/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow additional information about the availability and capabilities of extra generators to be queried without actually creating them. Instead of a static NewFactory() method like the main generator factories have, use a static GetFactory() method to get a pointer to a statically allocated extra generator factory. This simplifies memory management.
* | | | | | Merge topic 'update-kwsys'Brad King2016-08-042-12/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b602cb85 Merge branch 'upstream-KWSys' into update-kwsys 3e6ec47c KWSys 2016-08-02 (3f55579d)
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-032-12/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | | * upstream-KWSys: KWSys 2016-08-02 (3f55579d)
| | * | | | KWSys 2016-08-02 (3f55579d)KWSys Upstream2016-08-032-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 3f55579d113f92fcda8f9eff7046c36873c121f6 (master). Upstream Shortlog ----------------- Patrick Welche (3): 8a989b44 SystemInformation: Treat BSDs more uniformly 2ce319a6 SystemInformation: Treat Solaris the same as Linux 3f55579d SystemTools: Fix FileExists for some SCO OpenServer file permissions
* | | | | | Merge topic 'update-curl'Brad King2016-08-04261-7481/+11916
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f59ab433 curl: Remove CMake-specific README f53f4a8a Merge branch 'upstream-curl' into update-curl 202adcfe curl 2016-08-03 (f2cb3a01) e1c11352 curl: Update script to get curl 7.50.1 a51c6c53 Merge branch 'upstream-curl' into update-curl 7ec709d3 curl 2015-08-11 (1a7f66a3) 3e9b0343 Add script to update curl from upstream
| * | | | | curl: Remove CMake-specific READMEBrad King2016-08-031-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will now manage the curl source tree updates using the `Utilities/Scripts/update-curl.bash` script. Drop the README that covered the old method.
| * | | | | Merge branch 'upstream-curl' into update-curlBrad King2016-08-03259-7415/+11878
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
| | * | | | | curl 2016-08-03 (f2cb3a01)Curl Upstream2016-08-03259-7411/+11887
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/bagder/curl.git at commit f2cb3a01192d36395d16acec6cdb93446ca6fd45 (curl-7_50_1).
| * | | | | | curl: Update script to get curl 7.50.1Brad King2016-08-031-1/+3
| | | | | | |
| * | | | | | Merge branch 'upstream-curl' into update-curlBrad King2016-08-030-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | curl 2015-08-11 (1a7f66a3)Curl Upstream2016-08-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/bagder/curl.git at commit 1a7f66a3de2625d10f65415e6eb3e56067dc0555 (curl-7_44_0).
| * | | | | | Add script to update curl from upstreamBrad King2016-08-031-0/+36
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-08-041-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'ccmake-vim-navigation'Brad King2016-08-034-15/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e34e9c27 ccmake: Add VIM-like bindings for navigation 9a1b6c60 ccmake: Revise documentation for [d] 31b6cf41 ccmake: Fix typo in help (it's -> its)
| * | | | | | ccmake: Add VIM-like bindings for navigationPaul Seyfert2016-08-024-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * scroll with j/k * toggle bool with space, enter insert mode with i * bindings not shown at the bottom of the screen, but given in help
| * | | | | | ccmake: Revise documentation for [d]Paul Seyfert2016-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * list it at the bottom of the screen * different place in help message
| * | | | | | ccmake: Fix typo in help (it's -> its)Paul Seyfert2016-08-021-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'CMakeFindFrameworks-custom-locations'Brad King2016-08-031-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9970cdcb CMakeFindFrameworks: Allow custom framework locations
| * | | | | | CMakeFindFrameworks: Allow custom framework locationsDavid Keller2016-08-021-1/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read a variable to get non-standard locations to be searched, e.g. brew, port. Signed-off-by: David Keller <david.keller@litchis.fr>
* | | | | | Merge topic 'gcc-fvisibility-version'Brad King2016-08-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85e03142 GNU: Use -fvisibility on GCC 4.0 and 4.1 too
| * | | | | | GNU: Use -fvisibility on GCC 4.0 and 4.1 tooBrad King2016-08-021-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag is needed for the `<LANG>_VISIBILITY_PRESET` target property. It has been supported since GCC 4.0, not 4.2 as we previously recorded. Fixes #16222.
* | | | | | Merge topic 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS'Brad King2016-08-031-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5790d9b6 FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS
| * | | | | | FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRSKonstantin Sinitsyn2016-08-021-0/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Support was accidentally dropped by commit v3.6.0-rc1~273^2 (FindProtobuf: Rename variables to match case of module name, 2016-03-01).
* | | | | | Merge topic 'port-to-sco'Brad King2016-08-032-2/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56539d89 SCO_SV: Enable so filename versioning 16a3a735 cmELF: Port to SCO OpenServer 5.0.7/3.2
| * | | | | | SCO_SV: Enable so filename versioningPatrick Welche2016-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take changes used by pkgsrc [1]: * so filename versioning requires CMAKE_SHARED_LIBRARY_SONAME_C_FLAG. [1] http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/cmake/patches/
| * | | | | | cmELF: Port to SCO OpenServer 5.0.7/3.2Patrick Welche2016-08-021-2/+11
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take changes used by pkgsrc [1]: * SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF. [1] http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/cmake/patches/
* | | | | | Merge topic 'ExternalProject-no-DS_Store'Brad King2016-08-031-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52aecc0c ExternalProject: Ignore macOS .DS_Store files in tarball extraction
| * | | | | | ExternalProject: Ignore macOS .DS_Store files in tarball extractionBrad King2016-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not consider a top-level `.DS_Store` file when deciding whether a tarball contains exactly one directory whose contents should be used as the resulting top-level of the extraction. Fixes #16218. Suggested-by: Patrice Kouame
* | | | | | | Merge topic 'update-kwsys'Brad King2016-08-033-12/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35995fa6 Merge branch 'upstream-KWSys' into update-kwsys 6bc3073e KWSys 2016-08-01 (560bcdbb)
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-023-12/+29
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | * upstream-KWSys: KWSys 2016-08-01 (560bcdbb)
| | * | | | | KWSys 2016-08-01 (560bcdbb)KWSys Upstream2016-08-023-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 560bcdbb972cbf4c7ea77010363c652b697b9933 (master). Upstream Shortlog ----------------- Brad King (1): 560bcdbb SystemTools: Factor out common `const char* GetEnv()` private implementation James Johnston (1): 1c147abb Directory: Use Windows API wherever possible and port to Embarcadero
* | | | | | | Merge topic 'wix-root-description'Brad King2016-08-033-1/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e29bfbf2 CPackWIX: Support custom title and description for the root feature
| * | | | | | | CPackWIX: Support custom title and description for the root featureMichael Stürmer2016-08-023-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These can now be specified through the WIX generator specific CPack variables CPACK_WIX_ROOT_FEATURE_TITLE and CPACK_WIX_ROOT_FEATURE_DESCRIPTION.
* | | | | | | | Merge topic 'FindCUDA-no-windows-librt'Brad King2016-08-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4e979b1 FindCUDA: Do not look for librt on Windows
| * | | | | | | | FindCUDA: Do not look for librt on WindowsStephen Sorley2016-08-021-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise an incorrect warning appears when compiling with CUDA SDK 6.5 or older and CUDA_USE_STATIC_CUDA_RUNTIME is true.
* | | | | | | | Merge topic 'FindCUDA-arch'Brad King2016-08-031-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15a6ae5c FindCUDA: Add search path for nvcc on Arch
| * | | | | | | | FindCUDA: Add search path for nvcc on ArchHans Gaiser2016-08-021-1/+2
| | |/ / / / / / | |/| | | | | |