summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove .* expressions from beginning and end of MATCHES regexsRolf Eike Beer2014-04-1432-55/+55
| | | | | | | | | All these expressions work the same: "foo" ".*foo.*" "^.*foo.*$" This assumes that the "Intel*" expressions were meant to be "Intel.*".
* Replace string(REGEX REPLACE) with string(REPLACE) where possibleRolf Eike Beer2014-04-1419-34/+32
| | | | The simple replacement is much faster.
* Clean up usage of if(... MATCHES regex) followed string(REGEX REPLACE regex)Rolf Eike Beer2014-04-1426-109/+80
| | | | | | The matches have already been calculated and can simply be taken from CMAKE_MATCH_n variables. This avoids multiple compilations of the same or very similar regular expressions.
* 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
| * | | | | | Watcom: Use single quote for all file/path items in wlink commandJiri Malak2014-04-089-31/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Watcom Linker use single quote if necessary for quoting target name, libraries names and libraries search path. Object names were already fixed.
* | | | | | | CMake Nightly Date StampKitware Robot2014-04-111-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'install-prefix-in-interface'Brad King2014-04-1037-6/+290
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 783bce29 Export: Disallow exported interface includes in src/build tree (#14592). c869984e RunCMake: Allow specifying the source dir and file to test.
| * | | | | | Export: Disallow exported interface includes in src/build tree (#14592).Stephen Kelly2014-04-0933-3/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow directories in the source tree or build tree only if the install tree is a subdirectory of the source tree or build tree, as appropriate. Re-use the test files in the RunCMake.include_directories test to run in multiple scenarios. Bump the required CMake version in the test to 3.0 to ensure that the new policy warnings are emitted correctly.
| * | | | | | RunCMake: Allow specifying the source dir and file to test.Stephen Kelly2014-04-064-3/+8
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow decoupling the name of the test from the name and location of the source file under test, which means one source file can be used for multiple tests. Rename the PARENT_SCOPE test in RunCMake.set to not use a keyword of the if() command as a file name. As the filename is now used with an if condition, this causes a conflict.
* | | | | | Merge topic 'suppress-warning-in-comment'Brad King2014-04-104-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9fe65c3 cmSystemTools: Remove unreachable return on HP compiler 72e137ea Re-word comment on unreachable return statements
| * | | | | | cmSystemTools: Remove unreachable return on HP compilerBrad King2014-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit 1de08685 (cmSystemTools: Restore unreachable return to silence warnings, 2014-04-02) by excluding the unreachable return on the HP compiler as well as Clang. Both recognize that it is unreachable and warn.
| * | | | | | Re-word comment on unreachable return statementsBrad King2014-04-074-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use the word "warning" in the comment because CTest launchers match it and CTestCustom.cmake.in does not suppress it.
* | | | | | | Merge topic 'update-kwsys'Brad King2014-04-102-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f401b925 Merge branch 'upstream-kwsys' into update-kwsys c54be583 KWSys 2014-04-07 (8b085635)
| * \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-04-082-2/+14
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | KWSys 2014-04-07 (8b085635)KWSys Robot2014-04-082-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 8b085635 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 39f98b5d..8b085635 Rolf Eike Beer (2): a99a9235 set the compile flags for older HP compilers to fix compilation 8b085635 MD5: avoid casting back and forth between size_t and int Change-Id: I6386b521dbaba2e4f9ed5b2be34a504b9c17fc36
* | | | | | | | Merge topic 'aix-compile'Brad King2014-04-101-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 539b6c58 Fix build on AIX failing because of access to string elements
| * | | | | | | | Fix build on AIX failing because of access to string elementsRolf Eike Beer2014-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compilation failed with this error message: .../Source/cmCryptoHash.cxx: In method `string cmCryptoHash::HashString (const string &)': .../Source/cmCryptoHash.cxx:41: non-lvalue in unary `&' This was introduced in 77f60392d93f41a8828d3db1d7b76d45f1535d07 (stringapi: Accept strings when MD5 hashing data).
* | | | | | | | | Merge topic 'ExternalProject_VCS-quiet'Brad King2014-04-101-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dad1c14 ExternalProject: Find VCS packages quietly
generated by cgit v0.12 at 2025-01-25 21:14:07 (GMT)