summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* curl: Use OS X SSL/TLS native implementationBrad King2014-12-182-0/+28
| | | | | | | | On OS X, when CMAKE_USE_OPENSSL is OFF, use the OS implementation. This will allow the OS-configured CA list to be trusted automatically. This is supported on OS X 10.6 and above using AppleClang, Clang, and GNU compilers.
* 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 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
|\ \ \ \ | |/ / /
| * | | Merge branch 'xerces-rename' into releaseBrad King2014-12-055-35/+37
| |\ \ \
* | \ \ \ Merge topic 'custom-command-multiple-outputs'Brad King2014-12-0810-163/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c67b816 Makefile: Workaround Borland Make bug with multiple outputs 65ea5eb7 Tests: Cover rebuild with multiple custom command outputs (#15116) 644b4688 Makefile: Fix rebuild with multiple custom command outputs (#15116) 8a4c6d2d Xcode: Fix rebuild with multiple custom command outputs (#15116)
| * | | | | Makefile: Workaround Borland Make bug with multiple outputsBrad King2014-12-063-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given a rule of the form out1 out2: dep1 out1 out2: dep2 Borland Make complains that there are multiple rules for "out1" even though this works when there is only one output. Instead generate out1 out2: dep1 dep2 for Borland Make, but only when there are multiple outputs.
| * | | | | Tests: Cover rebuild with multiple custom command outputs (#15116)Brad King2014-12-052-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the BuildDepends test with a case covering multiple custom command outputs with the second one consumed by another rule. With the old "multiple output pair" infrastructure used in the Makefile and Xcode generators this did not work. Now that it is fixed, test the case explicitly.
| * | | | | Makefile: Fix rebuild with multiple custom command outputs (#15116)Brad King2014-12-055-111/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the generated makefiles for custom commands with multiple outputs to list all the outputs on the left hand side of the build rule. This is much simpler and more reliable than the old multiple-output-pair infrastructure.
| * | | | | Xcode: Fix rebuild with multiple custom command outputs (#15116)Brad King2014-12-052-52/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode generator uses Makefiles under a run-script build-phase to drive custom commands. Fix the generated makefiles for custom commands with multiple outputs to list all the outputs on the left hand side of the build rule. This is much simpler and more reliable than the old multiple-output-pair infrastructure.
* | | | | | Merge topic 'optional-latest-language-dialects'Brad King2014-12-081-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | de022e89 Add options to build CMake without latest language dialects
| * | | | | | Add options to build CMake without latest language dialectsBrad King2014-12-051-2/+6
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set CMAKE_C_STANDARD and CMAKE_CXX_STANDARD only if they are not already defined. This will allow users to add the settings with different values to their local cache (e.g. on the command line).
* | | | | | Merge topic 'file-LOCK-timeout-type'Brad King2014-12-089-23/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97841dad file: Use 'long' to represent the parsed LOCK TIMEOUT value
| * | | | | | file: Use 'long' to represent the parsed LOCK TIMEOUT valueRuslan Baratov2014-12-059-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the StringToInt helper into a StringToLong helper with a 'long' result type. This will make the helper more useful to other callers that want to use strtol. While at it, also check errno after calling strtol in case the conversion fails with a range error.
* | | | | | | Merge topic 'ctest-binary-pipe'Brad King2014-12-081-0/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29b0c8c3 ctest --launch: write to cout and cerr in binary
| * | | | | | | ctest --launch: write to cout and cerr in binaryBen Boeckel2014-12-051-0/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because ctest reads in binary but writes in text mode, Windows' newline transformation can be applied multiple times causing '\n' in the source application to be written out as '\r\r\n' instead.
* | | | | | | Merge topic 'ExternalProject_TEST_EXCLUDE_FROM_MAIN'Brad King2014-12-083-4/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 636f0c1d ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option
| * | | | | | | ExternalProject: Add TEST_EXCLUDE_FROM_MAIN optionDaniele E. Domenichelli2014-12-053-4/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this option is enabled, the test step is created with the EXCLUDE_FROM_MAIN option, and if TEST_BEFORE_INSTALL is enabled, the install step does not depend on the test step. This means that the test step is never executed, unless the test target is explicitly created by calling ExternalProject_Add_StepTarget, or by passing it with the STEP_TARGETS option, or with the EP_STEP_TARGETS directory property.
* | | | | | | | Merge topic 'vs-inherit-wd'Brad King2014-12-081-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f545eb0b VS: Inherit target-level "-wd" flags in source files (#15284)
| * | | | | | | | VS: Inherit target-level "-wd" flags in source files (#15284)Brad King2014-12-041-0/+5
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a source file COMPILE_FLAGS option adds "-wd", the .vcxproj file will have a DisableSpecificWarnings setting for the source file. Add to the setting a reference to %(DisableSpecificWarnings) to inherit any such flags set for the whole target.
* | | | | | | | Merge topic 'FindMPI-Intel-5.0.1'Brad King2014-12-081-21/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7626c8dc FindMPI: Workaround Intel MPI 5.0.1 exit code problem (#15182) f5ede300 FindMPI: Factor out compiler wrapper execution into helper
| * | | | | | | | FindMPI: Workaround Intel MPI 5.0.1 exit code problem (#15182)Alin Marin Elena2014-12-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MPI compiler may return zero even in some error cases. Check the output to catch such cases. Suggested-by: Kelly Thompson <kgt@lanl.gov>
| * | | | | | | | FindMPI: Factor out compiler wrapper execution into helperAlin Marin Elena2014-12-041-21/+13
| |/ / / / / / /
* | | | | | | | Merge topic 'try_compile-link-flags'Brad King2014-12-0812-1/+170
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88eb5824 try_compile: Pass linker flags into test project (#14066) a4f9b6f0 CMakeDetermineCompilerABI: Use normal linker flags in ABI project
generated by cgit v0.12 at 2024-11-13 07:43:56 (GMT)