summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.0.0-rc3v3.0.0-rc3Brad King2014-03-201-1/+1
|
* Merge branch 'add_custom_command-no-INTERFACE-lib' into releaseBrad King2014-03-192-1/+10
|\
| * Disallow INTERFACE libraries with add_custom_command(TARGET).Stephen Kelly2014-03-192-1/+10
| | | | | | | | Don't attempt to trace their dependencies.
* | QtDialog: Fix Qt 5 build on non-Windows.Stephen Kelly2014-03-191-1/+1
|/ | | | | The Qt5Core_QTMAIN_LIBRARIES variable is defined to the Qt5::WinMain target on Windows, and undefined elsewhere.
* CMake 3.0.0-rc2v3.0.0-rc2Brad King2014-03-171-1/+1
|
* Merge branch 'CONFIG-LOCATION-CMP0026' into releaseBrad King2014-03-171-0/+15
|\
| * cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808)Stephen Kelly2014-03-171-0/+15
| | | | | | | | | | | | | | Restore support for the undocumented <CONFIG>_LOCATION target property removed by commit v3.0.0-rc1~175^2 (cmTarget: Remove support for <CONFIG>_LOCATION property, 2013-12-30) as part of the CMP0026 OLD behavior.
* | Merge branch 'fix-Qt5-windows-build' into releaseBrad King2014-03-171-2/+6
|\ \ | |/ |/|
| * QtDialog: Avoid linking to Qt4 WinMain when using Qt 5.Stephen Kelly2014-03-171-2/+6
| | | | | | | | | | | | Override the QT_QTMAIN_LIBRARY cache variable with a regular variable in the Qt 5 configuration. This avoids linking with the Qt 4 version of the WinMain library.
* | cmTarget: Don't create duplicate backtraces in CMP0046 warningStephen Kelly2014-03-121-4/+3
|/
* Merge branch 'fix-AUTOGEN-custom-command-depends' into releaseBrad King2014-03-101-0/+12
|\
| * QtAutogen: Fix AUTOGEN depends on custom command output with VS.Stephen Kelly2014-03-101-0/+12
| | | | | | | | | | | | | | | | Visual Studio is handled as a special case for autogen depends. However, the special handling works only for target dependencies, not file dependencies output by a custom command. Use a PRE_BUILD step only if all depends are targets.
* | Merge branch 'fix-policy-scopes' into releaseBrad King2014-03-103-4/+7
|\ \
| * | Record more policies on targets when createdBrad King2014-03-063-4/+7
| | | | | | | | | | | | | | | Policies CMP0027, CMP0038, and CMP0046 have per-target meaning so record the policy settings on targets as they are created.
* | | Merge branch 'fix-check-build-system-crash' into releaseBrad King2014-03-041-1/+1
|\ \ \ | |_|/ |/| |
| * | cmake: Fix --check-build-system argument count check (#14784)Brad King2014-03-041-1/+1
| |/ | | | | | | | | This internal option requires two arguments, not just one. Fix the argument count required to recognize the option.
* | Merge branch 'fix-showinclude-warnings' into releaseBrad King2014-02-262-2/+18
|\ \
| * | CTest: exclude /showIncludes notes when scraping logsNils Gladitz2014-02-252-2/+18
| |/ | | | | | | | | | | | | | | My last related commit e5e3f3d4 (CTest: filter /showIncludes output from ninja compile launcher, 2013-12-01) filtered /showIncludes messages from the generated xml output but they also need to be filtered in ScrapeLog(). Otherwise they are being detected as warnings when using compilers withs english diagnostics.
* | Merge branch 'install-FILES-genex' into releaseBrad King2014-02-245-17/+81
|\ \
| * | install: Support generator expressions in FILES and PROGRAMS modeBrad King2014-02-215-7/+60
| | | | | | | | | | | | | | | | | | | | | | | | Teach the install(FILES) and install(PROGRAMS) commands to evaluate generator expressions in the list of files. Extend the ExportImport test to cover installation cases involving generator expressions.
| * | cmInstallFilesGenerator: Add reference to calling cmMakefileBrad King2014-02-215-10/+21
| |/ | | | | | | | | | | Add a Makefile member to the cmInstallFilesGenerator class and populate it on construction. This will be useful in a following change to evaluate generator expressions with proper context.
* | Change version scheme to use only two components for feature levelsBrad King2014-02-198-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically CMake used three version components for the feature level. We released new features while incrementing only the third version component. Since commit v2.8.2~105^2~4 (New version scheme to support branchy workflow, 2010-04-23) we used the fourth version component for bug-fix releases and the development date: <major>.<minor>.<patch>[.<tweak>][-rc<n>] = Release <major>.<minor>.<patch>.<date>[-<id>] = Development This solidified use of three components for the feature level, and was necessary to continue releasing 2.x versions because: * Some existing projects performed floating-point comparisons of ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} to 2.x numbers so ``x`` could never be higher than 9. * Version 2.9.<date> was used briefly in post-2.8.0 development in CVS prior to the transition to Git, so using it in releases may have caused confusion. Now that we are moving to 3.x versions, these two restrictions go away. Therefore we now change to use only two components for the feature level and use the scheme: <major>.<minor>.<patch>[-rc<n>] = Release <major>.<minor>.<date>[-<id>] = Development
* | CMake 3.0.0-rc1 version updateBrad King2014-02-193-7/+7
|/
* Merge topic 'minor-cleanups'Brad King2014-02-194-3/+4
|\ | | | | | | | | | | | | | | | | | | f6cae4ea Tests: Remove some trailing black lines. c0ea4c5c Makefile: Fix comment indentation. 5e0c73c7 cmGlobalGenerator: Remove unused variable. 907c09cd include_directory: Add missing include. a74d125a Help: Fix typo 317d8498 Small typo fix
| * Makefile: Fix comment indentation.Stephen Kelly2014-02-171-1/+1
| |
| * cmGlobalGenerator: Remove unused variable.Stephen Kelly2014-02-171-1/+0
| |
| * include_directory: Add missing include.Stephen Kelly2014-02-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | The cmGeneratorExpression is used here, but the header for it is not in the include heirarchy. This would be a compile error if the file were compiled as a standalone translation unit, but it is instead used in a mini-unity-build by inclusion in cmCommands.cxx. The header for cmGeneratorExpression happens to be included first, so the compilation works fine. IDEs do not know this however, and flag the use as an error.
| * Small typo fixKevin Funk2014-02-171-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-02-191-1/+1
| |
* | CMake Nightly Date StampKitware Robot2014-02-181-1/+1
| |
* | Merge topic 'windows-filesystem-retry-config'Brad King2014-02-173-8/+60
|\ \ | | | | | | | | | | | | 7b1f966a Windows: Make file delete/rename retry configurable
| * | Windows: Make file delete/rename retry configurableBrad King2014-02-123-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several CMake operations need to replace files in rapid succession. This commonly fails on Windows due to filesystem lock behavior so we have retry loops. No matter how many times we retry or how long we delay there will inevitably be someone with an environment that needs more. Make the retry count and delay configurable in the Windows Registry keys: {HKCU,HKLM}/Software/Kitware/CMake/Config in DWORD values FilesystemRetryCount = Number of tries FilesystemRetryDelay = Delay in milliseconds between tries Leave the feature undocumented for now to see how it goes.
* | | Merge topic 'INTERFACE-no-sources'Brad King2014-02-173-5/+10
|\ \ \ | | | | | | | | | | | | | | | | 9db9c1fc cmTarget: Don't try to get sources of an INTERFACE_LIBRARY.
| * | | cmTarget: Don't try to get sources of an INTERFACE_LIBRARY.Stephen Kelly2014-02-143-5/+10
| | | | | | | | | | | | | | | | An an assert to ensure this.
* | | | Merge topic 'KateHandleSpacesInPath'Brad King2014-02-172-10/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 22e5c6c2 Kate: handle spaces in build dir
| * | | | Kate: handle spaces in build dirAlex Neundorf2014-02-172-10/+9
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | They need to be escaped in the json file... I'm quite sure I tested this before, obviously I didn't test it correctly. Alex
* | | | CMake Nightly Date StampKitware Robot2014-02-171-1/+1
|/ / /
* | | CMake Nightly Date StampKitware Robot2014-02-161-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-02-151-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-02-141-1/+1
|/ /
* | Merge topic 'dev/ninja-speedup'Brad King2014-02-132-43/+51
|\ \ | | | | | | | | | | | | 26762e16 Ninja: Cache target-level flags
| * | Ninja: Cache target-level flagsBen Boeckel2014-02-132-43/+51
| |/ | | | | | | | | | | Instead of figuring out target flags per-source file, cache the flags that are being used. This results in a *much* faster generate time for Ninja.
* | Merge topic 'osx-sysroot-escape'Brad King2014-02-131-1/+1
|\ \ | | | | | | | | | | | | 77b2e6f1 OS X: Escape path given to -isysroot flag
| * | OS X: Escape path given to -isysroot flagBrad King2014-02-121-1/+1
| |/ | | | | | | | | Ensure that paths containing spaces or other special characters are escaped correctly on the command line.
* | CMake Nightly Date StampKitware Robot2014-02-131-1/+1
| |
* | Merge topic 'backward-compatibility'Brad King2014-02-124-0/+74
|\ \ | | | | | | | | | | | | | | | f2eee72f add_custom_command: Disallow use of SOURCE signatures. c248a437 Add policy CMP0049 to avoid variable expansion in source lists
| * | add_custom_command: Disallow use of SOURCE signatures.Stephen Kelly2014-02-123-0/+36
| | | | | | | | | | | | Add CMP0050 to control this behavior.
| * | Add policy CMP0049 to avoid variable expansion in source listsStephen Kelly2014-02-123-0/+38
| | |
* | | Merge topic 'dev/fix-sublime-compile-flags'Brad King2014-02-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 2d9f93ab Sublime: Pass language and config properly
| * | | Sublime: Pass language and config properlyBen Boeckel2014-02-111-1/+1
| |/ /