summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.0.0v3.0.0Brad King2014-06-091-1/+1
|
* Merge branch 'fix-ctest-option-summary' into releaseBrad King2014-06-051-1/+2
|\
| * CTest: Added option description for --output-on-failureNils Gladitz2014-06-051-1/+2
| | | | | | | | Without it the option list is cut short after --debug.
* | Merge branch 'fix-build-crash-on-bad-generator' into releaseBrad King2014-06-031-1/+7
|\ \
| * | cmake: Fix --build crash on bad CMAKE_GENERATOR in cacheBrad King2014-06-031-1/+7
| |/ | | | | | | | | | | | | | | | | | | If we fail to create the generator named by CMAKE_GENERATOR, exit with an error message instead of crashing. While at it, fix the wording of the error message when CMAKE_GENERATOR is not set. Extend the RunCMake.CommandLine test with cases covering the "cmake --build" option when the named directory does not provide a CMakeCache.txt with a valid CMAKE_GENERATOR.
* | Merge branch 'cmake-credits' into releaseBrad King2014-06-031-1/+1
|\ \
| * | Simplify and clarify credit text and linkBrad King2014-06-031-1/+1
| | | | | | | | | | | | | | | Use the name "Kitware" rather than "Kitware, Inc." to simplify the text. Provide a CMake-specific URL.
* | | Merge branch 'cmake-credits' into releaseBrad King2014-06-031-1/+1
|\ \ \ | |/ /
| * | Simplify and clarify credit text and linkBrad King2014-06-031-1/+1
| |/ | | | | | | | | Use the name "Kitware" rather than "Kitware, Inc." to simplify the text. Provide a CMake-specific URL.
* | cmCacheManager: Avoid cache entry self-assignmentBrad King2014-05-271-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Since commit bef93dc5 (Couple of changes: cache variables now have a map of properties, 2002-09-11) the cmCacheManager::AddCacheDefinition method accesses its map entry by reference. However, the commit left the original entry assignment at the end of the method. With Apple Clang 5.1 and libc++ this self-assignment destroys the cache entry property map. Drop the self assignment. Also drop the condition around the call to UnwatchUnusedCli since it was a self-comparison that must always have been true.
* | cmake: Tolerate missing HELPSTRING on compiler changeBrad King2014-05-271-1/+4
|/ | | | | | Teach cmake::HandleDeleteCacheVariables to tolerate a missing HELPSTRING (NULL pointer) when saving cache entries. In the absence of other bugs this should not be possible, but avoid the crash just in case.
* CMake 3.0.0-rc6v3.0.0-rc6Brad King2014-05-221-1/+1
|
* Merge branch 'backport-kwsys-cygwin-fixes' into releaseBrad King2014-05-202-2/+11
|\
| * KWSys Process: Workaround child kill trouble on CygwinBrad King2014-05-201-0/+6
| | | | | | | | | | | | | | | | | | When we kill a child we send SIGSTOP first so that we can traverse its child processes recursively. On unwinding the recursion we then send SIGKILL. Current Cygwin has trouble when both signals are sent in quick succession by the parent process. Add a usleep(1) after sending the first signal to give up our time slice and give Cygwin a chance to process the first signal before sending the second.
| * KWSys SystemTools: Port cygwin path conversion to modern APIBrad King2014-05-201-2/+5
| | | | | | | | | | The cygwin_conv_to_win32_path function is deprecated in favor of cygwin_conv_path. Use the latter.
* | CMP0022: Fix link language propagation in NEW behaviorBrad King2014-05-191-10/+10
|/ | | | | | | | | | | | | | | | | | | | | | | | | The languages used in compiling STATIC libraries need to be propagated to dependents regardless of the settings of INTERFACE_LINK_LIBRARIES or CMP0022. They are independent of the libraries in the link interface. Prior to commit v2.8.12~192^2~2 (Introduce the INTERFACE_LINK_LIBRARIES property, 2013-06-04) the cmTarget::ComputeLinkInterface code path for "explicitLibraries" could never be taken for STATIC libraries, so the logic to propagate languages existed only in the non-explicitLibraries code path. After that commit, INTERFACE_LINK_LIBRARIES could be set for STATIC libraries to cause the "explicitLibraries" code path to be taken. The commit also left the old non-explicitLibraries code path conditional on CMP0022 not being set to NEW. Thus link language propagation was left missing from two cases by that commit. The explicitLibraries code path was fixed to propagate languages by commit v2.8.12~149^2~1 (cmTarget: Fix iface libraries and languages for static libraries, 2013-07-26). However, the non-explicitLibraries case was never taught to propagate languages when CMP0022 is set to NEW. Fix that now. Factor the logic to propagate link languages out of the link interface libraries conditions so that it always occurs. Update Tests/Fortran to set CMP0022 to NEW to test this case (because the test passes only if link language propagation works).
* Merge branch 'fix-atomic-rename-Windows-sharing-violation' into releaseBrad King2014-05-131-2/+4
|\
| * cmSystemTools::RenameFile: Retry on Windows ERROR_SHARING_VIOLATIONEric Berge2014-05-131-2/+4
| | | | | | | | | | | | | | Add ERROR_SHARING_VIOLATION to the set of errors (previously including only ERROR_ACCESS_DENIED) that cause a rename (MoveFile) on Windows to retry. The condition was observed when two renames to the same target file name were happening simultaneously.
* | 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/
generated by cgit v0.12 at 2025-01-10 16:21:25 (GMT)