summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-directory-targets'Brad King2016-08-1010-29/+61
|\ | | | | | | | | | | 02789894 Ninja: Add `$subdir/{test,install,package}` targets a88c99f1 Ninja: Simplify computation of GLOBAL_TARGET outputs
| * Ninja: Add `$subdir/{test,install,package}` targetsBrad King2016-08-0910-23/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | With the Makefile generator one can use `cd $subdir; make install` to build and install targets associated with a given subdirectory. This is not possible to do with the Ninja generator since there is only one `build.ninja` file at the top of the build tree. However, we can approximate it by allowing one to run `ninja $subdir/install` at the top of the tree to build the targets in the corresponding subdirectory and install them. This also makes sense for `test`, `package`, and other GLOBAL_TARGET targets. It was already done for `all` by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all` targets, 2016-03-11).
| * Ninja: Simplify computation of GLOBAL_TARGET outputsBrad King2016-08-091-6/+1
| | | | | | | | | | | | | | | | | | In cmGlobalNinjaGenerator::AppendTargetOutputs we previously handled GLOBAL_TARGET outputs specially in order to avoid adding directory components to the output. However, this is not necessary because cmNinjaTargetGenerator::New already filters out copies of these targets that are not at the top level. Instead we can simply follow the same output computation code path as UTILITY targets.
* | Merge topic 'NAG-Fortran-no-fPIE'Brad King2016-08-101-0/+1
|\ \ | | | | | | | | | | | | e9c98426 NAG: Use -PIC for Fortran position-independent executable code
| * | NAG: Use -PIC for Fortran position-independent executable codeNeil Carlson2016-08-091-0/+1
| |/ | | | | | | | | | | | | | | | | The Numerical Algorithms Group (NAG) Fortran compiler documents -PIC for position-independent code and does not have a separate option for PIE. We added `-PIC` for PIC in commit v2.8.11~174^2 (NAG: Use -PIC for Fortran position-independent code, 2013-02-18). Follow up for PIE. Closes: #16236
* | Merge topic 'install-export-staging-dir'Brad King2016-08-102-2/+26
|\ \ | | | | | | | | | | | | c7a319ab install(EXPORT): Fix support for mid-length install destinations on Windows
| * | install(EXPORT): Fix support for mid-length install destinations on WindowsBrad King2016-08-092-2/+26
| |/ | | | | | | | | | | | | | | | | | | | | | | The implementation of `install(EXPORT)` generates files into a staging directory for later installation. We use the full install destination in the path to the staging directory to avoid collisions. In order to avoid exceeding maximum path lengths (especially on Windows) we compute a hash of the install destination when it is too long. Fix this logic to account for the length of the file name(s) when deciding whether to switch to the hashed name. Reported-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
* | Merge topic 'add-extra-boolean-comparisons'Brad King2016-08-1018-79/+693
|\ \ | | | | | | | | | | | | 02d177c9 Add additional <= and >= comparison operators
| * | 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.
* | | CMake Nightly Date StampKitware Robot2016-08-101-1/+1
| |/ |/|
* | Merge topic 'fix-string-append'Brad King2016-08-098-11/+11
|\ \ | | | | | | | | | | | | | | | 551b4c90 Revert the use of string(APPEND) in .cmake.in files 3a7be4f3 prefer list(APPEND) over string(APPEND) where appropriate
| * | Revert the use of string(APPEND) in .cmake.in filesDaniel Pfeifer2016-08-083-3/+3
| | | | | | | | | | | | | | | The generated files may be consumed by older cmake versions which do not support string(APPEND).
| * | prefer list(APPEND) over string(APPEND) where appropriateDaniel Pfeifer2016-08-085-8/+8
| | |
* | | Merge topic 'GetPrerequisites-grep-a'Brad King2016-08-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 5f3c8f6a GetPrerequisites: Always filter objdump output as text
| * | | GetPrerequisites: Always filter objdump output as textAlexander Shishenko2016-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When using `grep` to filter the output, add the `-a` flag to tell it never to treat the output as binary. Otherwise when LANG != C in the environment the non-ascii text may break the filter.
* | | | Merge topic 'ninja-full-path'Brad King2016-08-091-3/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | 955c2a63 Ninja: Use full path for all source files
| * | | Ninja: Use full path for all source filesChaoren Lin2016-08-081-3/+4
| |/ / | | | | | | | | | | | | | | | This is consistent with the behavior of the Makefile generators. Relative paths are difficult for an IDE to parse the output of a build error.
* | | Merge topic 'wix-custom-install-dir'Brad King2016-08-096-4/+55
|\ \ \ | | | | | | | | | | | | | | | | 17bbf6af CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature
| * | | CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER featureMichael Stürmer2016-08-086-4/+55
| | | | | | | | | | | | | | | | | | | | The new variable allows setting of a custom absolute installation prefix outside of the ProgramFiles folders.
* | | | CMake Nightly Date StampKitware Robot2016-08-091-1/+1
| |/ / |/| |
* | | Merge branch 'release'Brad King2016-08-080-0/+0
|\ \ \
| * \ \ Merge branch 'update-cle-version-info' into releaseBrad King2016-08-082-4/+14
| |\ \ \
| * \ \ \ Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-08-051-4/+7
| |\ \ \ \
| | * | | | VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolsetBrad King2016-08-051-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Closes: #16213
| * | | | | Merge branch 'update-curl' into releaseBrad King2016-08-03261-7481/+11916
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'intel-gnu11-support' into releaseBrad King2016-08-031-4/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-findhdf5-definitions' into releaseBrad King2016-08-021-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS' into releaseBrad King2016-08-021-0/+8
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'bash-completion-fix-E-lookup'Brad King2016-08-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe7f117a bash-completion: Fix cmake -E lookup
| * | | | | | | | | | bash-completion: Fix cmake -E lookupSylvain Joubert2016-08-051-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of long '<command> <args...>' the description text is wrapped and indented on the next line. Avoid taking these lines into account by explicitly requiring the third character to be a non-space.
* | | | | | | | | | Merge topic 'update-cle-version-info'Brad King2016-08-082-4/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | e52302d6 CrayLinuxEnvironment: Add alternative methods to get version info
| * | | | | | | | | CrayLinuxEnvironment: Add alternative methods to get version infoChuck Atkins2016-08-052-4/+14
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes: #16229
* | | | | | | | | Merge topic 'FindOpenCL-macOS'Brad King2016-08-081-3/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88f2455f FindOpenCL: Fix search on macOS.
| * | | | | | | | | FindOpenCL: Fix search on macOS.Matthäus G. Chajdas2016-08-081-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original patch was provided by jerry <jerry.c.t@web.de>.
* | | | | | | | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-08-081-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 038e3a4f cmVisualStudio10TargetGenerator: Run clang-format
| * | | | | | | | | cmVisualStudio10TargetGenerator: Run clang-formatBrad King2016-08-051-5/+5
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-08-081-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-08-071-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-08-061-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | 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
generated by cgit v0.12 at 2025-09-09 22:08:19 (GMT)