summaryrefslogtreecommitdiffstats
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.
* | Merge branch 'backport-target-property-policy-context' into releaseBrad King2014-05-097-20/+38
|\ \ | |/ |/|
| * cmTarget: Evaluate CMP0026 in calling contextBrad King2014-05-097-10/+36
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'ctest-bad-generator' into releaseBrad King2014-05-075-0/+51
|\ \
| * | ctest_build: Do not crash on bad generator nameBrad King2014-05-075-0/+51
| |/ | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'ncurses-tinfo' into releaseBrad King2014-05-061-3/+15
|\ \ | |/ |/|
| * FindCurses: Detect and satisfy ncurses dependency on tinfoMark Wright2014-05-061-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | When ncurses is built with USE=tinfo we need to find "tinfo" as a dependency of the main library. Otherwise 'cbreak' is missing: ld: ...: undefined reference to symbol 'cbreak' ld: note: 'cbreak' is defined in DSO /lib/libtinfo.so.5 so try adding it to the linker command line See https://bugs.gentoo.org/show_bug.cgi?id=468622 for more information. Applied-by: Rolf Eike Beer <eike@sf-mail.de>
| * FindCurses: Honor CURSES_NEED_NCURSES when curses is foundMark Wright2014-05-061-1/+1
| | | | | | | | | | | | | | Take our CURSES_USE_NCURSES code path when CURSES_NEED_NCURSES is enabled even if CURSES_CURSES_LIBRARY also happens to be found. Applied-by: Rolf Eike Beer <eike@sf-mail.de>
* | Merge branch 'hpux-compile' into releaseBrad King2014-05-062-2/+38
|\ \
| * | CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flagsRolf Eike Beer2014-05-061-2/+6
| | |
| * | CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCCRolf Eike Beer2014-05-062-1/+32
| | | | | | | | | | | | | | | These flags are needed to enable support for C++98. Also teach the 'bootstrap' script to add them if necessary.
| * | CompileFlags: Test for C++ features after selecting flagsRolf Eike Beer2014-05-061-1/+2
| |/ | | | | | | Some flags we select may affect availability of C++ features.
* | Merge branch 'backport-kwsys-compile-fix' into releaseBrad King2014-05-061-28/+15
|\ \
| * | 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.
* | Merge branch 'InstallRequiredSystemLibraries-vs12-mfc' into releaseBrad King2014-05-061-4/+21
|\ \ | |/ |/|
| * InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12 (#14903)Felix Krause2014-05-061-4/+21
|/ | | | | | | | | The MBCS (Multi-Byte Character Set) has been deprecated with VS 2013, and MSVC no longer ships with an MBCS-version of MFC by default. However, it can be downloaded as an add-on. Teach InstallRequiredSystemLibraries to install the MBCS MFC only for VS < 12 or if it happens to exist on the system.
* Merge branch 'ExternalProject-verify-cmake-var' into releaseBrad King2014-04-301-1/+1
|\
| * ExternalProject: Fix path to cmake in verify scriptBrad King2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | In commit v3.0.0-rc1~103^2~3 (ExternalProject: Reattempt download when verification fails, 2014-01-15) a reference to ${CMAKE_COMMAND} was added to generate a reference to the CMake command in a cmake script. Escape the '$' so that the literal variable reference appears in the script instead of writing the path to the current cmake. This is necessary when the path to CMake contains spaces or other characters special to CMake syntax.
* | Merge branch 'doc-singlehtml' into releaseBrad King2014-04-251-1/+13
|\ \
| * | Utilities/Sphinx: Add option to build 'singlehtml' formatBrad King2014-04-241-1/+13
| |/ | | | | | | Add SPHINX_SINGLEHTML to enable the Sphinx 'singlehtml' builder.
* | Merge branch 'doc-full-help' into releaseBrad King2014-04-254-3/+20
|\ \ | |/ |/|
| * Restore --help-full option to output all help manualsBrad King2014-04-254-3/+20
|/ | | | | | 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 'sphinx-python3' into releaseBrad King2014-04-241-1/+4
|\
| * Utilities/Sphinx: Fix cmake domain document removal with python3Brad King2014-04-241-1/+4
| | | | | | | | | | | | In the domain clear_doc method, avoid removing entries from a dictionary while iterating over it. Instead accumulate a set of entries to remove at the end.
* | 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.
* | | Merge branch 'sphinx-python3' into releaseBrad King2014-04-182-4/+4
|\ \ \ | | |/ | |/|
| * | Utilities/Sphinx: Port documentation generation to python3 (#14886)Uwe L. Korn2014-04-182-4/+4
| |/
* | 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.
* | Merge branch 'implicit-libNN-dirs' into releaseBrad King2014-04-161-1/+1
|\ \
| * | Drop /lib32 and /lib64 from link directories and RPATH (#14875)Brad King2014-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Extend CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES with these paths. We already have the equivalents under /usr. Systems that have these directories have their dynamic loaders configured already. Do not allow them to appear in the RPATH explicitly.
* | | Merge branch 'rc-windres-with-dot' into releaseBrad King2014-04-111-5/+6
|\ \ \
| * | | CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865)Brad King2014-04-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A 64-bit MinGW windres is named "i686-w64-mingw32.shared-windres". The get_filename_component NAME_WE mode may strip the ".shared-windres" part and cause the result to no longer contain "windres". Instead, match the "windres" name in the full CMAKE_RC_COMPILER value first, and use the get_filename_component code path only for other resource compilers.
| * | | CMakeRCInformation: Do not mention 'Fortran' in documentationBrad King2014-04-111-2/+2
| |/ / | | | | | | | | | This module is for the Windows Resource Compiler, not Fortran.
* | | Merge branch 'Fortran-pgi-intel-arch' into releaseBrad King2014-04-101-0/+4
|\ \ \
| * | | Fortran: Detect pointer size on Intel archs with PGI (#14870)Brad King2014-04-101-0/+4
| |/ / | | | | | | | | | | | | The PGI compiler does not define __SIZEOF_POINTER__ so use the __x86_64__ or __i386__ CPU macros to select a pointer size instead.
* | | Merge branch 'CMakeDetermineVSServicePack-vs-11-update-4' into releaseBrad King2014-04-101-41/+17
|\ \ \
| * | | CMakeDetermineVSServicePack: Add VS 11 update 4Brad King2014-04-101-1/+3
| | | |
| * | | CMakeDetermineVSServicePack: Match versions more robustlyBrad King2014-04-101-31/+7
| | | | | | | | | | | | | | | | | | | | | | | | Use the CMAKE_MATCH_* variables to simplify matching logic. Match either 3 or 4 version components. Do not fail when there are only three components available.
| * | | CMakeDetermineVSServicePack: Format documentationBrad King2014-04-101-10/+8
| |/ / | | | | | | | | | Also state explicitly that the module is deprecated.
* | | Merge branch 'Qt4Macros-moc-performance' into releaseBrad King2014-04-031-2/+2
|\ \ \
generated by cgit v0.12 at 2025-03-28 12:38:07 (GMT)