summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CMakeDetermineVSServicePack-warn-deprecated'Brad King2014-04-152-0/+13
|\ | | | | | | | | 73721c7c CMakeDetermineVSServicePack: Add deprecation diagnostic
| * CMakeDetermineVSServicePack: Add deprecation diagnosticBrad King2014-04-142-0/+13
| | | | | | | | | | | | | | Warn project developers at runtime that the module should not be used anymore. Issue the diagnostic only when the project requires a new enough CMake to use the alternative. Honor the CMAKE_(ERROR|WARN)_DEPRECATED settings.
* | Merge topic 'fix-qthelp-installation'Brad King2014-04-151-1/+1
|\ \ | | | | | | | | | | | | 6578508c Help: Fix installation of the Qt qch file.
| * | Help: Fix installation of the Qt qch file.Stephen Kelly2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | The file was changed to have the version in its name in commit 111bb67c (Help: Use a more-appropriate qthelp namespace and file name., 2014-04-10).
* | | Merge topic 'ninja-win-link-path'Brad King2014-04-151-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 504bb62d Ninja: replace \ in LINK_PATH for MinGW
| * | | Ninja: replace \ in LINK_PATH for MinGWPeter Kümmel2014-04-151-0/+2
| |/ /
* | | Merge topic 'fix-SourceFiles-configure-time'Brad King2014-04-157-21/+92
|\ \ \ | | | | | | | | | | | | | | | | b8af2011 cmTarget: Fix listing of source files at configure-time.
| * | | cmTarget: Fix listing of source files at configure-time.Stephen Kelly2014-04-137-21/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e5da9e51 (cmTarget: Allow any generator expression in SOURCES property., 2014-03-18), source files are computed by true evaluation of generator expressions, including TARGET_OBJECTS. This evaluation requires the presence of cmGeneratorTarget objects since commit bf98cc25 (Genex: Evaluate TARGET_OBJECTS as a normal expression., 2014-02-26). Ensure that we don't attempt to evaluate the TARGET_OBJECTS generator expression at configure-time, as can happen if CMP0024 or CMP0026 are OLD. Use old-style parsing of the source item to extract object target names in that case. Avoid calling GetProperty("SOURCES") to bypass warnings from CMP0051. Refactor existing logic in GetLanguages which is similar in intent to the new GetSourceFiles code.
* | | | Merge topic 'openbsd-warnings'Brad King2014-04-151-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f9f91fa8 CTestCustom: Suppress warnings about rand() and srand() on OpenBSD
| * | | | CTestCustom: Suppress warnings about rand() and srand() on OpenBSDRolf Eike Beer2014-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | We don't do crypto here, so a "poor" random doesn't matter. In fact we have API to allow people to get a repeatable sequence by setting a specific seed.
* | | | | Merge topic 'hpux-acc-ansi98'Brad King2014-04-151-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 185b4efe CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flags
| * | | | | CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flagsRolf Eike Beer2014-04-121-2/+6
| |/ / / /
* | | | | Merge topic 'suppress-sha2-cast-align-warnings'Brad King2014-04-151-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a553dc0a CTestCustom: Suppress -Wcast-align warnings in sha2 code
| * | | | | CTestCustom: Suppress -Wcast-align warnings in sha2 codeBrad King2014-04-111-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This is third party code and we know that at run time the correct alignment is achieved.
* | | | | Merge topic 'FindMPI-lang-implicit-dirs'Brad King2014-04-151-9/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 856bfe23 FindMPI: Use compiler implicit link dirs for matching language (#14870)
| * | | | | FindMPI: Use compiler implicit link dirs for matching language (#14870)Melven Roehrig-Zoellner2014-04-111-9/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the logic added by commit 2f9ad7c6 (Fix FindMPI for the intel compiler on linux, 2012-03-20) to use the implicit link directories for the current ${lang} instead of hard-coding C or CXX which may not be enabled. This is necessary for Fortran-only projects.
* | | | | CMake Nightly Date StampKitware Robot2014-04-151-1/+1
| | | | |
* | | | | Merge topic 'update-libarchive'Brad King2014-04-1457-1953/+4008
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a58efaa libarchive: Avoid using name 'u_long' e2b02823 Update libarchive configuration within CMake 80883321 libarchive: Do not require includers to have windows.h dfb0458e libarchive: Convert literal LL suffix to ARCHIVE_LITERAL_LL b0a9807f libarchive: Update archive_util.c to use CMake zlib and bzip2 headers debe4dec libarchive: Drop options not present in reduced version 66b0c4fa libarchive: Do not generate a pkg-config file 8092e759 libarchive: Update README-CMake.txt for new snapshot 2f197863 Merge branch 'libarchive-upstream' into update-libarchive 23e4666c libarchive: Disable more whitespace checks in third-party code 64713ae3 libarchive 3.1.2-218-g00f4bd83 (reduced)
| * | | | | libarchive: Avoid using name 'u_long'Brad King2014-04-112-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The system headers on some platforms define a 'u_long' type so we cannot use the name. Spell out 'unsigned long' instead.
| * | | | | Update libarchive configuration within CMakeBrad King2014-04-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hard-code libarchive build options to the way CMake needs them. Set them as internal cache entries so users do not see them when building CMake.
| * | | | | libarchive: Do not require includers to have windows.hBrad King2014-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In archive_entry.h refer to "BY_HANDLE_FILE_INFORMATION *" using "struct _BY_HANDLE_FILE_INFORMATION *" to avoid requiring the includer to already have <windows.h>.
| * | | | | libarchive: Convert literal LL suffix to ARCHIVE_LITERAL_LLBrad King2014-04-031-16/+16
| | | | | |
| * | | | | libarchive: Update archive_util.c to use CMake zlib and bzip2 headersBrad King2014-04-031-2/+2
| | | | | |
| * | | | | libarchive: Drop options not present in reduced versionBrad King2014-04-031-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop ENABLE_TAR and ENABLE_CPIO related options because we do not build these command-line tools. Drop ENABLE_TEST and ENABLE_COVERAGE options because we do not build the tests.
| * | | | | libarchive: Do not generate a pkg-config fileBrad King2014-04-031-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake does not install the headers or libraries so skip the .pc file too.
| * | | | | libarchive: Update README-CMake.txt for new snapshotBrad King2014-04-031-4/+4
| | | | | |
| * | | | | Merge branch 'libarchive-upstream' into update-libarchiveBrad King2014-04-0354-1946/+4006
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts in favor of the upstream side where possible. Resolve a logical conflict in archive_windows.h where the upstream port to Watcom was done slightly differently from ours.
| | * | | | | libarchive 3.1.2-218-g00f4bd83 (reduced)LibArchive Upstream2014-04-0358-2200/+4134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream libarchive using the following shell code. url=git://github.com/libarchive/libarchive.git && v=3.1.2-218-g00f4bd83 && r=00f4bd83 && paths=" CMakeLists.txt COPYING CTestConfig.cmake build/cmake build/pkgconfig build/utils build/version libarchive/*.* " && mkdir libarchive-$v-g$r-reduced && git clone $url libarchive-git && date=$(cd libarchive-git && git log -n 1 --format='%cd' $r) && (cd libarchive-git && git archive --format=tar $r -- $paths) | (cd libarchive-$v-g$r-reduced && tar xv) && fromdos libarchive-$v-g$r-reduced/build/cmake/Find*.cmake && echo "g$r date: $date"
| * | | | | | libarchive: Disable more whitespace checks in third-party codeBrad King2014-04-031-2/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-04-141-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-04-131-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2014-04-121-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release'Brad King2014-04-110-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'rc-windres-with-dot' into releaseBrad King2014-04-111-5/+6
| |\ \ \
| * \ \ \ Merge branch 'Fortran-pgi-intel-arch' into releaseBrad King2014-04-101-0/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'CMakeDetermineVSServicePack-vs-11-update-4' into releaseBrad King2014-04-101-41/+17
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'CMakeDetermineVSServicePack-vs-11-update-4'Brad King2014-04-111-41/+17
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0de3f80 CMakeDetermineVSServicePack: Add VS 11 update 4 105658df CMakeDetermineVSServicePack: Match versions more robustly 101515b9 CMakeDetermineVSServicePack: Format documentation
| * | | | | | 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 topic 'Fortran-pgi-intel-arch'Brad King2014-04-111-0/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | eb8cb2c6 Fortran: Detect pointer size on Intel archs with PGI (#14870)
| * | | | | | 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 topic 'qthelp_names'Brad King2014-04-113-0/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 111bb67c Help: Use a more-appropriate qthelp namespace and file name.
| * | | | | | Help: Use a more-appropriate qthelp namespace and file name.Stephen Kelly2014-04-103-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the namespace org.cmake instead of org.sphinx.cmake. Add the version to the output file name.
* | | | | | | Merge topic 'revert-Android-platform'Brad King2014-04-111-5/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b31f064 Revert "Modules: Add an Andriod platform file"
| * | | | | | | Revert "Modules: Add an Andriod platform file"Stephen Kelly2014-04-101-5/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 77f06b145d57c4665ff5d71b89a70c54a009ad14. It may be re-added in the future when the requirements for that platform are better known and supported by CMake.
* | | | | | | Merge topic 'rc-windres-with-dot'Brad King2014-04-111-5/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 7147ed5c CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865) db924e00 CMakeRCInformation: Do not mention 'Fortran' in documentation
| * | | | | | 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 topic 'watcom-link-quoting'Brad King2014-04-119-31/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb9b1e13 Watcom: Use single quote for all file/path items in wlink command