summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.0.0-rc5v3.0.0-rc5Brad King2014-05-131-1/+1
|
* Merge branch 'ninja-intel-linux' into releaseBrad King2014-05-091-2/+4
|\
| * Ninja: Fix deptype for Intel compiler on LinuxBrad King2014-05-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~305^2 (Ninja: deptype msvc for Intel's compiler on Windows, 2013-11-25) we used "deps = msvc" for the Intel compiler. This is correct only on Windows. On Linux we still want "deps = gcc". Fix the logic to use "deps = msvc" when the compiler id or the "simulate id" is "MSVC". This will preserve the behavior on Intel for Windows and fix the behavior on Intel for Linux. In the future this should be converted to a platform information module variable.
* | cmTarget: Evaluate CMP0026 in calling contextBrad King2014-05-094-10/+19
| | | | | | | | | | | | | | | | | | | | This policy should be checked at the call site that tries to access the LOCATION property, not the directory scope containing the target. Thread the caller context through cmTarget::GetProperty to use for checking the policy setting and emitting a diagnostic with proper backtrace. Extend the RunCMake.CMP0026 test with a cross-directory case.
* | cmTarget: Drop unused GetProperty signatureBrad King2014-05-092-11/+3
|/ | | | | No callers use the second "scope" argument. Drop this signature and hard-code the default parameter value internally.
* Merge branch 'vs-fix-MANIFESTUAC' into releaseBrad King2014-05-073-12/+3
|\
| * VS: Fix /MANIFESTUAC:NO linker option mappingEric Berge2014-05-073-12/+3
| | | | | | | | | | | | | | There are no versions of /MANIFESTUAC:NO where addition values are appended. Remove both of the MANIFESTUAC:NO entries from our flag tables and replace them with one which would set EnableUAC to false and immediately stop processing the /MANIFESTUAC:NO option.
* | Merge branch 'desktop-icon' into releaseBrad King2014-05-071-1/+1
|\ \
| * | cmake-gui: Fix desktop file icon configurationJohannes Huber2014-05-071-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | Drop the icon file extension. This fixes the desktop file validation message: "CMakeSetup32.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path Applied-by: Rolf Eike Beer <eike@sf-mail.de>
* | ctest_build: Do not crash on bad generator nameBrad King2014-05-071-0/+9
|/ | | | | | | | | | If creation of the global generator fails, return early with an error message instead of trying to use the generator and crashing. Add a CTestTestBadGenerator test to cover this case. Reported-by: Mathieu Malaterre <malat@debian.org> Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747306
* KWSys SystemInformation: Include backtrace APIs whenever we use themBrad King2014-05-061-28/+15
| | | | | | Include execinfo.h, cxxabi.h, and dlfcn.h under the same conditions under which we use the APIs from them. Move their inclusion out of OS-specific blocks.
* Restore --help-full option to output all help manualsBrad King2014-04-253-3/+14
| | | | | | This option was removed during conversion to the reStructuredText documentation. Restore it. Process documentation starting at Help/index.rst so that all manuals are included in the output.
* Merge branch 'osx-CFBundle-info-plist' into releaseBrad King2014-04-221-1/+1
|\
| * OS X: Fix Info.plist placement in a CFBundleTim Blechmann2014-04-221-1/+1
| | | | | | | | | | | | | | Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the same root directory as the rest of the bundle. Without this, Info.plist was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because the target path was not generated correctly.
* | CMake 3.0.0-rc4v3.0.0-rc4Brad King2014-04-161-1/+1
|/
* Merge branch 'archive-null-error' into releaseBrad King2014-04-161-14/+21
|\
| * cmArchiveWrite: Handle NULL error string (#14882)Brad King2014-04-161-14/+21
| | | | | | | | | | If archive_error_string returns NULL, use a placeholder string instead of crashing.
| * CMake 2.8.12.2v2.8.12.2Brad King2014-01-161-1/+1
| |
| * Merge branch 'ninja_fix_rerun' into releaseBrad King2014-01-151-3/+0
| |\
| * \ Merge branch 'vs10-include-backslashes' into releaseBrad King2014-01-091-1/+3
| |\ \
| * \ \ Merge branch 'xcode-storyboard-file-type-2.8.12' into releaseBrad King2014-01-091-2/+4
| |\ \ \
| | * | | Xcode: Fix storyboard viewRuslan Baratov2014-01-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 56831461 (Xcode: Use explicitFileType to mark source types, 2013-04-16) the Xcode generator prefers to use explicitFileType to tell Xcode about each source file type. This works better than lastKnownFileType for some file types, but not for "file.storyboard". If storyboard file has attribute 'explicitFileType' it is displayed incorrectly (as raw xml). Switch it back to 'lastKnownFileType'.
| * | | | Merge branch 'fix-compile-OBJECT_DIR' into releaseBrad King2014-01-064-16/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'vs9-map-Fd' into releaseBrad King2014-01-061-0/+2
| |\ \ \ \ \
| * | | | | | CMake 2.8.12.1v2.8.12.1Brad King2013-11-051-1/+1
| | | | | | |
| * | | | | | Merge branch 'fix-automoc-compile-definitions' into releaseBrad King2013-11-052-4/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cmake-E-automoc-crash' into releaseBrad King2013-11-051-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | cmake: Validate -E cmake_automoc argument count (#14545)Brad King2013-11-051-1/+1
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Do not access an argument index not known to exist.
| * | | | | | | Merge branch 'clear-evaluation-files' into releaseBrad King2013-11-041-0/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'policy-CMP0022-fixes' into releaseBrad King2013-11-044-116/+144
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix summary documentation of INTERFACE_LINK_LIBRARIESBrad King2013-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The property applies to all library types, not just shared libraries.
| | * | | | | | | | Fix spelling in INTERFACE_LINK_LIBRARIES documentation (#14542)Modestas Vainius2013-11-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | s/overriden/overridden/
| * | | | | | | | | Merge branch 'object-library-no-TARGET_FILE' into releaseBrad King2013-11-021-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'object-library-missing-source' into releaseBrad King2013-11-021-0/+1
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'revise-compiler-id-policies' into releaseBrad King2014-04-023-2/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Do not warn by default when policy CMP0025 or CMP0047 is not setBrad King2014-04-023-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These policies are triggered by the use of a particular compiler rather than outdated CMake code in a project. Avoid warning in every project that enables a language by not displaying the policy warning by default. Add variable CMAKE_POLICY_WARNING_CMP<NNNN> to control the warning explicitly; otherwise enable the warning with --debug-output or --trace. This breaks with strict policy convention because it does not provide developers with any warning about the behavior change by default. Existing projects will continue to build without a warning or change in behavior. When a developer changes the minimum required version of CMake in a project to a sufficiently high value (3.0), the project will suddenly get the new compiler id and may break, but at least the breakage comes with a change to the project rather than the version of CMake used to build it. Breaking strict policy convention is worthwhile in this case because very few projects will be affected by the behavior change but every project would have to see the warning if it were enabled by default.
* | | | | | | | | | | | | Policies: omit warnings about unset policies when they are actually set to NEWNils Gladitz2014-03-318-28/+34
|/ / / / / / / / / / / /
* | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \