kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
26,026 Commits 1 Branch 14 Tags
Commit Graph

26026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Kelly
f8f02451ad Help: Use a property-specific command instead of the generic one. 2014-11-22 12:58:58 +01:00
Stephen Kelly
8609a884a2 Help: Make remaining build property docs consistent. 
These help entries are different enough that they can not use the
generic template.
 2014-11-22 12:51:25 +01:00
Stephen Kelly
bcface3932 Help: Link to target_link_libraries from target properies. 2014-11-22 12:46:13 +01:00
Stephen Kelly
e12926e793 Help: Format the LINK_INTERFACE_LIBRARIES target properies. 2014-11-22 12:45:43 +01:00
Stephen Kelly
c8540e9466 Help: Unify the help text of INTERFACE_ build properties. 2014-11-22 12:39:04 +01:00
Kitware Robot
2ed0088b2a CMake Nightly Date Stamp 2014-11-22 00:01:07 -05:00
Zack Galbreath
17b0fe0305 Fix incremental linking setting for Fortran + VS 
This commit fixes a bug where it was impossible to specify
/INCREMENTAL to Fortran projects built with Visual Studio.

The problem was due to the fact that .vfproj files expect
the value of this flag to be "linkIncremental{No,Yes},
whereas .vcproj files expect this value to be 0, 1, or 2.

The implementation of this fix adds a new data structure for
Visual Studio linker flags specific to Fortran.  This can
easily be extended in the future if more such discrepencies
between C/C++ and Fortran linking are discovered.
 2014-11-21 13:32:45 -05:00
Kitware Robot
a075777ca1 CMake Nightly Date Stamp 2014-11-21 00:01:11 -05:00
Stephen Kelly
12cb0b868c Help: Update developer manual with some C++ features now permitted. 2014-11-20 23:11:38 +01:00
Stephen Kelly
ba74465fbc cmGeneratorTarget: Remove MSVC7 workaround 
Use partial specialization everywhere.
 2014-11-20 23:07:22 +01:00
Stephen Kelly
41363c0c61 VisualStudio: Remove MSVC6 compatibility macro. 2014-11-20 22:25:44 +01:00
Stephen Kelly
4efcfe52f4 cmSystemTools: Remove MSVC6 compatibility define. 2014-11-20 22:24:27 +01:00
Stephen Kelly
5f4695cd06 cmStandardIncludes: Remove MSVC6 condition for cmArrayBegin macro. 2014-11-20 22:22:45 +01:00
Stephen Kelly
7a0643379b cmFindCommon: Remove MSVC6 workaround for nested struct private access. 2014-11-20 22:22:00 +01:00
Stephen Kelly
fdb7354722 cmTarget: Remove std::min and std::max MSVC6 compatibility code. 
CMake is no longer required to build with MSVC6.
 2014-11-20 22:17:16 +01:00
Stephen Kelly
f327a9fd26 Merge branch 'default-lang-dialect' into step2 
Conflicts:
	Modules/Compiler/Clang-C.cmake
 2014-11-20 22:11:56 +01:00
Stephen Kelly
36bb100e2b Fix the test for running the CxxDialog unit test. 
The existing versions have been used since commit
v3.1.0-rc1~635^2~8 (cmTarget: Add CXX_STANDARD and CXX_EXTENSION
target properties., 2013-10-13), but further discussions since then
increased the initial minimum compiler versions this feature is
available for.
 2014-11-20 22:10:25 +01:00
Stephen Kelly
a3d0ae1758 Features: Fix the default C dialect for Clang and GNU. 
Clang 3.4 uses C99 by default, and Clang 3.6 uses C11 by default:

 http://thread.gmane.org/gmane.comp.compilers.clang.devel/39379

GNU 4.9 uses C90 by default, and GNU 5.0 uses C11 by default:

 https://gcc.gnu.org/gcc-5/changes.html

Test that the default compiler settings result in the expected dialect
macros being defined for both C and CXX.  Remove the unused main.c
file from the CompileFeatures unit test.
 2014-11-20 18:24:59 +01:00
Brad King
32a191ce4b cmTarget: Use null_ptr code path on all platforms 
This reduces conversions asked of the compiler.  Also drop 'static' from
the declaration of the local null_ptr helper.
 2014-11-20 10:22:07 -05:00
Brad King
64678cbc0a Merge branch 'fix-openmp-fortran' into release 2014-11-20 09:00:33 -05:00
Brad King
3a20cef3d7 Merge topic 'fix-CMP0054-MSVC' 
fa1a066a Merge branch 'backport-fix-CMP0054-MSVC' into fix-CMP0054-MSVC
4d52cd36 Avoid if() quoted auto-dereference when checking for "MSVC"
543c4304 Avoid if() quoted auto-dereference when checking for "MSVC"
 2014-11-20 08:57:17 -05:00
Brad King
3749ad49e3 Merge topic 'FindJava-no-osx-stub' 
dd378258 FindJava: Do not accept OS X stub 'java' as Java
 2014-11-20 08:57:07 -05:00
Nils Gladitz
7d633ebfa0 FindOpenMP: Use fixed form Fortran test program 
This prevents the test program from failing when build as Fortran 77.

Suggested-by: Alin Marin Elena <alinm.elena@gmail.com>
 2014-11-20 14:54:11 +01:00
