summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-gui-static-xcb'Brad King2016-07-012-0/+11
|\ | | | | | | | | 73a3c0cd cmake-gui: Add build option to use Qt5 xcb plugin statically
| * cmake-gui: Add build option to use Qt5 xcb plugin staticallyBrad King2016-06-302-0/+11
| | | | | | | | This will enable builds against a static Qt5.
* | CMake Nightly Date StampKitware Robot2016-07-011-1/+1
|/
* Merge topic 'try_compile-config-flags'Brad King2016-06-302-1/+41
|\ | | | | | | | | d582c23a try_compile: Add policy CMP0066 to honor CMAKE_<LANG>_FLAGS_<CONFIG>
| * try_compile: Add policy CMP0066 to honor CMAKE_<LANG>_FLAGS_<CONFIG>Brad King2016-06-292-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the `try_compile` source file signature we propagate the caller's value of `CMAKE_<LANG>_FLAGS` into the test project. Extend this to propagate `CMAKE_<LANG>_FLAGS_<CONFIG>` too instead of always using the default value in the test project. This will be useful, for example, to allow the MSVC runtime library to be changed (e.g. `-MDd` => `-MTd`). However, some projects may currently depend on this not being done, so we need to activate the behavior using a policy. This change was originally made by commit v3.6.0-rc1~160^2 (try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes, 2016-04-11) but without the policy and so had to be reverted during the 3.6 release candidate cycle. Fixes #16174.
* | Merge topic 'refactor-auto_ptr'Brad King2016-06-3048-169/+377
|\ \ | | | | | | | | | | | | b5ec5b09 Avoid using KWSys auto_ptr by adopting it ourselves
| * | Avoid using KWSys auto_ptr by adopting it ourselvesBrad King2016-06-2948-169/+377
| |/ | | | | | | | | | | | | | | | | | | | | | | Replace use of cmsys::auto_ptr with a CM_AUTO_PTR macro that maps to our own implementation adopted from the KWSys auto_ptr implementation. Later we may be able to map CM_AUTO_PTR to std::auto_ptr on compilers that do not warn about it. Automate the client site conversions: git grep -l auto_ptr -- Source/ | grep -v Source/kwsys/ | xargs sed -i \ 's|cmsys::auto_ptr|CM_AUTO_PTR|;s|cmsys/auto_ptr.hxx|cm_auto_ptr.hxx|'
* | Merge topic 'CM_OVERRIDE-cmTypeMacro'Brad King2016-06-301-2/+5
|\ \ | | | | | | | | | | | | 4e8480db cmTypeMacro: mark overridden functions with CM_OVERRIDE
| * | cmTypeMacro: mark overridden functions with CM_OVERRIDETobias Hunger2016-06-291-2/+5
| | |
* | | Merge topic 'CM_OVERRIDE-clang'Brad King2016-06-301-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 3f77655d CM_OVERRIDE: fix feature test for clang
| * | | CM_OVERRIDE: fix feature test for clangDaniel Pfeifer2016-06-291-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | Clang refuses to default initialize an instance of a class that does not have a default constructor. Fix the check by adding default constructors. Don't use brace initialization like it is proposed in the error message. We want to test the override support independent from the support for brace initialization.
* | | CMake Nightly Date StampKitware Robot2016-06-301-1/+1
| |/ |/|
* | Merge topic 'revert-try_compile-config-flags'Brad King2016-06-291-8/+0
|\ \ | |/ |/| | | | | 943fe6e3 Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"
| * Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"Brad King2016-06-281-8/+0
| | | | | | | | | | | | | | | | | | | | Revert commit v3.6.0-rc1~160^2 (try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes, 2016-04-11). The behavior it introduced can break projects that depend on the lack of such behavior. We will have to introduce a policy or other mechanism to enable the behavior in a compatible way. Simply revert it for now. See issue #16174.
* | CMake Nightly Date StampKitware Robot2016-06-291-1/+1
| |
* | Merge topic 'compiler-features'Brad King2016-06-28400-2124/+2302
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 059a6ca0 Merge branch 'unknown-aliased-target' into compiler-features 1d6909a2 use CM_NULLPTR b4b73f56 cxx features: add check for nullptr a7a92390 mark functions with CM_OVERRIDE 9e2d6f0c CM_OVERRIDE: mark destructor overridden in the feature test. 2ca76a66 Validate target name in ALIASED_TARGET property getter
| * \ Merge branch 'unknown-aliased-target' into compiler-featuresBrad King2016-06-282-20/+15
| |\ \
| | * | Validate target name in ALIASED_TARGET property getterGregor Jasny2016-06-262-20/+15
| | | |
| * | | use CM_NULLPTRDaniel Pfeifer2016-06-28201-1075/+1143
| | | |
| * | | cxx features: add check for nullptrDaniel Pfeifer2016-06-273-0/+22
| | | |
| * | | mark functions with CM_OVERRIDEDaniel Pfeifer2016-06-27216-1034/+1125
| | | |
| * | | CM_OVERRIDE: mark destructor overridden in the feature test.Daniel Pfeifer2016-06-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important for two reasons: 1. A compiler might warn about a class that has a virtual member function but no virtual destructor. We don't want to treat the feature as incomplete in this case. 2. MSVC10 supports the override identifier except on destructors. In this case, the feature really is incomplete and we want to detect it as such.
* | | | Merge topic 'ninja-no-rsp-for-rc'Brad King2016-06-281-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 15b3f6f0 ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC files
| * | | | ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC filesBen Boeckel2016-06-271-2/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~174^2 (Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE for compile rules, 2016-04-06), Ninja learned to look for `CMAKE_NINJA_FORCE_RESPONSE_FILE` in the current scope or the environment in order to force response file usage for all compilation rules. However, on Windows, the RC compiler goes through cmcldeps which does a `replace(output, output + ".dep.obj")` on the command line. However, with a response file (which we name `output + ".rsp"`), the response file path is replaced instead causing the compiler to (correctly) complain that the response file `output + ".dep.obj.rsp"` does not exist. What needs to happen is for cmcldeps to look through the response file, replace *its* contents and place it in the `output + ".dep.obj.rsp"` file. Also add a test which actually compiles an RC file into a library and executable for all generators on Windows and additionally test `CMAKE_NINJA_FORCE_RESPONSE_FILE` for Ninja generators. Fixes #16167.
| * | | CMake 3.6.0-rc3v3.6.0-rc3Brad King2016-06-221-1/+1
| | | |
| * | | Merge branch 'CodeBlocks-include-order' into releaseBrad King2016-06-171-7/+11
| |\ \ \
| * \ \ \ Merge branch 'revert-vs-clang-minsize' into releaseBrad King2016-06-171-1/+0
| |\ \ \ \
| * | | | | CMake 3.6.0-rc2v3.6.0-rc2Brad King2016-06-131-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-281-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'compiler-features'Brad King2016-06-2729-178/+241
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7647f6af Add CM_OVERRIDE to some functions 5286110d cxx features: add check for override 09aa2c94 Use <unordered_set> where available ea5477e4 Make C++ feature checks extensible
| * | | | | Add CM_OVERRIDE to some functionsDaniel Pfeifer2016-06-2716-138/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run clang-tidy's modernize-use-override checker. This checker must have issues in version 3.8. It has way too little matches. And it adds override to destructors. Revert the changes on the destructors and change override to CM_OVERRIDE.
| * | | | | cxx features: add check for overrideDaniel Pfeifer2016-06-273-0/+28
| | | | | |
| * | | | | Use <unordered_set> where availableDaniel Pfeifer2016-06-275-2/+18
| | | | | |
| * | | | | Make C++ feature checks extensibleDaniel Pfeifer2016-06-279-38/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn the feature check for cxx11_unordered_map into a function such that we can use it for other features as well. Drop the 11 suffix, as we may want to check features from other standards.
* | | | | | Merge topic 'ninja-osx-content-on-target'Brad King2016-06-272-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8bbd5db4 Ninja: Make bundle resources a dependency of their target
| * | | | | | Ninja: Make bundle resources a dependency of their targetFlorent Castelli2016-06-232-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13816.
* | | | | | | CMake Nightly Date StampKitware Robot2016-06-271-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-261-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-251-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-241-1/+1
|/ / / / /
* | | | | Merge topic 'vs-tool-override'Brad King2016-06-231-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ed05f11d VS: Add a VS_TOOL_OVERRIDE source file property
| * | | | | VS: Add a VS_TOOL_OVERRIDE source file propertyGilles Khouzam2016-06-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property allow to specify a specific Visual Studio tool for a source file overriding the default tool behavior. For example, a `.resw` file being processed as a `PriResource` file. This has the advantage of being able to teach CMake to process new file types without code modifications.
* | | | | | Merge topic 'vs-sdk-refs'Brad King2016-06-231-1/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35a6cac2 VS: Add VS_SDK_REFERENCES target property to reference external SDKs
| * | | | | | VS: Add VS_SDK_REFERENCES target property to reference external SDKsGilles Khouzam2016-06-221-1/+21
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Allow one to specify external SDK references such as `Microsoft.AdMediatorWindows81, Version=1.0`.
* | | | | | Merge topic 'xcode-bundle-extension'Brad King2016-06-231-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e36e5a26 Xcode: Properly handle BUNDLE_EXTENSION
| * | | | | | Xcode: Properly handle BUNDLE_EXTENSIONGregor Jasny2016-06-181-0/+5
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2016-06-231-1/+1
| |_|/ / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-221-1/+1
| | | | | |
* | | | | | Merge topic 'output-converter'Brad King2016-06-214-48/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ddbd4c2 cmOutputConverter: remove unnecessary conversion bdaadbdc cmOutputConverter: collapse ConvertToOutputForExisting functions 191fc3a0 cmOutputConverter: remove unused 'local' argument b86007e3 cmOutputConverter: remove 'optional' argument cde127b0 cmOutputConverter::Convert: invert condition c23f89bc cmOutputConverter::Convert: make precondition explicit
| * | | | | | cmOutputConverter: remove unnecessary conversionDaniel Pfeifer2016-06-201-6/+4
| | | | | | |