Brad King
f3ac06519f
Improve compiler check message on non-Make generators
...
When we check for a working compiler we print a message of the form:
Check for working <LANG> compiler: ...
At one time CMAKE_<LANG>_COMPILER was not well-defined for all
generators so we printed the generator name instead of the path to
the compiler. Nowadays we always know the compiler, so update the
message to print it unconditionally. This is more informative than
the generator name, especially when a toolset (cmake -T) is used.
Suggested-by: Gregor Jasny <gjasny@googlemail.com>
2016-02-25 08:29:41 -05:00
Kitware Robot
9b6fdbfb92
CMake Nightly Date Stamp
2016-02-25 00:01:08 -05:00
Brad King
926cf998b5
Merge branch 'release'
2016-02-24 11:11:45 -05:00
Brad King
12f065521c
Merge topic 'doc-typos'
...
33507e2a Help: Fix typos in cmake-packages.7 manual
2016-02-24 11:10:36 -05:00
Brad King
6e6f4d8f80
Merge branch 'doc-typos' into release
2016-02-24 10:13:45 -05:00
Ashley Whetter
33507e2aa7
Help: Fix typos in cmake-packages.7 manual
2016-02-24 10:05:24 -05:00
Brad King
2039bf40e4
Merge topic 'CodeBlocksParallelFlag'
...
84ccd4f7 CodeBlocks: generate parallel project files (make -j)
2016-02-24 09:39:25 -05:00
Brad King
99895f85b3
Merge topic 'xcode-refactor-xcodeobject'
...
b860a925 Xcode: Refactor block writes to allow any level of nesting
2016-02-24 09:39:22 -05:00
Brad King
2186cff370
Merge topic 'xcode-remove-reftype'
...
572797f9 Xcode: Write refType only for Xcode 1.5
2016-02-24 09:39:20 -05:00
Brad King
0f48312386
Merge topic 'update-kwsys'
...
d010ba9f Merge branch 'upstream-KWSys' into update-kwsys
a132064b KWSys 2016-02-22 (4847aedd)
2016-02-24 09:39:18 -05:00
Brad King
3cff48b1bb
Merge topic 'doc-cmake-E-details'
...
b3475030 Help: Clarify `cmake -E` command behavior with respect to file existence
2016-02-24 09:39:15 -05:00
Brad King
8f8418c68b
Merge topic 'test-XCTest-sdkroot'
...
d8cba536 Tests: Fix XCTest when ENV{SDKROOT} is set
2016-02-24 09:39:13 -05:00
Brad King
6f00fc58ed
Merge topic 'test-FindPackageModeMakefileTest-optionally'
...
c05678ad Tests: Add option to disable FindPackageModeMakefileTest
2016-02-24 09:39:10 -05:00
Brad King
be98577f13
Merge topic 'revert-automoc-src-per-dir'
...
091b649e Revert "Automoc: Fix support of files with the same name (#12873 )"
2016-02-24 09:39:08 -05:00
Robert Goulet
b860a92582
Xcode: Refactor block writes to allow any level of nesting
...
Reviewed-by: Gregor Jasny <gjasny@googlemail.com>
2016-02-24 09:36:54 -05:00
Gregor Jasny
572797f984
Xcode: Write refType only for Xcode 1.5
...
This field is not expected by newer versions.
2016-02-24 09:35:54 -05:00
Kitware Robot
3dd42fe4eb
CMake Nightly Date Stamp
2016-02-24 00:01:05 -05:00
Alex Neundorf
84ccd4f746
CodeBlocks: generate parallel project files (make -j)
...
This is done the same way as for Eclipse: cmake tries to determine
the number of CPUs, and then adds the respective -jN to the make
invocations in the project file.
Alex
2016-02-23 22:37:44 +01:00
Kitware Robot
f389e6d6e2
CMake Nightly Date Stamp
2016-02-23 00:01:05 -05:00
Brad King
d010ba9fa7
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2016-02-22 (4847aedd)
2016-02-22 09:03:40 -05:00
KWSys Upstream
a132064b48
KWSys 2016-02-22 (4847aedd)
...
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 4847aedde22b0026accbb71e5480ed353a330e02 (master).
Upstream Shortlog
-----------------
Ben Boeckel (1):
de83c4d4 SystemTools: support deleting junction points
Chuck Atkins (1):
3e1b7395 SystemInformation: Ignore buffers and cache when reporting host memory use
Costy Petrisor (1):
9fe15333 Update hidden includes to support CMake header dependency scanning
Zack Galbreath (1):
4847aedd Process: Allow timeout to be changed after child starts
2016-02-22 09:02:03 -05:00
Kitware Robot
df246f7c7f
CMake Nightly Date Stamp
2016-02-22 00:01:03 -05:00
Kitware Robot
7e32bd945a
CMake Nightly Date Stamp
2016-02-21 00:01:03 -05:00
Kitware Robot
6872a4fde0
CMake Nightly Date Stamp
2016-02-20 00:01:05 -05:00
Brad King
c8d5db90b6
Merge branch 'doc-cmake-E-details' into release
2016-02-19 13:06:38 -05:00
Bartosz Kosiorek
b347503028
Help: Clarify cmake -E
command behavior with respect to file existence
2016-02-19 13:03:09 -05:00
Brad King
509b1f08ea
Merge topic 'cpack-deb-autodep-ORIGIN-RPATH'
...
e8daee5b CPack/Deb $ORIGIN handling in rpath
b8263a2f CPack/Deb Create DEBIAN directory for dpkg-shlibdeps
2016-02-19 09:47:44 -05:00
Brad King
39a80a1feb
Merge topic 'reduce-entropy-consumption'
...
f23f18ab cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976 )
b13a74b3 cmSystemTools: Remove unused include <fcntl.h>
2016-02-19 09:47:41 -05:00
Brad King
c387325d4a
Merge topic 'unix-timestamps'
...
6727270b CMake: Extend TIMESTAMP sub-commands with new unix time format specifier
2016-02-19 09:47:39 -05:00
Brad King
3e3a12a4ab
Merge topic 'fix-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory'
...
26fdd9c3 CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option
2016-02-19 09:47:36 -05:00
Cristian Rodríguez
f23f18ab68
cmSystemTools: Avoid excess entropy consumption by RandomSeed ( #15976 )
...
Read `/dev/urandom` without buffering to avoid taking more than we need.
2016-02-19 09:44:59 -05:00
Brad King
b13a74b35b
cmSystemTools: Remove unused include <fcntl.h>
...
We do not seem to need this header anymore, and including it on AIX
causes `#define open open64` which breaks `std::ifstream::open` calls.
2016-02-19 09:44:59 -05:00
Brad King
d8cba5368b
Tests: Fix XCTest when ENV{SDKROOT} is set
...
We use the host OS X version as the deployment target for this test.
This breaks if the SDKROOT environment variable specifies an
incompatible SDK version. Explicitly specify `macosx` as the
SDK so that CMake will automatically select a version matching
the deployment target.
2016-02-19 09:28:27 -05:00
Brad King
c05678ad28
Tests: Add option to disable FindPackageModeMakefileTest
...
This test does not work in all environments, so add an option to
disable it.
2016-02-19 09:10:44 -05:00
Brad King
091b649e19
Revert "Automoc: Fix support of files with the same name ( #12873 )"
...
This reverts commit 9beb2744d7685fca9cd5717308d4457dffdefcdc.
Our AUTOMOC documentation states that it should be possible to
`#include "moc_foo.cpp"` in `foo.cpp`, and this will not work if
the file is placed in a different directory. Another solution
will need to be found to the original problem.
Reported-by: Stephen Kelly <steveire@gmail.com>
2016-02-19 08:59:17 -05:00
Kitware Robot
29c266eb56
CMake Nightly Date Stamp
2016-02-19 00:01:05 -05:00
Domen Vrankar
e8daee5bd0
CPack/Deb $ORIGIN handling in rpath
...
Release not for fix of bug 12431
2016-02-19 01:42:19 +01:00
Florian Apolloner and John Knottenbelt
b8263a2f8d
CPack/Deb Create DEBIAN directory for dpkg-shlibdeps
...
If CMAKE_INSTALL_RPATH is set and contains $ORIGIN then
dpkg-shlibdeps searches for the DEBIAN directory in order
to resolve $ORIGIN in the rpath to a directory. We need to
create the DEBIAN directory for this to work.
2016-02-19 01:27:36 +01:00
Brad King
9f40f65666
Merge branch 'release'
2016-02-18 13:41:46 -05:00
Brad King
1c6f917722
Merge branch 'release'
2016-02-18 10:49:27 -05:00
Brad King
d203761520
CMake 3.5.0-rc3
2016-02-18 10:41:26 -05:00
Jose-Luis Blanco-Claraco
6727270b75
CMake: Extend TIMESTAMP sub-commands with new unix time format specifier
...
The new `%s` format specifier is substituted by file()/string()
`TIMESTAMP` sub-commands with the number of seconds since unix-epoch
(1970-01-01 00:00:00 UTC).
Co-Author: Nils Gladitz <nilsgladitz@gmail.com>
2016-02-18 10:30:13 -05:00
Brad King
937f7fdd91
Merge topic 'doc-install-component-association'
...
d7c6b710 Merge branch 'backport-doc-install-component-association' into doc-install-component-association
c978223c Help: Clarify install(TARGETS) INCLUDES DESTINATION option
70f2708f Help: Clarify install(TARGETS) INCLUDES DESTINATION option
2016-02-18 10:08:06 -05:00
Brad King
e503941adb
Merge topic 'de-deprecate-CMakeForceCompiler'
...
beaa4fa5 CMakeForceCompiler: De-deprecate until more use cases have alternatives
2016-02-18 10:08:03 -05:00
Brad King
2321e63734
Merge topic 'fix-static-private-non-target-depends'
...
87f44b75 Fix export of STATIC library PRIVATE non-target dependencies
2016-02-18 10:08:01 -05:00
Brad King
1b369aa285
Merge topic 'FindCUDA-verbatim'
...
1911cda0 FindCUDA: Fix regression under Visual Studio generators
2016-02-18 10:07:58 -05:00
Brad King
135a0df525
Merge topic 'automoc-src-per-dir'
...
9beb2744 Automoc: Fix support of files with the same name (#12873 )
2016-02-18 10:07:56 -05:00
Daniel Wirtz
26fdd9c30a
CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option
2016-02-18 09:37:59 -05:00
Kitware Robot
ede2a6ea6b
CMake Nightly Date Stamp
2016-02-18 00:01:04 -05:00
Brad King
3dd420bd90
Merge branch 'FindCUDA-verbatim' into release
2016-02-17 15:25:44 -05:00