summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmLocalVisualStudio7Generator: Fix name of helper functionBrad King2016-03-091-3/+3
| | | | | Rename `cmLVS6G_IsFAT` to `cmLVS7G_IsFAT` since it is for the local VS 7 generator and not VS 6.
* Merge topic 'update-kwsys'Brad King2016-03-094-13/+14
|\ | | | | | | | | | | ea04ec09 Merge branch 'upstream-KWSys' into update-kwsys 4ba9b473 KWSys 2016-03-08 (6b60c184)
| * Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-03-084-13/+14
| |\ | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-03-08 (6b60c184)
| | * KWSys 2016-03-08 (6b60c184)KWSys Upstream2016-03-084-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 6b60c1843dbba9d4929496f9292cc78dab945c68 (master). Upstream Shortlog ----------------- Mariusz PluciƄski (1): 6b60c184 SystemInformation: Fix compilation on VS Clang/C2 toolset Sean McBride (3): 6ea22e65 Suppressed clang -Wcomma warnings with void cast 8d9d489d Fixed clang-tidy warnings about macros missing defensive parens 1c544330 Made private method static to silence warning
* | | Merge topic 'deprecate-CMakeForceCompiler'Brad King2016-03-093-11/+21
|\ \ \ | | | | | | | | | | | | | | | | d929c35f CMakeForceCompiler: Deprecate this module and its macros
| * | | CMakeForceCompiler: Deprecate this module and its macrosBrad King2016-03-083-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We originally deprecated this module in commit v3.5.0-rc1~295^2 (CMakeForceCompiler: Deprecate this module and its macros, 2015-10-19). Then a use case was found to still require the module so the deprecation was reverted for CMake 3.5 by commit v3.5.0-rc3~4^2 (CMakeForceCompiler: De-deprecate until more use cases have alternatives, 2016-02-17). Since then `CMAKE_TRY_COMPILE_TARGET_TYPE` was introduced to provide an alternative solution for that use case. Deprecate the module again.
* | | | Merge topic 'add-FindLTTngUST'Brad King2016-03-099-1/+182
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a4194deb Add FindLTTngUST module to find LTTng-UST library
| * | | | Add FindLTTngUST module to find LTTng-UST libraryPhilippe Proulx2016-03-079-1/+182
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Also detect the library version number. Provide results as variables and as an imported target, LTTng::UST. Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
* | | | Merge topic 'GetPrerequisites-canonical-path'Brad King2016-03-091-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 37e8ccee GetPrerequisites: Fix gp_resolved_file_type on non-canonical paths
| * | | | GetPrerequisites: Fix gp_resolved_file_type on non-canonical pathsBrad King2016-03-081-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canonicalize the input paths so we treat them both consistently, in particular when comparing them via string operations. This is needed for calls like fixup_bundle("${CMAKE_INSTALL_PREFIX}/../test" ...) Suggested-by: Benjamin Ballet <bballet@ivsweb.com>
* | | | CMake Nightly Date StampKitware Robot2016-03-091-1/+1
| | | |
* | | | Merge branch 'release'Brad King2016-03-080-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | CMake 3.5.0v3.5.0Brad King2016-03-081-1/+1
| | | |
* | | | Merge branch 'release'Brad King2016-03-080-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'doc-find-python-call-order' into releaseBrad King2016-03-072-6/+8
| |\ \ \
| * \ \ \ Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-03-071-0/+28
| |\ \ \ \
* | \ \ \ \ Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-03-080-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | 3aa6fea6 VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)
| * | | | | VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986)Brad King2016-03-071-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08) we generate invalid project files for the v110 and v120 toolsets. VS complains: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(639,9): error MSB4030: "Debug" is an invalid value for the "GenerateDebugInformation" parameter of the "Link" task. The "GenerateDebugInformation" parameter is of type "System.Boolean". This reveals that our VS flag map selection should be based on the toolset instead of the version of VS. However, that will be a non-trivial change so for now fix this particular use case by hard-coding a correction to the flag map. Reported-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | Merge topic 'ninja-osx-versions'Brad King2016-03-085-37/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e165a64 Ninja: Add OS X dylib versioning (#14140) 1f2b39c6 cmCommonTargetGenerator: Adopt AppendOSXVerFlag method
| * | | | | | Ninja: Add OS X dylib versioning (#14140)Bruce Stephens2016-03-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the Ninja generator to add the `-current_version` and the `-compatibility_version` flags based on the VERSION and SOVERSION target properties just as the Makefile generators do. Signed-off-by: Bruce Stephens <bruce.r.stephens@gmail.com>
| * | | | | | cmCommonTargetGenerator: Adopt AppendOSXVerFlag methodBruce Stephens2016-03-074-37/+35
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move this method from cmMakefileLibraryTargetGenerator so it can be re-used for the Ninja generator too. Signed-off-by: Bruce Stephens <bruce.r.stephens@gmail.com>
* | | | | | Merge topic 'toolchain-file-project'Brad King2016-03-0813-0/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72e0dc58 Diagnose recursive project/enable_language without crashing (#15999)
| * | | | | | Diagnose recursive project/enable_language without crashing (#15999)Brad King2016-03-0713-0/+49
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling `project()` or `enable_language()` from a toolchain file will infinitely recurse since those commands load the toolchain file. Diagnose and reject this case with an error message instead of crashing when the stack eventually overflows.
* | | | | | Merge topic 'doc-find-python-call-order'Brad King2016-03-082-6/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 743f2a80 FindPython{Interp,Libs}: Clarify recommended call order
| * | | | | FindPython{Interp,Libs}: Clarify recommended call orderBrad King2016-03-072-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Improve wording in our advice about how to call both of these modules.
* | | | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-03-081-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f15665a VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)
| * | | | | | VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)Brad King2016-03-071-1/+2
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-03-081-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'BundleUtilities-dylib-in-framework'Brad King2016-03-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3906ca5a BundleUtilities: Fix regression handling frameworks
| * | | | | | BundleUtilities: Fix regression handling frameworksClinton Stimpson2016-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic error introduced in commit e422f738 (BundleUtilities: Fix treatment of .dylib inside .framework folders, 2016-02-11).
* | | | | | | Merge topic 'wix-module-fixes'Brad King2016-03-071-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4482dd9 CPackWIX: Support binary-only WiX installations
| * | | | | | | CPackWIX: Support binary-only WiX installationsMarc Chevrier2016-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix URLUPDATEINFO -> ARPURLUPDATEINFO reference in CPACK_WIX_PROPERTY_<PROPERTY> examples. Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
* | | | | | | | Merge topic 'update-osx-release'Brad King2016-03-073-10/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b682debd Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary
| * | | | | | | | Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binaryBrad King2016-02-193-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a new build machine to produce the OS X binary targeting OS X 10.7 and using Qt 5.5.
* | | | | | | | | Merge topic 'vs-vcxproj-ConfigurationType'Brad King2016-03-0710-35/+97
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6122909c VS: Add option to set `ConfigurationType` of a .vcxproj file
| * | | | | | | | | VS: Add option to set `ConfigurationType` of a .vcxproj fileFabian Otto2016-02-2610-35/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a VS_CONFIGURATION_TYPE target property to set this value explicitly. This is useful to build a Windows Kernel Mode Driver, for example.
* | | | | | | | | | Merge topic 'enable-ssl-automatically'Brad King2016-03-072-1/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 190a5fdf Automatically use OpenSSL by default on Linux and FreeBSD if available
| * | | | | | | | | | Automatically use OpenSSL by default on Linux and FreeBSD if availableBrad King2016-02-292-1/+17
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since https is almost ubiquitous nowadays we should support it by default whenever possible. When building our own curl, we already automatically enable SSL/TLS support on Windows and OS X by using the OS-native APIs. On UNIX platforms we need to use OpenSSL but have not done so by default before, leading to possible user confusion when https transfers fail later. Fix this by searching for OpenSSL quietly and enabling use of it automatically if it is found. Do this only on Linux and FreeBSD for now because on other UNIX platforms (e.g. AIX, HP-UX, SunOS) it seems too easy to find an OpenSSL that is not compatible with the target compiler.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-071-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-061-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-051-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-041-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-031-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-021-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-03-011-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-02-291-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-02-281-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-02-271-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'compiler-check-message'Brad King2016-02-261-5/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3ac0651 Improve compiler check message on non-Make generators
| * | | | | | | | Improve compiler check message on non-Make generatorsBrad King2016-02-251-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we check for a working compiler we print a message of the form: Check for working <LANG> compiler: ... At one time CMAKE_<LANG>_COMPILER was not well-defined for all generators so we printed the generator name instead of the path to the compiler. Nowadays we always know the compiler, so update the message to print it unconditionally. This is more informative than the generator name, especially when a toolset (cmake -T) is used. Suggested-by: Gregor Jasny <gjasny@googlemail.com>