Brad King
fe0477c2bf
Merge topic 'add_cache_options_to_ccmake'
...
fadffab
ccmake: Teach dialog to support cache STRINGS property
2013-10-07 15:44:48 -04:00
Brad King
fcfd409ad1
Merge topic 'UseJava-jar-manifest'
...
69aff17
UseJava: Add support for the jar 'm' (Manifest) option
2013-10-07 15:44:43 -04:00
Brad King
c76b380181
Merge topic 'deprecation-macro-refactor'
...
cdf55d5
GEH: Make each element of the deprecation macros overridable.
80d5090
GEH: Use the macro for the deprecation attribute after definiting it.
2013-10-07 15:44:39 -04:00
Brad King
3e2e060999
Merge topic 'generate-modern-style'
...
027a020
Merge branch 'test-property-genex' into generate-modern-style
33055c4
Generate modern-style cmake code.
2013-10-07 15:44:33 -04:00
Brad King
9939c99bc6
Merge topic 'test-property-genex'
...
6a47c37
add_test: Mention generator expressions in old-style add_test docs
d331292
cmTestGenerator: Evaluate generator expressions in test properties
6fe5c4a
cmTestGenerator: Separate test properties for each configuration
2013-10-07 15:44:23 -04:00
Brad King
b53a71bb1b
Merge topic 'doc-add_dependencies-direction'
...
1bdac7d
add_dependencies: Clarify direction of dependency in docs (#14424 )
2013-10-07 15:44:19 -04:00
Brad King
da0f373885
Merge topic 'EclipseFixWarningMessage'
...
5f11b8d
Eclipse: add version 4.3 for completeness
2b63734
Eclipse: print different message if CMAKE_ECLIPSE_VERSION is already set
1ff8c21
CMakeFindEclipse: use lowercase for macro calls
2013-10-07 15:44:14 -04:00
Brad King
55af4ba26f
Merge topic 'cmListFileLexer-fix-leak-on-error'
...
ad3d5c5
cmListFileLexer: Fix leak on error before EOF
2013-10-07 15:43:59 -04:00
Brad King
e00089388c
Merge topic 'cleanup-properties'
...
b78bc33
Cleanup some variable documentation names
bbfff52
Remove redundant cmake::GetIsPropertyDefined method
2013-10-07 15:43:55 -04:00
Brad King
ca2c627b39
Merge topic 'mark_as_advanced'
...
8cff5e4
mark_as_advanced: improve documentation syntax
2013-10-07 15:43:51 -04:00
Brad King
44e5118ede
Merge topic 'openssl-advanced'
...
864e2a3
FindOpenSSL: mark variables as advanced for MSVC (#14418 )
2013-10-07 15:43:46 -04:00
Brad King
e25dabb3d5
Merge topic 'RunCMake-ignore-valgrind-lines'
...
4953330
Tests/RunCMake: Tolerate valgrind lines in CMake output
2013-10-07 15:43:41 -04:00
Brad King
64064c6616
Merge topic 'cleanup-CTestTestMemcheck'
...
e8e67ae
CTestTestMemcheck: Fix matching of malloc debug messages
8ea62fd
CTestTestMemcheck: Tolerate trailing "==..." lines from valgrind
f169f48
CTestTestMemcheck: Refactor output expectation regex generation
2013-10-07 15:43:36 -04:00
Brad King
6494cf56dc
Merge topic 'fix-genex-preprocessing-incomplete-test'
...
2aafacc
genex: Test preprocessing incomplete expressions.
2013-10-07 15:43:29 -04:00
Brad King
2e7ba290a5
Merge topic 'minor_cleanup'
...
6931999
VS6: Add some delimiting between error message and content.
d1a5f12
cmTarget: Fix typo in comment.
961c0ba
Fix comments to match the code.
7cca50c
Remove unused include.
2013-10-07 15:43:23 -04:00
Brad King
0b7a2034a3
Merge topic 'FixTypoInGraphvizDocs'
...
bbb0d6f
CMakeGraphVizOptions.cmake: Fix typo in documentation
2013-10-07 15:43:15 -04:00
Brad King
6955d7bea6
Merge topic 'cmake-gui-window-settings'
...
81ea363
cmake-gui: save and restore the geometry and window state between sessions.
2013-10-07 15:43:09 -04:00
Brad King
7069680bad
Merge topic 'FindwxWidgets-msvc-x64'
...
870f91e
FindwxWidgets: Look in x64 directories for MSVC (#14393 )
2013-10-07 15:42:59 -04:00
Brad King
31e6ee502e
Merge topic 'authorative-LINK_LIBRARIES'
...
f01dc72
Use one authorative source of the LINK_LIBRARIES property.
2013-10-07 15:42:55 -04:00
Brad King
ea574d98ed
Merge topic 'vs-compiler-id-tolerate-diagnostics'
...
8c891f8
VS: Tolerate diagnostic output while detecting cl (#14387 )
2013-10-07 15:42:51 -04:00
Brad King
e0c7ccb1b3
Merge topic 'deprecate-add_compiler_export_flags'
...
0f3a666
GenerateExportHeader: Deprecate add_compiler_export_flags function.
2013-10-07 15:42:41 -04:00
Brad King
1c49ecad36
Merge topic 'FindPython_versions'
...
afd4f7f
FindPython*: simplify version selection
2013-10-07 15:42:35 -04:00
Brad King
73170c38d7
Merge topic 'FindLua'
...
89cfa20
Modules: add FindLua.cmake
2013-10-07 15:42:27 -04:00
Brad King
d97fa4b4da
Merge topic 'add-find_dependency-macro'
...
bb501a2
CMakePackageConfigHelpers: Add a find_dependency macro
2013-10-07 15:42:22 -04:00
Brad King
5f9de609dd
Merge topic 'rename-genex-method'
...
cfae430
Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluation
2013-10-07 15:42:17 -04:00
Brad King
b61960564a
Merge topic 'graphviz-at-generate-time'
...
6cf5564
Generate graphviz files at generate time, not configure time.
2013-10-07 15:42:13 -04:00
Brad King
5a4ec661cf
Merge topic 'add-policy-version-test'
...
b494722
Tests: Verify policies are introduced only in "official" versions
2013-10-07 15:42:06 -04:00
Brad King
25b35ed38a
Merge topic 'update_trilinos_contract_test'
...
5a4a584
update Trilinos contract test
2013-10-07 15:42:02 -04:00
Brad King
d673e1f38f
Merge topic 'fix-style'
...
5916645
Fix some indentation problems in cmPolicies.
2013-10-07 15:41:54 -04:00
Brad King
1e54b380cb
Merge topic 'MAP_IMPORTED_CONFIG-property-default'
...
fb1294c
cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>
2013-10-07 15:41:49 -04:00
Brad King
a65df441f2
Merge topic 'vs-no-regen-external-msproject'
...
e478f03
VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378 )
2013-10-07 15:41:44 -04:00
Brad King
058af7a6ce
Merge topic 'PLATFORM_ID-genex'
...
dcc00ec
Genex: Add the PLATFORM_ID expression.
2013-10-07 15:41:39 -04:00
Brad King
ea3bb7ed9a
Merge topic 'automoc-gadget'
...
d4937da
Search for the Q_GADGET macro for running automoc too.
2013-10-07 15:41:33 -04:00
Brad King
f4acef500b
Merge topic 'ADDITIONAL_MAKE_CLEAN_FILES-genex'
...
d26594f
Genex: Evaluate genexes for additional make clean files.
2013-10-07 15:41:29 -04:00
Brad King
f7558c5447
Merge topic 'fix-reset-compiler'
...
8b2a2db
Fix resetting the compiler on the command line (#14366 ).
2013-10-07 15:41:24 -04:00
Brad King
610234a5e8
Merge topic 'FortranCInterface-cross-compile'
...
d7a65a2
FortranCInterface: Fix cross-compiling Linux to MinGW (#14358 )
2013-10-07 15:41:19 -04:00
Brad King
0f32faafdb
Merge topic 'remove-local-typedef'
...
2a7fecc
remove unused local typedef
2013-10-07 15:41:12 -04:00
Brad King
7f5961f935
Merge topic 'no-duplicate-find-tests'
...
796c618
blacklist tests with their own test in Tests/Module from AllFindModules test
2013-10-07 15:41:06 -04:00
Brad King
d4134352ab
Begin post-2.8.12 development
2013-10-07 15:24:20 -04:00
Bill Hoffman
fadffab538
ccmake: Teach dialog to support cache STRINGS property
...
This commit adds the ability to ccmake of cycling through cache options.
This uses the STRINGS property of the cache entry. The enter key will cycle
forward, and the right and left arrows will go up and down in the list.
2013-10-07 14:17:54 -04:00
Brad King
ffff99c58e
CMake 2.8.12
2013-10-07 08:28:26 -04:00
Brad King
c515dc5748
Merge topic 'fix-install-include-dirs-processing'
...
6f98f4a
Genex: Fix processing multiple include directories for relative paths
2013-10-07 08:26:46 -04:00
Brad King
431eaf3783
Merge branch 'release'
2013-10-07 08:26:01 -04:00
Stephen Kelly
6f98f4ac92
Genex: Fix processing multiple include directories for relative paths
...
Re-insert the semicolon which was removed during splitting.
Commit d777b8e7
(Genex: Allow relative paths in INSTALL_INTERFACE.,
2013-07-25) introduced the prefixItems method to allow relative paths
in the argument of the INSTALL_INTERFACE expression. That method was
buggy in that it did not re-introduce the semicolon separator in
the result.
This bug also affects paths which are already absolute in user code.
2013-10-07 08:17:12 -04:00
Kitware Robot
d85b06602a
CMake Nightly Date Stamp
2013-10-07 00:01:10 -04:00
Kitware Robot
5b98d09e80
CMake Nightly Date Stamp
2013-10-06 00:01:10 -04:00
Kitware Robot
dc92741d03
CMake Nightly Date Stamp
2013-10-05 00:01:06 -04:00
Brad King
3d8356d486
Clang: Support Windows variants for GNU and MSVC ( #13035 , #14458 )
...
Teach the compiler identification preprocessor tests to report when
Clang simulates MSVC, and what version. If not MSVC, assume GNU.
Teach compiler information modules Clang-(C|CXX) to recognize when Clang
simulates MSVC and skip loading the GNU information.
Teach the Windows-MSVC platform information to recognize when it is
loaded as the simulated compiler and use that version information
instead of the real compiler's (different) version scheme.
Add platform modules Windows-Clang-(C|CXX) and support module
Windows-Clang to load either Windows-MSVC or Windows-GNU and wrap
the corresponding information macros.
2013-10-04 13:39:22 -04:00
Brad King
51ab85c398
CMakeDetermineCompilerId: Add notion of "simulated" id/version
...
Some compilers try to simulate other compilers as a drop-in replacement
supporting all the same command-line options and predefined preprocessor
macros. In such cases it will be useful to have CMake load the compiler
information files for the simulated compiler instead of duplicating the
information. Teach CMakeDetermineCompilerId to extract the simulated
compiler id and version when the compiler id detection provides it.
2013-10-04 13:25:06 -04:00
Brad King
be10826bf1
CMakeDetermineCompilerId: Fix local var init
...
Add initialization of the ARCHITECTURE_ID local and fix the
initialization of the COMPILER_ID_TWICE local.
2013-10-04 10:33:16 -04:00