summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Run CFBundleTest only with valid configurationBrad King2014-12-192-8/+6
| | | | The verification script needs to know the configuration tested.
* Xcode: Call IsCFBundleOnApple to decide if bundle is being builtGregor Jasny2014-12-171-1/+1
| | | | | | | | | | Narrow down the decision if a CFBundle is built to one place. This is a preparation patch to add another target property which, if set, will imply BUNDLE. Having only one function which will have to look at both properties helps to keep code clean. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* cmTarget: Use GetCFBundleDirectory within GetFullNameInternalGregor Jasny2014-12-171-9/+2
| | | | | | Replace duplicated code by call to GetCFBundleDirectory. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* CMake Nightly Date StampKitware Robot2014-12-171-1/+1
|
* CMake Nightly Date StampKitware Robot2014-12-161-1/+1
|
* Merge topic 'cmp0054-warnings-extproj'Brad King2014-12-151-2/+2
|\ | | | | | | | | a300d0ff ExternalProject: avoid CMP0054 warnings
| * ExternalProject: avoid CMP0054 warningsBen Boeckel2014-12-121-2/+2
| | | | | | | | Found where ${command} is "make" which is a local variable.
* | Merge topic 'extproj-extra-newlines'Brad King2014-12-151-2/+2
|\ \ | | | | | | | | | | | | 480e6029 ExternalProject: remove extra newlines from log messages
| * | ExternalProject: remove extra newlines from log messagesBen Boeckel2014-12-121-2/+2
| |/ | | | | | | message() already adds a newline.
* | Merge topic 'tests-osx-version'Brad King2014-12-151-1/+1
|\ \ | | | | | | | | | | | | f53a3340 Tests: Fix OS X version check to use component-wise test
| * | Tests: Fix OS X version check to use component-wise testBrad King2014-12-121-1/+1
| |/ | | | | | | | | | | | | Otherwise 10.10 may be considered to be less than 10.4 and the tests for CPack will not run. Reported-by: Sean McBride <sean@rogue-research.com>
* | Merge topic 'assert-no-string-conversion'Brad King2014-12-155-12/+12
|\ \ | | | | | | | | | | | | 2e92570b Fix some Clang -Wstring-conversion warnings
| * | Fix some Clang -Wstring-conversion warningsSean McBride2014-12-125-12/+12
| |/ | | | | | | | | Some false positives, but some flagged faulty asserts where the ! was inside the string instead of outside.
* | Merge topic 'curl-winssl'Brad King2014-12-152-1/+14
|\ \ | | | | | | | | | | | | ba8c6632 curl: Use Windows SSL/TLS native implementation
| * | curl: Use Windows SSL/TLS native implementationBrad King2014-12-122-1/+14
| |/ | | | | | | | | On Windows, when CMAKE_USE_OPENSSL is OFF, use the OS implementation. This will allow the OS-configured CA list to be trusted automatically.
* | Merge topic 'suncc-fixes'Brad King2014-12-152-8/+12
|\ \ | | | | | | | | | | | | 97b65f81 Misc. fixes for the Oracle / Sun compiler.
| * | Misc. fixes for the Oracle / Sun compiler.Chuck Atkins2014-12-122-8/+12
| | | | | | | | | | | | | | | | | | A few pieces of code have some ambiguous type deduction that seems to resolve correctly for most compilers but not for the Oracle compiler. This makes those few instances more explicit.
* | | Merge topic 'FindMPI-parse-Xlinker-flags'Brad King2014-12-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | a0792c48 FindMPI: Extract -Xlinker options
| * | | FindMPI: Extract -Xlinker optionsAlin Marin Elena2014-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | Extend the regex that mathces -Wl, linker options to match -Xlinker too. These are used by Intel MPI and perhaps others.
* | | | CMake Nightly Date StampKitware Robot2014-12-151-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-12-141-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-12-131-1/+1
| |_|/ |/| |
* | | Merge branch 'release'Brad King2014-12-120-0/+0
|\ \ \
| * \ \ Merge branch 'doc-CMP0054-example' into releaseBrad King2014-12-121-3/+31
| |\ \ \
| * \ \ \ Merge branch 'backport-doc-find-module-no-summary' into releaseBrad King2014-12-091-11/+0
| |\ \ \ \
* | \ \ \ \ Merge topic 'find-msmpi'Brad King2014-12-121-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17a846ac FindMPI: search for msmpi's mpiexec as well
| * | | | | | FindMPI: search for msmpi's mpiexec as wellBen Boeckel2014-12-111-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'catch-ctest-errors-better'Brad King2014-12-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8589e64 ctest: count errors from scripts properly
| * | | | | | ctest: count errors from scripts properlyBen Boeckel2014-12-101-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the unlikely event that someone has a billion+ scripts (or some codepath returns negative numbers), we could overflow and make a pile of errors a non-error. This change also allows us to use flags for the error in the future rather than just "something went wrong".
* | | | | | Merge topic 'FindQt4-fix-major-version-mismatch'Brad King2014-12-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 009c1865 FindQt4: Fix handling of QT_VERSION_MAJOR mismatch
| * | | | | | FindQt4: Fix handling of QT_VERSION_MAJOR mismatchDaniel Scharrer2014-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix capitalization of Qt4_FOUND variable when setting it to false in this case. This caused find_package(Qt4) to appear successful when it was not. Note that the legacy QT4_FOUND variable is unconditionally overwritten at the end of the file with the value of Qt4_FOUND.
* | | | | | | Merge topic 'drop-double-underscores'Brad King2014-12-1223-60/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 111be180 Rename header guards to not start with double underscore
| * | | | | | | Rename header guards to not start with double underscoreSean McBride2014-12-1123-60/+60
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use regex to find/replace: __(cm.*_h) \1 Then fix QCMake.h by hand.
* | | | | | | Merge topic 'doc-CMP0054-example'Brad King2014-12-121-3/+31
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | f2f1c95d Help: Extend policy CMP0054 documentation with an example
| * | | | | | Help: Extend policy CMP0054 documentation with an exampleNils Gladitz2014-12-121-3/+31
| | |_|_|/ / | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-12-121-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2014-12-111-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-12-101-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'FindLATEX-use-FPHSA'Brad King2014-12-091-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e0104063 FindLATEX: Use FPHSA to report status in standard way
| * | | | FindLATEX: Use FPHSA to report status in standard wayChristoph Grüninger2014-12-051-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise LaTeX was marked as not found in the summary. Also revise the documentation.
* | | | | Merge topic 'find_library-updated-directory-content'Brad King2014-12-097-20/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ce331bab find_library: Fix repeat call after changing directory content (#15293)
| * | | | | find_library: Fix repeat call after changing directory content (#15293)Brad King2014-12-087-20/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use cmGlobalGenerator::GetDirectoryContent to avoid repeating directory listings. However, GetDirectoryContent loads content from disk at most once. This breaks find_library calls that occur when disk content has changed since preceding find_library calls. Teach cmGlobalGenerator::GetDirectoryContent to save the directory modification time when content is loaded and re-load content if it changes. Create a RunCMake.find_library test with a case covering this.
* | | | | | Merge topic 'doc-find-module-no-summary'Brad King2014-12-091-11/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fb33e01 Merge branch 'backport-doc-find-module-no-summary' into doc-find-module-no-summary d425c110 Help: Drop FeatureSummary example in cmake-developer.7 8235effe Help: Drop FeatureSummary example in cmake-developer.7
| * \ \ \ \ \ Merge branch 'backport-doc-find-module-no-summary' into ↵Brad King2014-12-090-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc-find-module-no-summary Resolve conflict in Help/manual/cmake-developer.7.rst by taking our side.
| | * | | | | Help: Drop FeatureSummary example in cmake-developer.7Brad King2014-12-091-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of FeatureSummary inside a find module is not a convention yet used by upstream CMake modules. Drop the example from the documentation about how to write find modules. If in the future we add use of FeatureSummary to many of the upstream find modules then this example can be restored as part of establishing the convention.
| * | | | | | Help: Drop FeatureSummary example in cmake-developer.7Brad King2014-12-091-11/+0
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of FeatureSummary inside a find module is not a convention yet used by upstream CMake modules. Drop the example from the documentation about how to write find modules. If in the future we add use of FeatureSummary to many of the upstream find modules then this example can be restored as part of establishing the convention.
* | | | | | CMake Nightly Date StampKitware Robot2014-12-091-1/+1
|/ / / / /
* | | | | Merge branch 'release'Brad King2014-12-080-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | CMake 3.1.0-rc3v3.1.0-rc3Brad King2014-12-081-1/+1
| | | |
* | | | Merge branch 'release'Brad King2014-12-080-0/+0
|\ \ \ \ | |/ / /