summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.6.1v3.6.1Brad King2016-07-221-1/+1
|
* Merge branch 'revert-autogen-subdirs' into releaseBrad King2016-07-213-159/+45
|\
| * Autogen: Revert changes to generate moc/rcc in subdirectoriesBrad King2016-07-213-159/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert these commits: * v3.6.0-rc1~134^2 Tests: QtAutogen: Same source name in different directories test, 2016-04-13 * v3.6.0-rc1~134^2~1 Autogen: Generate qrc_NAME.cpp files in subdirectories, 2016-04-19 * v3.6.0-rc1~134^2~2 Autogen: Generate not included moc files in subdirectories, 2016-04-19 They regress existing builds that depend on the paths/symbols generated previously. Another approach will be needed to solve the name collision problem they were intended to solve. Leave the error diagnostics for the colliding cases that were added in the same topic as the above commits because they provide a useful early failure in relevant cases. Fixes #16209.
* | Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into releaseBrad King2016-07-191-1/+2
|\ \
| * | CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS valueBrad King2016-07-191-1/+2
| |/ | | | | | | | | | | | | | | | | | | Since commit v3.6.0-rc1~339^2 (CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option, 2016-02-18) we now honor the "Directory" option of this variable. Prior to that commit the value was not used so projects may have used a placeholder value like `.` instead of `/`. Treat `.` the same as `/` to restore compatibility with such projects. Fixes #16205.
* | Merge branch 'ninja-no-accidental-rsp' into releaseBrad King2016-07-151-1/+1
|\ \
| * | Ninja: Do not force response files when no sysconf(3) limit is usedBrad King2016-07-151-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | Commit v3.6.0-rc1~174^2~1 (cmGlobalNinjaGenerator: Clarify logic for forcing use of response files, 2016-04-06) started using negative command line length values to represent forced use of response files but forgot to update `calculateCommandLineLengthLimit()` accordingly. Teach it to return `0` instead of `-1` when no limit is computed from the system to avoid forcing response files. Reported-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
* | Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-07-131-1/+2
|\ \
| * | VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986)Brad King2016-07-131-1/+2
| | |
* | | Restore find_(library|file|path) search of PATH itselfBrad King2016-07-111-4/+2
| |/ |/| | | | | | | | | | | | | | | | | | | The fix in commit commit v3.6.0-rc1~82^2 (Drop find_(library|file|path) prefixes from PATH on non-Windows, 2016-05-09) aggressively dropped search of the entries in PATH itself in addition to the prefixes derived from it. This regresses find modules that (incorrectly) depended on the behavior, including some of our own modules such as FindImageMagick. Restore the search of entries in PATH itself. If we want to drop it later we will need to do so with a policy. Fixes #16192.
* | CMake 3.6.0v3.6.0Brad King2016-07-071-1/+1
| |
* | CPackIFW: Fix attributes for Promoting Updates repository replacementKonstantin Podsvirov2016-07-051-2/+2
| | | | | | | | | | Fix spelling of attributes added by commit v3.6.0-rc1~52^2 (CPackIFW: Add support for Promoting Updates, 2016-05-17).
* | CMake 3.6.0-rc4v3.6.0-rc4Brad King2016-06-291-1/+1
| |
* | Merge branch 'revert-try_compile-config-flags' into releaseBrad King2016-06-281-8/+0
|\ \
| * | 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.
* | | 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
|\ \
| * | cmExtraCodeBlocksGenerator: Do not shuffle include directoriesTobias Hunger2016-06-171-7/+11
| |/ | | | | | | | | Report include directories in a sensible order. Do not shuffle them when trying to make them unique.
* | Merge branch 'revert-vs-clang-minsize' into releaseBrad King2016-06-171-1/+0
|\ \
| * | VS: Fix regressed mapping for the cl `/Os` compiler flagBrad King2016-06-171-1/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct compiler settings, 2016-02-18) a flag mapping was added for the clang `-Os` flag. However, this collides with a mapping we already had for the MSVC flag of the same name. This is a symptom of a larger problem in that the VS generators need a per-toolset flag map (issue #16153). For now, simply drop the new mapping and drop `-Os` from clang compiler flags in the MinSizeRel configuration. Reported-by: Felix Bruns <felixbruns@gmail.com>
* | CMake 3.6.0-rc2v3.6.0-rc2Brad King2016-06-131-1/+1
| |
* | cmake-gui: Teach Qt5 where plugins are when launched through a symlinkRobert Maynard2016-06-091-0/+34
| | | | | | | | | | | | | | | | When we are on OSX and we are launching cmake-gui from a symlink, the application will fail to launch as it can't find the qt.conf file which tells it what the name of the plugin folder is. We need to add this path BEFORE the application is constructed as that is what triggers the searching for the platform plugins
* | Merge branch 'fix-TARGET_PROPERTY-LOCATION-crash' into releaseBrad King2016-06-021-3/+9
|\ \
| * | Fix crash on $<TARGET_PROPERTY:...,LOCATION> genex (#16134)Brad King2016-06-021-3/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policy CMP0026 deprecated the LOCATION property, and we have long provided a $<TARGET_FILE:...> generator expression. However, if a project tries to use $<TARGET_PROPERTY:...,LOCATION> we should at least not crash. The compatibility implementation of the LOCATION property uses cmGlobalGenerator::CreateGenerationObjects to create the structures needed to evaluate the property before generation starts. The implementation assumed that accessing the property could only be done during configuration (via the typical get_property command use case). The $<TARGET_PROPERTY:...,LOCATION> genex causes the LOCATION property to be accessed during generation. Calling CreateGenerationObjects during generation blows away all the objects currently being used for generation and is not safe. Add a condition to call it only when configuration is not finished.
* | CMake 3.6.0-rc1 version updateBrad King2016-06-011-3/+3
|/
* Merge topic 'minor-cleanups'Brad King2016-06-012-2/+2
|\ | | | | | | | | | | bd4fef64 cmSourceFileLocation: Fix typo in comment 814e774e cmSearchPath: Fix typo in comment
| * cmSourceFileLocation: Fix typo in commentTobias Hunger2016-06-011-1/+1
| |
| * cmSearchPath: Fix typo in commentTobias Hunger2016-06-011-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-06-011-1/+1
|/
* CMake Nightly Date StampKitware Robot2016-05-311-1/+1
|
* CMake Nightly Date StampKitware Robot2016-05-301-1/+1
|
* CMake Nightly Date StampKitware Robot2016-05-291-1/+1
|
* CMake Nightly Date StampKitware Robot2016-05-281-1/+1
|
* Merge topic 'remove-needless-copies'Brad King2016-05-2732-69/+62
|\ | | | | | | | | | | 27ead963 Remove unnecessary local copies. 618fb23f Pass arguments that are not modified as const&.
| * Remove unnecessary local copies.Daniel Pfeifer2016-05-269-25/+16
| | | | | | | | | | | | | | Use clang-tidy's performance-unnecessary-copy-initialization checker. After applying the fix-its (which turns the copies into const&), revise the changes and see whether the copies can be removed entirely by using the original instead.
| * Pass arguments that are not modified as const&.Daniel Pfeifer2016-05-2624-44/+46
| | | | | | | | | | | | | | Use clang-tidy's performance-unnecessary-value-param checker to find value parameter declarations of expensive to copy types that are not modified inside the function. Ignore findings in kwsys. After applying the fix-its, manually change `const T&` to `T const&`.
* | Merge topic 'remove-needless-c_str'Brad King2016-05-2717-51/+40
|\ \ | | | | | | | | | | | | 1b2bb933 Remove redundant c_str() calls.
| * | Remove redundant c_str() calls.Daniel Pfeifer2016-05-2617-51/+40
| |/ | | | | | | | | Run clang-tidy's readability-redundant-string-cstr checker. Ignore findings in kwsys.
* | CMake Nightly Date StampKitware Robot2016-05-271-1/+1
|/
* Merge topic 'try_compile-custom-variables'Brad King2016-05-261-74/+69
|\ | | | | | | | | | | d256ba07 try_compile: Optionally forward custom platform variables to test project fb4791b3 cmCoreTryCompile: Refactor forwarding of variables to test project
| * try_compile: Optionally forward custom platform variables to test projectBrad King2016-05-251-0/+9
| | | | | | | | | | | | | | | | | | Add a `CMAKE_TRY_COMPILE_PLATFORM_VARIABLES` variable to specify a list of custom variables to be forwarded to a `try_compile` test project. This will be useful for platform information modules or toolchain files to forward some platform-specific set of variables from the host project (perhaps set in its cache) to the test project so that it can build the same way.
| * cmCoreTryCompile: Refactor forwarding of variables to test projectBrad King2016-05-251-74/+60
| | | | | | | | | | | | | | De-duplicate the logic that constructs the cmake `-D` flag used to pass variables into the test project cache. Also subsume variables that were propagated by generating `set()` commands in the project and pass them as cache entries instead.
* | Merge topic 'fix-variable-watch-leak'Brad King2016-05-261-2/+4
|\ \ | | | | | | | | | | | | 75e3e0d3 cmVariableWatch: Fix potential memory leak
| * | cmVariableWatch: Fix potential memory leakBrad King2016-05-251-2/+4
| |/ | | | | | | | | Teach cmVariableWatch::AddWatch to own the Pair it allocates until it needs to pass ownership to WatchMap.
* | Merge topic 'cpack-dmg-no-app-link'Brad King2016-05-261-5/+10
|\ \ | | | | | | | | | | | | 3acc29fc CPack/DragNDrop: Optionally disable `/Applications` symlink
| * | CPack/DragNDrop: Optionally disable `/Applications` symlinkHarry Mallon2016-05-251-5/+10
| |/
* | Merge topic 'style-cmSystemTools'Brad King2016-05-261-1/+1
|\ \ | | | | | | | | | | | | 8e801eb5 cmSystemTools: Fix indentation typo
| * | cmSystemTools: Fix indentation typoBrad King2016-05-251-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-05-261-1/+1
| |/ |/|
generated by cgit v0.12 at 2025-02-02 21:57:21 (GMT)