summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* KWSys: Tell Git not to export .gitattributesBrad King2015-05-131-4/+0
| | | | | | | KWSys upstream added an attribute to export .gitattributes so that importing snapshots into the sources of other projects would bring along the attributes. However, we don't want to export them from CMake. Drop .gitattributes entries not relevant to CMake.
* Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-05-131-1/+9
|\
| * KWSys 2015-05-12 (b1d560a0)KWSys Robot2015-05-131-1/+9
| | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ b1d560a0 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 34fceb50..b1d560a0 Brad King (1): b1d560a0 CPU: MIPS is biendian
* | CMake Nightly Date StampKitware Robot2015-05-131-1/+1
| |
* | Merge topic 'ctest-no-make-i'Brad King2015-05-1225-7/+156
|\ \ | | | | | | | | | | | | | | | | | | 226df303 CTest: Stop telling 'make' to ignore errors with -i 28e7a135 Help: Fix build_command alternative signature docs 231601b6 build_command: Choose configuration consistently across signatures
| * | CTest: Stop telling 'make' to ignore errors with -iBrad King2015-05-1225-5/+154
| | | | | | | | | | | | Add policy CMP0061 to maintain compatibility for existing projects.
| * | Help: Fix build_command alternative signature docsBrad King2015-05-121-1/+1
| | | | | | | | | | | | | | | Do not specify that --config will not be added, because the command does add it.
| * | build_command: Choose configuration consistently across signaturesBrad King2015-05-121-1/+1
| | | | | | | | | | | | | | | | | | Teach the legacy two-argument signature to use CMAKE_CONFIG_TYPE from the environment only if it is non-empty. This makes behavior consistent with the main signature.
* | | Merge topic 'cpack-deb-component-dependencies'Brad King2015-05-128-16/+294
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1237d5fa Help: Add notes for topic 'cpack-deb-component-dependencies' e3f522f6 CPack/DEB per component dependencies
| * | | Help: Add notes for topic 'cpack-deb-component-dependencies'Brad King2015-05-121-0/+6
| | | |
| * | | CPack/DEB per component dependenciesRaffi Enficiaud2015-05-087-16/+288
| |/ / | | | | | | | | | Dependencies may now be set per component
* | | Merge topic 'cpack-not-running-tests'Brad King2015-05-123-23/+25
|\ \ \ | | | | | | | | | | | | | | | | 7c103be8 CPack: Enable DEB and RPM tests more reliably
| * | | CPack: Enable DEB and RPM tests more reliablyDomen Vrankar2015-05-123-23/+25
| |/ / | | | | | | | | | | | | | | | | | | CPack DEB and RPM generators were not used for some tests because CPACK_BINARY_DEB and CPACK_BINARY_RPM variable were not set. Fix this, simplify generator selection in CTEST_RUN_CPackComponentsForAll, and fix bugs that were detected after tests were run.
* | | Merge topic 'find_package-no-cmake-gui-paths'Brad King2015-05-126-70/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1506f9ca find_package: Drop search in recent cmake-gui locations 8d484463 FindFLTK: Drop search in recent cmake-gui locations
| * | | find_package: Drop search in recent cmake-gui locationsBrad King2015-05-084-42/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The find_package command, on Windows, has always searched build trees recently visited by cmake-gui (or CMakeSetup at one time). This was done when the command was created with the intention of simplifying workflows involving building multiple dependent projects. However, this behavior depends on recent developer interaction and therefore can create different find results based on transient system states. It can lead to surprising results and user confusion. Since this behavior was first added CMake has gained many more search options, better error messages when a package is not found, and a package registry. The latter in particular allows projects to make their build trees available for dependent projects to find without user intervention. Therefore the originally intended workflow can be achieved in other, more stable ways. After the above evoluion of find_package we have now decided that the magic search-where-cmake-gui-was behavior does more harm than good. Drop it. We do not need a policy for this behavior change because it only affects interactive use.
| * | | FindFLTK: Drop search in recent cmake-gui locationsBrad King2015-05-082-28/+0
| | | | | | | | | | | | | | | | This is not done by any other find modules.
* | | | Merge topic 'detect-c++14-missing-gets'Brad King2015-05-123-1/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3307e10f Avoid using C++14 to build CMake if cstdio breaks
| * | | | Avoid using C++14 to build CMake if cstdio breaksBrad King2015-05-083-1/+41
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GNU 4.8 standard library's cstdio header is not aware that C++14 honors C11's removal of "gets" from stdio.h and results in an error: /.../include/c++/4.8/cstdio:120:11: error: no member named 'gets' in the global namespace Detect this problematic case and default to using C++11 instead of C++14 for building CMake itself.
* | | | Merge topic 'doc-file-COPY-preserves-structure'Brad King2015-05-121-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f39d26ca Help: Clarify file(COPY) directory semantics (#15561)
| * | | | Help: Clarify file(COPY) directory semantics (#15561)Brad King2015-05-081-1/+5
| | | | | | | | | | | | | | | | | | | | State explicitly that directory structure is preserved.
* | | | | Merge topic 'ExternalProject-improve-missing-source-error'Brad King2015-05-1211-1/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dcb18836 ExternalProject: Improve error when SOURCE_DIR is missing (#15560)
| * | | | | ExternalProject: Improve error when SOURCE_DIR is missing (#15560)Brad King2015-05-0811-1/+81
| |/ / / / | | | | | | | | | | | | | | | | | | | | Mention the SOURCE_DIR that we checked and found empty or missing so that the user can see the full path to what we expected to find.
* | | | | Merge topic 'ninja-gcc-windows'Brad King2015-05-122-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf8ce7a3 RC: Do not override MinGW Makefiles generator preference ca658a45 Ninja: Use forward slashes for linking with any GCC on Windows (#15439)
| * | | | | RC: Do not override MinGW Makefiles generator preferenceBrad King2015-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update logic added in commit 957c2aac (RC: Simplify selection of resource compiler based on C/C++ toolchain, 2015-05-07) to avoid overriding CMAKE_GENERATOR_RC. The MinGW and MSYS Makefiles generators use it to select a windres next to the compiler even if it is not in the PATH.
| * | | | | Ninja: Use forward slashes for linking with any GCC on Windows (#15439)Thomas Herz2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a condition forgotten by commit b3de0dfe (Ninja: Use forward slashes for any GCC on Windows, 2015-05-07).
* | | | | | Merge topic 'suppress-LNK4089-warning'Brad King2015-05-121-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1904934 CTestCustom: Suppress LNK4089 warning about RPCRT4 e228d66d CTestCustom: Suppress LNK4089 warning about ole32
| * | | | | | CTestCustom: Suppress LNK4089 warning about RPCRT4Brad King2015-05-081-0/+1
| | | | | | |
| * | | | | | CTestCustom: Suppress LNK4089 warning about ole32Brad King2015-05-071-0/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-05-121-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-05-111-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-05-101-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-05-091-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'doc-ctest-command-formatting'Brad King2015-05-089-162/+285
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 695d6f62 Help: Revise ctest_* command documentation (#15559) f8716c8b Help: Update cmake-generators(7) organization for GHS
| * | | | | | Help: Revise ctest_* command documentation (#15559)Brad King2015-05-078-159/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise documentation for the major dashboard client step ``ctest_*`` commands. Modernize the documentation formatting. Add some missing options.
| * | | | | | Help: Update cmake-generators(7) organization for GHSBrad King2015-05-071-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'WCDH-CMP0054-safety'Brad King2015-05-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65e6b115 WCDH: Fix condition when variables named "FILE" or "PREFIX" are defined
| * | | | | | WCDH: Fix condition when variables named "FILE" or "PREFIX" are definedBrad King2015-05-071-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Reported-by: Kevin Godby <godbyk@gmail.com>
* | | | | | Merge topic 'ninja-gcc-windows'Brad King2015-05-0810-57/+64
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20560e8d Ninja: Do not use newlines in response files with Windows GNU tools (#15439) b3de0dfe Ninja: Use forward slashes for any GCC on Windows (#15439) 378c2a0e Ninja: Refactor detection of MinGW tools on Windows 957c2aac RC: Simplify selection of resource compiler based on C/C++ toolchain
| * | | | | Ninja: Do not use newlines in response files with Windows GNU tools (#15439)Thomas Herz2015-05-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.11~213^2 (Ninja: Avoid LNK1170 linker error, 2013-02-01) we generate linker response files with "$in_newline" to support a large number of object files with the MS link.exe tool. However, the GNU linker on Windows does not understand the newline endings that Ninja puts in the response files. Switch back to "$in" for that case.
| * | | | | Ninja: Use forward slashes for any GCC on Windows (#15439)Thomas Herz2015-05-073-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any GCC compiler on a Windows host needs forward slashes, not just those built for MinGW.
| * | | | | Ninja: Refactor detection of MinGW tools on WindowsBrad King2015-05-073-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for CMAKE_COMPILER_IS_MINGW only after enabling a language when it might actually be set. Previously this worked by accident because the check for working compiler or a second language enabled would cause the code path to be taken. Store UsingMinGW as an instance member of cmGlobalNinjaGenerator so that it is reset on each reconfigure. Otherwise cmake-gui cannot switch between build trees for MinGW or non-MinGW tools.
| * | | | | RC: Simplify selection of resource compiler based on C/C++ toolchainBrad King2015-05-077-35/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the refactoring by commit v2.8.11~105^2~1 (Ninja: use MinGW generator code in EnableLanguage, 2013-03-09) and move the MinGW- specific logic back to the "MinGW Makefiles" generator. Instead teach the platform information modules for GNU and MSVC on Windows to set the preferred RC compiler just before enabling the RC language. This way we choose the RC compiler based on the C/C++ toolchain that is actually enabled.
* | | | | | Merge topic 'execute_process-merge-output'Brad King2015-05-0811-6/+82
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f65bb82f execute_process: Improve stdout/stderr merging
| * | | | | | execute_process: Improve stdout/stderr mergingBrad King2015-05-0711-6/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the KWSys Process "MergeOutput" option to give the child process the same pipe (or file) for both stdout and stderr. This allows natural merging of stdout and stderr together instead of merging on arbitrary buffered read boundaries as before.
* | | | | | | Merge topic 'update-kwsys'Brad King2015-05-083-4/+23
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | 31c218e6 Merge branch 'upstream-kwsys' into update-kwsys ac94a796 KWSys 2015-05-05 (34fceb50)
| * | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-05-073-4/+23
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | KWSys 2015-05-05 (34fceb50)KWSys Robot2015-05-073-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 34fceb50 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 8c8b2273..34fceb50 Brad King (1): 34fceb50 Process: Add option to merge stdout/stderr
* | | | | CMake Nightly Date StampKitware Robot2015-05-081-1/+1
|/ / / /
* | | | Merge topic 'update-ctest_build-docs'Brad King2015-05-071-14/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5731fb2e ctest_build: mention CTEST_BUILD_COMMAND in the docs 753da8c6 ctest_build: update the default target documentation 5ab896ae ctest_build: spruce up the documentation a bit
| * | | | ctest_build: mention CTEST_BUILD_COMMAND in the docsBen Boeckel2015-05-071-4/+5
| | | | |