summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release'Brad King2016-01-120-0/+0
|\
| * Merge branch 'vs14-debug-enum' into releaseBrad King2016-01-111-2/+18
| |\
| * \ Merge branch 'vs-compiler-id-itanium' into releaseBrad King2015-12-211-3/+0
| |\ \
* | \ \ Merge topic 'vs-win10-sdk'Brad King2016-01-123-17/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a57caf7e VS: Fix Windows 10 SDK version selection (#15831) ad594de8 cmSystemTools: Add VersionCompareEqual helper c173e37f VS: Do not select a partial Windows 10 SDK folder (#15831)
| * | | | VS: Fix Windows 10 SDK version selection (#15831)Brad King2016-01-111-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~5^2~1 (VS: Add support for selecting the Windows 10 SDK, 2015-09-30) we added Windows 10 SDK selection choosing the most recent SDK that is not newer than the target version. This is backward because it should be up to the application code to not use APIs newer than the target version. It is up to the build system to provide a SDK that has at least the APIs expected to be available for the target version. Furthermore, since the default target version is the host version of Windows, the old approach breaks when the only SDK available is for a newer version of Windows. Fix this by always selecting a Windows 10 SDK if one exists. Use the SDK for the exact version if is available. Otherwise use the latest version of the SDK available because that will have at least the APIs expected for the target version.
| * | | | cmSystemTools: Add VersionCompareEqual helperBrad King2016-01-112-0/+10
| | | | | | | | | | | | | | | | | | | | Wrap a call to VersionCompare with OP_EQUAL.
| * | | | VS: Do not select a partial Windows 10 SDK folder (#15831)Brad King2016-01-081-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Skip SDK candidate folders that do not contain <um/windows.h> as they are not full SDKs.
* | | | | Merge topic 'FindwxWidgets-use-isystem'Brad King2016-01-121-12/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4d05f195 FindwxWidgets: Drop suppression of -isystem
| * | | | | FindwxWidgets: Drop suppression of -isystemBrad King2016-01-111-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added by commit v2.8.0~2292 (... Set variable wxWidgets_INCLUDE_DIRS_NO_SYSTEM on the Mac ..., 2008-04-16) and updated by commit v2.8.9~183^2 (FindwxWidgets: Do not use -isystem on OpenBSD, 2012-05-14). Since the underlying cause was never investigated fully we do not know the conditions under which -isystem breaks wxWidgets, but suppressing -isystem is problematic for users that do not want to see warnings in wxWidgets headers. Simply drop the special case for now so we can see whether anyone hits the problem again, at which point it can be investigated in more detail. Reported-by: Simon Wells <swel024@gmail.com>
* | | | | | Merge topic 'update-kwsys'Brad King2016-01-123-19/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9821924d Merge branch 'upstream-KWSys' into update-kwsys 8e7356a2 KWSys 2016-01-11 (e8bf616e)
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-01-113-19/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-01-11 (e8bf616e)
| | * | | | | KWSys 2016-01-11 (e8bf616e)KWSys Upstream2016-01-113-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit e8bf616e3556368bf19dbebcd3529a89011ebacb (master). Upstream Shortlog ----------------- Brad King (1): e8bf616e SystemTools: Fix GetShortPath buffer sizing Jan van Dorsten (1): cfb2477d SystemTools: Simplify GetShortPath de-quoting step Robert Maynard (1): 8ef9773d Don't use clang diagnostic pragma's when compiling with ICC on OSX.
* | | | | | | Merge topic 'mingw-clang-compile-features'Brad King2016-01-122-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3baca636 Record compile features for MinGW Clang on Windows (#15897)
| * | | | | | | Record compile features for MinGW Clang on Windows (#15897)Brad King2016-01-112-2/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the 'UNIX' condition on Clang compiler features. This enables use of compile features with MinGW Clang, though additional work may be needed for clang-cl.
* | | | | | | Merge topic 'vs-global-properties'Brad King2016-01-122-0/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af39f115 VS: Implement VS_GLOBAL_* target properties in VS 2010+ (#13666)
| * | | | | | | VS: Implement VS_GLOBAL_* target properties in VS 2010+ (#13666)Mike Fitzgerald2016-01-112-0/+31
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been documented but previously only implemented for VS 2008 and below.
* | | | | | | Merge topic 'vs-link-debug-property'Brad King2016-01-127-25/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3677b35 VS: Map the link `/debug` to its IDE property c22da7cf VS: Drop unused condition in link debug flag generation 4ca9df8b cmIDEOptions: Add support for case-insensitive flags
| * | | | | | | VS: Map the link `/debug` to its IDE propertyBrad King2016-01-115-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the link flag table entries for this flag to be case-insensitive. Also fix the VS 2015 value for the build property enumeration name. This causes `linkOptions.Parse(...)` to correctly extract the `/debug` flag and map it to the IDE property instead. Therefore we do not need to look for the flag explicitly when initializing the property.
| * | | | | | | VS: Drop unused condition in link debug flag generationBrad King2016-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `linkOptions.IsDebug()` call never returns true because it checks for `DebugInformationFormat` which is a compiler (cl) flag.
| * | | | | | | cmIDEOptions: Add support for case-insensitive flagsBrad King2016-01-112-2/+9
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2016-01-121-1/+1
|/ / / / / /
* | | | | | Merge topic 'vs14-debug-enum'Brad King2016-01-111-2/+18
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | f086c665 VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)
| * | | | | VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)Brad King2016-01-081-2/+18
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with VS 2015 the GenerateDebugInformation build property is an enumeration (`No`, `Debug`, `DebugFastLink`) instead of a boolean value (`false`, `true`). For now we simply change to `No` and `Debug` fix current behavior. Support for `/debug:fastlink` can be added later.
* | | | | Merge topic 'FindBLAS-intel-64lp'Brad King2016-01-111-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2b48f63c FindBLAS: Fix pattern matching on BLAS vendor name
| * | | | | FindBLAS: Fix pattern matching on BLAS vendor nameBrad King2016-01-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The if(STREQUAL) expressions do not support globbing expressions. Use regular experssions with MATCHES instead. Reported-by: Yahui Wang <youngqv@foxmail.com>
* | | | | | CMake Nightly Date StampKitware Robot2016-01-111-1/+1
| | | | | |
* | | | | | 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
| | | | | | | | | |