summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FortranCInterface: Improve documentation formatting and organizationBrad King2016-02-101-70/+78
| | | | | Organize content into sections. Define functions via explicit markup blocks so we can cross-reference them.
* FortranCInterface: Convert docs to a bracket commentBrad King2016-02-101-126/+127
| | | | | Use a bracket comment to hold the documentation instead of a block of line comments. This will make further updates easier.
* Merge branch 'release'Brad King2016-02-100-0/+0
|\
| * Merge branch 'curl-pre-7.21.5' into releaseBrad King2016-02-091-0/+5
| |\
| * \ Merge branch 'wix-prevent-nsis-overwrite' into releaseBrad King2016-02-0910-4/+151
| |\ \
| * \ \ Merge branch 'fix-target-lookup-performance-regression' into releaseBrad King2016-02-084-62/+47
| |\ \ \
* | \ \ \ Merge topic 'update-prebuilt-openssl'Brad King2016-02-102-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c0a1605b Utilities/Release: Update to openssl-1.0.2f
| * | | | | Utilities/Release: Update to openssl-1.0.2fBrad King2016-02-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | | | Merge topic 'wix-prevent-nsis-overwrite'Brad King2016-02-1010-4/+151
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | a12b0f1b CMake: Prevent WiX installations over existing NSIS installations
| * | | | | CMake: Prevent WiX installations over existing NSIS installationsNils Gladitz2016-02-0910-4/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a custom action to look for Uninstall.exe in the user selected installation prefix. Its presence indicates a previous NSIS installation. Inform the user and request manual resolution of the issue.
* | | | | | Merge topic 'curl-pre-7.21.5'Brad King2016-02-101-0/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 1ea55acf cmCurl: Fix compilation with system curl versions prior to 7.21.5
| * | | | | cmCurl: Fix compilation with system curl versions prior to 7.21.5Brad King2016-02-091-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version introduced CURLE_NOT_BUILT_IN which we have used since commit v3.4.0-rc1~211^2~4 (cmCurl: Tolerate lack of CURLOPT_CAPATH support, 2015-08-12). For older versions, just define the name to the then-unused error code so that we can compile.
* | | | | CMake Nightly Date StampKitware Robot2016-02-101-1/+1
| |/ / / |/| | |
* | | | Merge branch 'release'Brad King2016-02-090-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'fix-install-EXPORT-crash' into releaseBrad King2016-02-088-6/+19
| |\ \ \
| * \ \ \ Merge branch 'test-ctest_submit-update' into releaseBrad King2016-02-084-4/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'install-man-conditionally' into releaseBrad King2016-02-081-0/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-doc-typos' into releaseBrad King2016-02-082-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ExternalProject-build-config-compat' into releaseBrad King2016-02-081-2/+17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix-Fortran-module-in-subdir' into releaseBrad King2016-02-086-5/+9
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile'Brad King2016-02-092-1/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e739ef7b FindCUDA: Only warn about non-existent dependency files in verbose mode
| * | | | | | | | | | FindCUDA: Only warn about non-existent dependency files in verbose modeJames Bigler2016-02-082-1/+14
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'fix-target-lookup-performance-regression'Brad King2016-02-094-62/+47
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b7d5871 Improve internal generator target structure lookup 6cbf6a51 Fix internal target lookup performance regression
| * | | | | | | | | | Improve internal generator target structure lookupBrad King2016-02-083-35/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~272^2~6 (cmGlobalGenerator: Add FindGeneratorTarget API, 2015-10-25) a lookup was implemented via linear search. Replace it with an efficient data structure. Suggested-by: Stephen Kelly <steveire@gmail.com>
| * | | | | | | | | | Fix internal target lookup performance regressionBrad King2016-02-083-34/+32
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.5.0-rc1~272^2~13 (cmGlobalGenerator: Remove direct storage of targets, 2015-10-25) replaced an efficient data structure mapping from target name to cmTarget instance with a linear search. Lookups through cmGlobalGenerator::FindTarget are done a lot. Restore the efficient mapping structure with a name indicating its purpose. Reported-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
* | | | | | | | | | Merge topic 'install-man-conditionally'Brad King2016-02-091-0/+8
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8282547e Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)
| * | | | | | | | | Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)Brad King2016-02-081-0/+8
| |/ / / / / / / /
* | | | | | | | | Merge topic 'apple-isystem-gcc'Brad King2016-02-093-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b04aa31 Xcode: Disable test for system include dirs 2cae5128 Apple: Enable -isystem for GNU Compiler >= 4 (#15953)
| * | | | | | | | | Xcode: Disable test for system include dirsGregor Jasny2016-02-082-2/+4
| | | | | | | | | |
| * | | | | | | | | Apple: Enable -isystem for GNU Compiler >= 4 (#15953)Gregor Jasny2016-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to #4662 -isystem support was disabled for all GNU Compilers on Apple platforms. But the change was probably a just work around for a broken compiler on Tiger (see 10837#c27206). So we tighten the condition to only kick in for GCC versions earlier than 4. That should ensure sane behavior for Xcode 3.2 and later.
* | | | | | | | | | Merge topic 'install-EXCLUDE_FROM_ALL'Brad King2016-02-0930-41/+178
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 586e56d0 Help: Add notes for topic 'install-EXCLUDE_FROM_ALL' d321c196 Tests: Add cases for install() command EXCLUDE_FROM_ALL option 18ce97c4 install: Add EXCLUDE_FROM_ALL option (#14921)
| * | | | | | | | | | Help: Add notes for topic 'install-EXCLUDE_FROM_ALL'Brad King2016-02-041-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Tests: Add cases for install() command EXCLUDE_FROM_ALL optionBrad King2016-02-0410-0/+60
| | | | | | | | | | |
| * | | | | | | | | | install: Add EXCLUDE_FROM_ALL option (#14921)Nick Lewis2016-02-0419-41/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let us take an example of a project that has some tests in a component that need to be installed into a dedicated test package. The user expectation is that the result could be achieved by typing the following: make make tests make install DESTDIR=/testpkgs make install-tests However this results in test components in the default installation as well as the testpkg. Add an EXCLUDE_FROM_ALL option to the install() command to tell it that the installation rule should not be included unless its component is explicitly specified for installation.
* | | | | | | | | | | Merge topic 'test-ctest_submit-update'Brad King2016-02-094-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2859d9ef Tests: Extend ctest_submit host lookup failure matching (#15958)
| * | | | | | | | | | Tests: Extend ctest_submit host lookup failure matching (#15958)Orion Poplawski2016-02-084-4/+4
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match this message: Could not resolve host: -no-site-; Name or service not known ^^^^^^^^^^^^^^^^^^^^^^^^^^^
* | | | | | | | | | Merge topic 'fix-install-EXPORT-crash'Brad King2016-02-098-6/+19
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1ad098d Tests: Avoid OS X 10.5 limitation warning in RunCMake.install test 47460f3e install(EXPORT): Fix crash on target in another directory e86383e1 Tests: Use newer policy settings in RunCMake.install test
| * | | | | | | | | Tests: Avoid OS X 10.5 limitation warning in RunCMake.install testBrad King2016-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The EXPORT-OldIFace test case uses install(TARGETS) and so generates a warning: CMake Warning in CMakeLists.txt: WARNING: Target "foo" has runtime paths which cannot be changed during install. To change runtime paths, OS X version 10.6 or newer is required. Therefore, runtime paths will not be changed when installing. CMAKE_BUILD_WITH_INSTALL_RPATH may be used to work around this limitation. Set CMAKE_BUILD_WITH_INSTALL_RPATH to avoid the warning since we do not need to run the binaries from the build tree anyway.
| * | | | | | | | | install(EXPORT): Fix crash on target in another directoryBrad King2016-02-054-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring merged by commit v3.5.0-rc1~299 (Merge topic 'use-generator-target', 2015-10-20) in and around commit v3.5.0-rc1~299^2~13 (cmExportSet: Store a cmGeneratorTarget, 2015-10-17) changed export sets to delay looking up actual targets and stores only their names. However, in InstallCommand::HandleExportMode we need to lookup targets immediately to check them for EXPORT_LINK_INTERFACE_LIBRARIES. The check was accidentally made local to the current directory, so if an export set contains a target from another directory the lookup fails and CMake crashes. Fix the check to look up the target name globally, and tolerate when no target is found just in case. Reported-by: Kelly Thompson <kgt@lanl.gov>
| * | | | | | | | | Tests: Use newer policy settings in RunCMake.install testBrad King2016-02-054-3/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, avoid CMP0042 warnings on OS X.
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-02-091-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'test-FortranCInterface-again'Brad King2016-02-081-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d31d7ffd Tests: Fix Fortran test to run FortranCInterface again
| * | | | | | | | | Tests: Fix Fortran test to run FortranCInterface againBrad King2016-02-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates to Tests/Fortran by commit v3.2.0-rc1~501^2 (Avoid if() quoted auto-dereference, 2014-10-14) changed our check "${CMAKE_Fortran_COMPILER_ID}" MATCHES "${CMAKE_C_COMPILER_ID}" to CMAKE_Fortran_COMPILER_ID MATCHES CMAKE_C_COMPILER_ID because CMP0054 warned about the LHS compiler id "MSVC" being expanded. However, the RHS of if(MATCHES) does not auto-dereference so this check has returned FALSE since then and the FortranCInterface part of the test has not been running! Fix this by using STREQUAL with quoted arguments and setting CMP0054 to NEW (by requiring 3.1).
* | | | | | | | | | Merge topic 'fix-Fortran-module-in-subdir'Brad King2016-02-086-5/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c5eb21b6 Fix dependency scanning configuration in subdirectories
| * | | | | | | | | Fix dependency scanning configuration in subdirectoriesBrad King2016-02-056-5/+9
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.5.0-rc1~347^2~2 (Set the current dirs on the snapshot before creating the cmMakefile) accidentally changed the source and binary directories configured in `cmake -E cmake_depends` for use during dependency scanning. This can cause the wrong directory information to be loaded. It also breaks Fortran module dependency scanning for modules provided by targets in subdirectories that do not have Fortran_MODULE_DIRECTORY set. Fix the dependency scanning directory configuration and add a test to cover the Fortran module case in which the breakage was observed. Reported-by: Kelly Thompson <kgt@lanl.gov>
* | | | | | | | | Merge topic 'fix-doc-typos'Brad King2016-02-082-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3b91d16 Help: Fix command specification for cmake_minimum_required d8c90800 Help: Fix mistake in cmake-buildsystem(7) example
| * | | | | | | | Help: Fix command specification for cmake_minimum_requiredHorst Kronstorfer2016-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation indicates that at least two components of VERSION must be specified (see Source/cmCMakeMinimumRequired.cxx.) Therefore the minor version is not optional.
| * | | | | | | | Help: Fix mistake in cmake-buildsystem(7) examplePaul Wilkinson2016-02-081-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The COMPATIBLE_INTERFACE_NUMBER_MAX example now sets INTERFACE_CONTAINER_SIZE_REQUIRED on lib1Version2 and lib1Version3. Previously set it on lib1Version2 twice and never on lib1Version3.
* | | | | | | | Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile'Brad King2016-02-081-1/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81ecc726 FindCUDA: Added some additional comments about non-existent dependency files. 4b561b4c FindCUDA: Fix for when a non-existent dependency file is found.
| * | | | | | | FindCUDA: Added some additional comments about non-existent dependency files.James Bigler2016-02-051-0/+2
| | | | | | | |