summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CodeBlocks: generate parallel project files (make -j)Alex Neundorf2016-02-233-13/+44
| | | | | | | | This is done the same way as for Eclipse: cmake tries to determine the number of CPUs, and then adds the respective -jN to the make invocations in the project file. Alex
* CMake Nightly Date StampKitware Robot2016-01-101-1/+1
|
* CMake Nightly Date StampKitware Robot2016-01-091-1/+1
|
* Merge topic 'cpack-dmg-license-fixes'Brad King2016-01-082-25/+77
|\ | | | | | | | | bbb3c4ff CPack/DragNDrop: Fix handling of certain license file content (#15899)
| * CPack/DragNDrop: Fix handling of certain license file content (#15899)Andrey Mishchenko2016-01-072-25/+77
| | | | | | | | | | | | | | There were issues in the special-character-escaping and line-wrapping code which caused DragNDrop packaging to fail mysteriously at a later step with parsing errors in the `sla.r` file generated by the following code.
* | Merge topic 'suppress-Wshadow-single'Brad King2016-01-081-1/+2
|\ \ | | | | | | | | | | | | b947fc27 CTestCustom: Suppress -Wshadow warning about Solaris 'single' typedef
| * | CTestCustom: Suppress -Wshadow warning about Solaris 'single' typedefBrad King2016-01-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Solaris the system `/usr/include/floatingpoint.h` header contains typedef float single; so the GNU compiler warns that uses of the name `single` shadow it. Just suppress the warning because our uses of this name would become less readable with a different name.
* | | Merge topic 'update-kwsys'Brad King2016-01-082-65/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | 0a5ce85f Merge branch 'upstream-KWSys' into update-kwsys f2b0bf6e KWSys 2016-01-07 (2418443e)
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-01-072-65/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-01-07 (2418443e)
| | * | | KWSys 2016-01-07 (2418443e)KWSys Upstream2016-01-072-65/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 2418443ed01e5caeb47908064fd4dad2eff4736f (master). Upstream Shortlog ----------------- Clinton Stimpson (1): 2418443e FStream: Fix reading BOM on single-character files
* | | | | CMake Nightly Date StampKitware Robot2016-01-081-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'release-windows'Brad King2016-01-076-12/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fae47798 Utilities/Release: Configure Windows binary to support Windows XP 083312a8 Utilities/Release: Switch to .msi builder for Windows binary 240b065f Utilities/Release: Optionally load environment on remote build server a95b4715 Utilities/Release: Add optional remote launcher to ssh calls
| * | | | Utilities/Release: Configure Windows binary to support Windows XPBrad King2015-12-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile with `-D_WIN32_WINNT=0x501` to use a WinXP-compatible API. Compile with `-D_USING_V110_SDK71_` to tell the VS standard library headers that we are building with a WinXP-compatible Windows SDK. Link executables with `-subsystem:console,5.01` to make them runnable on Windows XP. Ideally `cmake-gui` should instead be linked with `-subsystem:windows,5.01` but with the Ninja and Makefile generators CMake adds `-subsystem:windows` after our `-subsystem:console,5.01` flag and the linker seems to interpret this combination as we need.
| * | | | Utilities/Release: Switch to .msi builder for Windows binaryBrad King2015-12-214-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Use a new build machine to produce the Windows binary using the CPack WiX generator to produce a `.msi` installer.
| * | | | Utilities/Release: Optionally load environment on remote build serverBrad King2015-12-211-0/+1
| | | | |
| * | | | Utilities/Release: Add optional remote launcher to ssh callsBrad King2015-12-211-4/+7
| | |_|/ | |/| |
* | | | Merge topic 'xcode-global-attribute-variant'Brad King2016-01-075-54/+153
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8bc26a0 Xcode: Parse variant and genex for CMAKE_XCODE_ATTRIBUTE (#14947) dc0ddb9e Xcode: Store configuration name along with XcodeObject (#14947) 28f98cee Xcode: Make CMAKE_XCODE_ATTRIBUTE calculation last step (#14947) 28db2268 Xcode: Factor out XCODE_ATTRIBUTE_ variant filter (#14947)
| * | | | Xcode: Parse variant and genex for CMAKE_XCODE_ATTRIBUTE (#14947)Gregor Jasny2016-01-035-17/+101
| | | | |
| * | | | Xcode: Store configuration name along with XcodeObject (#14947)Gregor Jasny2016-01-031-10/+9
| | | | |
| * | | | Xcode: Make CMAKE_XCODE_ATTRIBUTE calculation last step (#14947)Gregor Jasny2016-01-031-4/+4
| | | | |
| * | | | Xcode: Factor out XCODE_ATTRIBUTE_ variant filter (#14947)Gregor Jasny2016-01-032-27/+43
| | | | | | | | | | | | | | | | | | | | | | | | | Move the variant=<config> filter out to a helper function so that it can be re-used later for CMAKE_XCODE_ATTRIBUTE_*.
* | | | | Merge topic 'xcode-escape-backslash'Brad King2016-01-076-25/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ba39d7e9 Xcode: Escape all backslashes in strings (#15328)
| * | | | | Xcode: Escape all backslashes in strings (#15328)Gregor Jasny2016-01-076-25/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change backslashes in strings were escaped during compile flags adds via AppendFlag(). But global flags like OTHER_CPLUSPLUSFLAGS are not added as flags but as plain strings so they were not escaped properly. Now the escaping is performed within cmXCodeObject::PrintString() which ensures that strings are always encoded.
* | | | | | Merge topic 'fix-GenerateExportHeader-on-borland'Brad King2016-01-071-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5eb7d85 GenerateExportHeader: Work around buggy std::getline behavior in BCB5.
| * | | | | | GenerateExportHeader: Work around buggy std::getline behavior in BCB5.James Johnston2015-12-311-0/+12
| | | | | | |
* | | | | | | Merge topic 'install-xdgdata-dir'Brad King2016-01-073-3/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76566621 QtDialog: Add option to control XDG file install destination
| * | | | | | | QtDialog: Add option to control XDG file install destinationNiels Ole Salscheider2015-12-213-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_XDGDATA_DIR` option and add a corresponding flag to the `bootstrap` script. This is needed for multiarch layouts where the prefix is `/usr/${host}` but where architecture-independent files (like the XDG-specific ones) are installed to `/usr/share`.
* | | | | | | | Merge topic 'cray-prgev-cleanup'Brad King2016-01-071-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64e26850 CrayPrgEnv: Cleanup binaries from implicit compile flag detection
| * | | | | | | | CrayPrgEnv: Cleanup binaries from implicit compile flag detectionChuck Atkins2015-12-291-2/+5
| | | | | | | | |
* | | | | | | | | Merge topic 'vs-compiler-id-itanium'Brad King2016-01-071-3/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | d9bf5206 CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
| * | | | | | | | CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)Brad King2015-12-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS expects the platform to be just `Itanium`, so drop the incorrect special case mapping it to `ia64`. This platform name has been wrong since the logic was added by commit v2.8.10~148^2~8 (VS: Detect the compiler id and tool location, 2012-08-16).
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-01-071-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-01-061-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-01-051-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-01-041-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-01-031-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-01-021-1/+1
| | | | | | |
* | | | | | | Merge topic 'copyright-year'Brad King2016-01-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9647b32f Copyright.txt: Update year range to end in 2016
| * | | | | | | Copyright.txt: Update year range to end in 2016Brad King2016-01-011-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-01-011-1/+1
|/ / / / / /
* | | | | | CMake Nightly Date StampKitware Robot2015-12-311-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-12-301-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2015-12-291-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-12-281-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-12-271-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-12-261-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-12-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-12-241-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-12-231-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2015-12-221-1/+1
| |_|/ / |/| | |