summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2016-08-111-1/+1
|
* Merge topic '15687-xcode-support-system-include'Brad King2016-08-101-14/+34
|\ | | | | | | | | 93ac2a78 Xcode: Obey SYSTEM keyword for includes (#15687)
| * Xcode: Obey SYSTEM keyword for includes (#15687)Gregor Jasny2016-08-091-14/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | CMake used to put all header search paths into HEADER_SEARCH_PATHS attribute. Unfortunately this attribute does not support to declare a search path as a system include. As a hack one could add a -isystem /path to the cflags but then include ordering is not deterministic. A better approach was chosen with this patch by not filling HEADER_SEARCH_PATHS at all and to populate the C, C++, and Fortran flags directly. The include paths used by Xcode should be now identical to the ones used by Unix Makefiles and Ninja generator.
* | Merge topic 'ninja-directory-targets'Brad King2016-08-103-26/+22
|\ \ | | | | | | | | | | | | | | | 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-093-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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-106-15/+94
|\ \ | | | | | | | | | | | | 02d177c9 Add additional <= and >= comparison operators
| * | Add additional <= and >= comparison operatorsChuck Atkins2016-08-096-15/+94
| | | | | | | | | | | | | | | 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 '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-094-4/+31
|\ \ \ | | | | | | | | | | | | | | | | 17bbf6af CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature
| * | | CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER featureMichael Stürmer2016-08-084-4/+31
| | | | | | | | | | | | | | | | | | | | 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 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)
* | | | 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 '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)
* | | | CMake Nightly Date StampKitware Robot2016-08-041-1/+1
|/ / /
* | | Merge topic 'ccmake-vim-navigation'Brad King2016-08-033-15/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-023-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | * 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 'port-to-sco'Brad King2016-08-031-2/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | 56539d89 SCO_SV: Enable so filename versioning 16a3a735 cmELF: Port to SCO OpenServer 5.0.7/3.2
| * | | 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 '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)
* | | Merge topic 'wix-root-description'Brad King2016-08-031-1/+8
|\ \ \ | | | | | | | | | | | | | | | | e29bfbf2 CPackWIX: Support custom title and description for the root feature
| * | | CPackWIX: Support custom title and description for the root featureMichael Stürmer2016-08-021-1/+8
| |/ / | | | | | | | | | | | | | | | These can now be specified through the WIX generator specific CPack variables CPACK_WIX_ROOT_FEATURE_TITLE and CPACK_WIX_ROOT_FEATURE_DESCRIPTION.
* | | CMake Nightly Date StampKitware Robot2016-08-031-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2016-08-021-1/+1
| |
* | Merge topic 'wix-disabled-components'Brad King2016-08-011-0/+4
|\ \ | | | | | | | | | | | | | | | ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED 6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables
| * | CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLEDMichael Stürmer2016-07-221-0/+4
| | | | | | | | | | | | Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
* | | Merge topic 'more-virtual-override'Brad King2016-08-016-23/+23
|\ \ \ | | | | | | | | | | | | | | | | 624b7215 Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overrides
| * | | Source/CPack: Add CM_OVERRIDE on MacOS cmCPackGenerator overridesBrad King2016-07-226-23/+23
| | | |