summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | |
| * | | | | | cmOutputConverter: collapse ConvertToOutputForExisting functionsDaniel Pfeifer2016-06-202-22/+6
| | | | | | |
| * | | | | | cmOutputConverter: remove unused 'local' argumentDaniel Pfeifer2016-06-204-15/+8
| | | | | | |
| * | | | | | cmOutputConverter: remove 'optional' argumentDaniel Pfeifer2016-06-202-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the 'optional' paramenter from the second overload of the Convert function. This parameter is used from one single location. Inline the codepath for which the argument is true to the callsite.
| * | | | | | cmOutputConverter::Convert: invert conditionDaniel Pfeifer2016-06-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the control flow of the 'optional' argument more explicit.
| * | | | | | cmOutputConverter::Convert: make precondition explicitDaniel Pfeifer2016-06-201-2/+4
| | | | | | |
* | | | | | | Merge topic 'refactor-flags'Brad King2016-06-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41925efe cmGeneratorTarget: Fix Fortran module directory regression
| * | | | | | | cmGeneratorTarget: Fix Fortran module directory regressionBrad King2016-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 49f10f0d (cmGeneratorTarget: Adopt Fortran module directory generation, 2016-06-10) accidentally made a local variable declared `static` causing results to be re-used incorrectly.
* | | | | | | | CMake Nightly Date StampKitware Robot2016-06-211-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'cmDependsJavaParserHelper-dangling-ptr'Brad King2016-06-202-37/+19
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | fe27879c cmDependsJavaParserHelper: fix dangling pointer
| * | | | | | cmDependsJavaParserHelper: fix dangling pointerDaniel Pfeifer2016-06-202-37/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmDependsJavaParserHelper tries to implement a "deep copy" in the assignment operator of the internal class CurrentClass. To do that, it uses std::copy and std::back_inserter. The copy constructor is implemented in terms of the assignment operator but it does not initialize the member NestedClasses, a pointer to vector. This pointer is dereferenced in the assignment operator. Change the pointer to a value and rely on the compiler generated special functions.
* | | | | | | Merge topic 'cmake-trace-source'Brad King2016-06-204-1/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e63151ff cmake: Add an option to control what files needs to be traced
| * | | | | | | cmake: Add an option to control what files needs to be tracedAlex Turbov2016-06-174-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even in relatively small projects using `--trace` (and `--trace-expand`) may produce a lot of output. When developing a custom module usually one is interested in output of only a few particular modules. Add a `--trace-source=<file>` option to enable tracing only a subset of source files. The final output would be only from requested modules, ignoring anything else not matched to given filename(s).