Brad King
5d6e54ce50
Merge topic 'test_regex_doc'
...
74228e8 Doc: fix example for FAIL_REGULAR_EXPRESSION
2013-05-16 14:38:28 -04:00
Brad King
07d8492178
Merge topic 'positive-test-times'
...
e319e32 CTest: make sure never to report negative test times (#14132 )
2013-05-16 14:38:20 -04:00
Brad King
f2a0671259
Merge topic 'UseJava-cross-compile'
...
778aacc Allow using Java in a cross-compilation toolchain
2013-05-16 14:38:16 -04:00
Brad King
19bd84b3cd
Merge topic 'vs-compiler-id-arm'
...
e4c0465 VS: Detect MSVC compiler id on ARM toolchain
2013-05-16 14:38:12 -04:00
Brad King
0dc0e7d885
Merge topic 'doc-improvements'
...
7cc2805 Docs: Clarify wording "flag used" => "flag (to|will) be used"
2378a69 Docs: Clarify that CMAKE_*_(PREFIX|SUFFIX) affect filenames
56ca34d Docs: Update description of CMAKE_(BUILD_TYPE|CONFIGURATION_TYPES)
2bab472 VS10: add detailed comment about MIDL processing
e619111 Explain distribution of Win9x binary on all Windows versions.
5ca4336 FindwxWidgets: add DOC strings with usual style
f57800d Fix spelling and typos (product names)
bf019d7 Fix spelling and typos (non-binary)
ddac8d3 Fix spelling and typos (affecting binary data / module messages)
86832ce Fix spelling and typos (affecting users)
2013-05-16 14:38:07 -04:00
Brad King
07afd4f375
Merge topic 'update-kwsys'
...
b7593bf Merge branch 'upstream-kwsys' into update-kwsys
d0cdc68 KWSys 2013-05-06 (f4928d44)
0c04428 Merge branch 'upstream-kwsys' into update-kwsys
327c982 KWSys 2013-04-25 (709fb5c1)
2013-05-16 14:37:59 -04:00
Brad King
b547b99a70
Merge topic 'fix-per-config-tll-include-dirs'
...
88308bc Test that linking using the debug keyword to tll works.
20104ab Test transitive includes from setting the LINK_LIBRARIES property.
2013-05-16 14:37:55 -04:00
Brad King
e855dd54df
Merge topic 'ExternalProject-svn-auth-blank'
...
ecd11a2 ExternalProject: Allow blank SVN_USERNAME/SVN_PASSWORD (#14128 )
2013-05-16 14:37:50 -04:00
Brad King
18a5c4f4c6
Merge topic 'implicit-linker-detection'
...
a2bc47d Recognize ld with toolchain prefix (#13960 )
2013-05-16 14:37:46 -04:00
Brad King
831dd5abab
Merge topic 'cpack-nsis-uninstall'
...
40566ef CPack/NSIS: Obtain path from which to uninstall from registry (#14124 )
2013-05-16 14:37:43 -04:00
Brad King
1843f2e0cd
Merge topic 'eclipse-doc-typo'
...
b9c1f3b Eclipse: Add a missing space in the documentation
2013-05-16 14:37:37 -04:00
Brad King
27e4ddcd3f
Merge topic 'EclipseUseGmakeErrorParser_13699'
...
c46b46b Use GmakeErrorParser instead of deprecated MakeErrorParser (fixes bug 0013699)
2013-05-16 14:37:32 -04:00
Brad King
823022dd2e
Merge topic 'WindowsPaths-MinGW-cross-compile-only'
...
f9eee7f Windows: Search '/' prefix only when cross compiling (#10994 )
2013-05-16 14:37:28 -04:00
Brad King
3e6f5ff33c
Merge topic 'QtDialogSearchText2'
...
f92d7e7 cmake-gui: use shortcut F only for "Find in Output"
6e57724 cmake-gui: Add function for going to next error message in Output window
7be2d8a cmake-gui: Change shortcut of the search field from Ctrl-F to Alt-E
4ce65e8 cmake-gui: Add search functions to the context menu of the Output widget
df3663b cmake-gui: Add search functions for Output window (#9733 )
2013-05-16 14:37:21 -04:00
Brad King
e6f2a0d1c8
Merge topic 'check-compiler-flag-locale'
...
5272372 Check{C,CXX}CompilerFlag: Test using C locale (#14102 )
2013-05-16 14:37:17 -04:00
Brad King
3256ecb7b9
Merge topic 'Cuda_WRAP_SRCS_duplicates'
...
32b582d FindCUDA: Remove duplicate entries from INCLUDE_DIRECTORIES.
2013-05-16 14:37:13 -04:00
Brad King
8ec007083e
Merge topic 'ninja_add_custom_command_windows'
...
e7c58f6 Ninja: use cd /D to set directory on Windows
2013-05-16 14:37:09 -04:00
Brad King
e778522161
Merge topic 'cuda_compute_build_path'
...
cd2d248 FindCUDA: CUDA_COMPUTE_BUILD_PATH uses relative paths to binary dir.
2013-05-16 14:37:05 -04:00
Brad King
d04e765d76
Merge topic 'OpenGL-require-includes'
...
5be3593 FindOpenGL: require headers to be found on non-Windows platforms (#13746 )
b10a171 FindOpenGL: simplify OS selection code
2013-05-16 14:36:59 -04:00
Brad King
d86d0e622a
Merge topic 'xcode-explicitFileType'
...
5683146 Xcode: Use explicitFileType to mark source types (#14093 )
2013-05-16 14:36:54 -04:00
Brad King
7a198773f3
Merge topic 'improve-get_filename_component-names'
...
7d1590e get_filename_component: Add DIRECTORY option (#14091 )
ec1ba9b get_filename_component: Add explicit unit tests
2013-05-16 14:36:49 -04:00
Brad King
3a0014a1fe
Merge topic 'AddIARToolchain2'
...
d118b8b Add IAR to the CMakeDetectC(XX)CompilerID.c(pp).in
d33f406 Add regexps for the IAR toolchain to the vendor list.
22fb73a Add support files for C, C++ and ASM for the IAR toolchain.
2013-05-16 14:36:44 -04:00
Brad King
0d217e64d0
Merge topic 'CrossCompilingFix13796'
...
efb19b6 CMakeSystem: include toolchain file after setting CMAKE_HOST_ (#13796 )
2013-05-16 14:36:39 -04:00
Brad King
5c2084b74b
Merge topic 'fix-comment-typos'
...
8e0da4c Fix some copyastos in the DetermineRCCompiler file.
2013-05-16 14:36:31 -04:00
Brad King
e1178478b7
Merge topic 'msbuild-targets-in-subdirs'
...
ac9a5f4 ctest_build: Pass projectDir to GenerateBuildCommand
a6c0299 CTest: Simplify ctest_* command source/build dir lookup
1ca9318 VS: Add test for building MSBuild project in subdir
3cd4000 VS: Use .sln parser to build targets in subdirs with msbuild (#13623 )
df035e4 VS: Create parser for Visual Studio .sln files
de8be9e Add projectDir parameter to GenerateBuildCommand
2013-05-16 14:36:27 -04:00
Brad King
5386aaecd4
Merge topic 'FindOpenSSL-cross-compiling'
...
1b614e0 FindOpenSSL: Fix spelling of CMAKE_CROSSCOMPILING (#14075 )
2013-05-16 14:36:23 -04:00
Brad King
9cdb5c0b54
Merge topic 'vs10-preprocessor-semicolons'
...
4e4688e VS 10: Escape ; as %3B in preprocessor definitions (#14073 )
2013-05-16 14:36:19 -04:00
Brad King
1b4b64cd3c
Merge topic 'vs-no-compiler-pdb-setting'
...
87c0d16 Ninja: Fix OBJECT_DIR placeholder path conversion
fb9f73d MSVC: Invoke 'link' directly for executables
42ba1b0 VS: Separate compiler and linker PDB files (#11899 , #14062 )
2013-05-16 14:36:11 -04:00
Brad King
7e7b7fe4b3
Merge topic 'CPackRPM-avoidOwningSystemDirs'
...
f055c99 CPackRPM add /usr/lib64 to the list of builtin to-be-excluded path
bac5772 CPackRPM add mechanism to remove path from generated list of file in RPM spec.
2013-05-16 14:36:00 -04:00
Brad King
e392520309
Merge topic 'CPackRPM-componentizedUserSpecFile'
...
2ef908f Add support for componentized USER spec file
2013-05-16 14:35:55 -04:00
Brad King
6c74306ad3
Merge topic 'cygwin_fd_setsize'
...
875eb8e CTest: Add test for running many tests in parallel
2013-05-16 14:35:49 -04:00
Stephen Kelly
88308bc2f2
Test that linking using the debug keyword to tll works.
2013-05-16 14:31:00 -04:00
Brad King
272431a84f
Begin post-2.8.11 development
2013-05-16 12:44:26 -04:00
Robert Maynard
0ad0c37206
CMake 2.8.11
2013-05-15 11:17:10 -04:00
Robert Maynard
62e5c2f45c
Merge branch 'release'
2013-05-15 11:14:41 -04:00
Kitware Robot
5dd8c01429
CMake Nightly Date Stamp
2013-05-15 00:01:03 -04:00
Kitware Robot
26ad32031c
CMake Nightly Date Stamp
2013-05-14 00:01:03 -04:00
Kitware Robot
a3f106dedf
CMake Nightly Date Stamp
2013-05-13 00:01:02 -04:00
Kitware Robot
90dad912f8
CMake Nightly Date Stamp
2013-05-12 00:01:03 -04:00
Rolf Eike Beer
74228e8486
Doc: fix example for FAIL_REGULAR_EXPRESSION
...
The example used PASS_REGULAR_EXPRESSION instead of FAIL...
2013-05-11 12:02:05 +02:00
Kitware Robot
1c575ab72f
CMake Nightly Date Stamp
2013-05-11 00:01:06 -04:00
Rolf Eike Beer
e319e32b8c
CTest: make sure never to report negative test times ( #14132 )
...
Because of clock scew between processors or just because of someone changing
the system time the end timestamp may be before the start time. Reporting a
negative time doesn't any sense, just report zero there as it already happens
for really fast tests.
2013-05-10 20:50:22 +02:00
Kitware Robot
a3e7c94fd7
CMake Nightly Date Stamp
2013-05-10 00:01:03 -04:00
Kitware Robot
cf4869ba08
CMake Nightly Date Stamp
2013-05-09 00:01:03 -04:00
Gregoire Lejeune
778aacc864
Allow using Java in a cross-compilation toolchain
...
Since Java is a portable language, if you want to use Java when
cross-compiling, UseJava uses the JVM installed on the host. So in this
case, we must use set CMAKE_JAVA_INCLUDE_FLAG_SEP for the current host.
2013-05-08 11:45:34 -04:00
Alexander Mohr
e4c046521f
VS: Detect MSVC compiler id on ARM toolchain
...
This enables detection with the VS2012 CTP for windows Blue (8.1).
To build native ARM you need to have the WOA SDK (Windows on ARM).
2013-05-08 09:10:52 -04:00
Kitware Robot
619fa2cce8
CMake Nightly Date Stamp
2013-05-08 00:01:03 -04:00
Robert Maynard
6162e0ff2d
CMake 2.8.11-rc4
2013-05-07 11:56:31 -04:00
Robert Maynard
b882ef7565
Merge branch 'release'
2013-05-07 11:33:14 -04:00
Andreas Mohr
7cc2805cd6
Docs: Clarify wording "flag used" => "flag (to|will) be used"
...
The phrase "flag used" is somewhat imprecise, so extend it to stress
intentions.
Also correct:
- "Flag" => "Flags"
- "[CMAKE_BUILD_TYPE]" => "<CONFIG>"
2013-05-07 08:42:21 -04:00