Brad King
b1e7fe9e8d Merge branch 'backport-fix-CMP0054-MSVC' into release 2014-11-20 08:53:47 -05:00
Kitware Robot
b6f6b0a983 CMake Nightly Date Stamp 2014-11-20 00:01:08 -05:00
Brad King
fa1a066af1 Merge branch 'backport-fix-CMP0054-MSVC' into fix-CMP0054-MSVC 2014-11-19 16:25:18 -05:00
Fraser Hutchison
4d52cd36ad Avoid if() quoted auto-dereference when checking for "MSVC" 
When testing CMAKE_<LANG>_COMPILER_ID values against "MSVC", do not
allow the definition of the "MSVC" variable to be expanded.
 2014-11-19 16:24:54 -05:00
Fraser Hutchison
543c4304bb Avoid if() quoted auto-dereference when checking for "MSVC" 
When testing CMAKE_<LANG>_COMPILER_ID values against "MSVC", do not
allow the definition of the "MSVC" variable to be expanded.
 2014-11-19 16:22:56 -05:00
Brad King
5ee198d76e Merge branch 'FindJava-no-osx-stub' into release 2014-11-19 16:15:43 -05:00
Brad King
dd378258f1 FindJava: Do not accept OS X stub 'java' as Java 
OS X provides a stub 'java' to inform callers that Java is not present.
When checking the 'java -version' output, look for such a message and if
found pretend 'java' was not found.

Suggested-by: Sean McBride <sean@rogue-research.com>
 2014-11-19 16:14:56 -05:00
Stephen Kelly
c03c184be0 Features: Record C++11 dialect switch only for GNU 4.7 and later. 
Previous versions of GNU are not currently supported by this
CMake feature.
 2014-11-19 09:39:44 +01:00
Kitware Robot
f7b6f3d967 CMake Nightly Date Stamp 2014-11-19 00:01:08 -05:00
Stephen Kelly
49e2b689a8 Features: Fix references to CXX compiler version in Clang-C.cmake. 2014-11-19 00:42:51 +01:00
Stephen Kelly
7565ab2cd1 Features: Test the CXX compiler only if it has features. 
If using different C and CXX compilers, we might not have a
feature-full CXX compiler at this point.
 2014-11-19 00:42:35 +01:00
Stephen Kelly
26e98c34dc file(GENERATE): Re-run cmake when appropriate. 
Re-run if the input file changes or if the output file is removed.

This only works with the Makefile generators currently.  The limitation
of the Ninja generator is tracked as issue #15256.  The IDE
generators will need larger refactoring as they currently rely on
being able to determine the depends and output files at the start of
generate-time, which is too early for the file(GENERATE) case.
 2014-11-19 00:19:09 +01:00
Stephen Kelly
3bd59b6014 QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible. 2014-11-18 23:20:40 +01:00
Stephen Kelly
bf00f5287b QtAutogen: Don't take a reference to temporary. 
While a const reference to a temporary is standard conformant,
it doesn't seem to be necessary or advantageous here.
 2014-11-18 23:20:40 +01:00
Ådne Hovda
7a68729223 ccmake: Cleanup and simplify conditional blocks for HP-UX 2014-11-18 10:03:35 -05:00
Ådne Hovda
44f02b42fb ccmake: Use standard getmaxyx instead of non-standard getmax[xy] 
Swap out getmax[xy]() calls for single call to getmaxyx(), to support
strict X/Open conformant curses implementations, e.g. HP-UX Xcurses.
 2014-11-18 10:02:33 -05:00
Ådne Hovda
ee3d06a41e ccmake: Remove incomplete support for cur_colr on old HP-UX 
Enable support for the more modern Xcurses.
 2014-11-18 10:02:08 -05:00
Gauthier Lamaison
51a60973eb CPackRPM: Unset temporary component variables before re-use 
Improve the fix from commit v2.8.9~136^2 (CPackRPM: avoid leakage of RPM
directive from one component to another, 2012-06-05) to clean up more
temporary variables.

Reviewed-by: Domen Vrankar <domen.vrankar@gmail.com>
 2014-11-18 09:25:10 -05:00
Brad King
d526ebc603 Merge topic 'vs-check-phone-store-tools' 
689cd0d4 VS: Do not produce WinMD file for OBJECT libraries (#15228)
b20a32ac VS: Improve error messages when compiler is not detected (#15228)
 2014-11-18 09:12:34 -05:00
Brad King
7a39d32f05 Merge topic 'update-curl' 
46bbf947 curl: Check for OpenSSL headers independently
 2014-11-18 09:12:32 -05:00
Brad King
ecdea34fcc Merge topic 'FindCurses-no-cur_colr' 
d931ba60 FindCurses: Drop search for deprecated HP-UX cur_colr library
 2014-11-18 09:12:28 -05:00
Brad King
397c762da4 Merge topic 'doc-sphinx-cmake-fixup' 
5cda2205 Utilities/Sphinx: Add missing call to note_explicit_target
 2014-11-18 09:12:25 -05:00
Kitware Robot
52fd5775d1 CMake Nightly Date Stamp 2014-11-18 00:01:08 -05:00
Brad King
bea609ac2a Merge branch 'vs-check-phone-store-tools' into release 2014-11-17 15:39:17 -05:00
Brad King
536baafb76 Merge branch 'doc-sphinx-cmake-fixup' into release 2014-11-17 15:39:09 -05:00
Brad King
5cda220548 Utilities/Sphinx: Add missing call to note_explicit_target 
Sphinx calls document.note_explicit_target with any nodes.target() it
creates.  Add such a call when we create a document target in
CMakeTransform.
 2014-11-17 15:37:31 -05:00
Brad King
d4fdfaaef1 Merge branch 'doc-target_include_directories-fixup' into release 2014-11-17 15:16:35 -05:00