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

20996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rolf Eike Beer
0aed09fd20 Tests: ignore GuardMalloc messages on all Apple build, not just XCode ones 2013-05-23 06:31:47 +02:00
Brad King
4825d70e83 Merge topic 'fix-include_directories-whitespace-handling' 
2f84dfe include_directories: Fix handling of empty or space-only entries
 2013-05-21 15:22:27 -04:00
Stephen Kelly
2f84dfec93 include_directories: Fix handling of empty or space-only entries 
This is a regression introduced in commit 0d46e9a0 (Store includes
from the same include_directories call together., 2013-01-20).

Reported at

 http://thread.gmane.org/gmane.comp.programming.tools.cmake.user/46695/focus=7847
 2013-05-21 15:20:46 -04:00
Brad King
d2cd362c31 Merge topic 'fix-genex-comma-parse' 
05bf972 Fix handling of commas in arbitrary content in genexes.
 2013-05-21 15:19:26 -04:00
Brad King
e41ef3d339 Merge topic 'unused-cleanup' 
994dc70 Remove unused vector population.
44258cc Remove unused typedef.
0a4d7d8 Remove unused marker for a variable which is now used.
 2013-05-21 15:19:22 -04:00
Brad King
bdb0bab8ee Merge topic 'vs-asm-listing-location' 
7e0c45e VS: Allow /Fa to set AssemblerListingLocation (#14153)
 2013-05-21 15:14:19 -04:00
Brad King
1dbf0aac1b Merge topic 'fix-style' 
3c7c332 Fix brace indentation.
c70b9b5 Fix style.
 2013-05-21 15:13:49 -04:00
Brad King
ad2391b94f Merge topic 'implicit-link-sanitize-regex' 
ffda082 Sanitize linker name to parse implicit link line (#14154)
 2013-05-21 15:13:37 -04:00
Brad King
5947d03987 Merge topic 'error-on-exported-missing-include-dir' 
eabefa8 Error on relative path in INCLUDE_DIRECTORIES target property.
 2013-05-21 15:13:26 -04:00
Brad King
484112d045 Merge topic 'fix-build-without-qt4-with-qt5' 
444e752 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
 2013-05-21 15:13:21 -04:00
Brad King
52f9b2e803 Merge topic 'shared-libs-with-number-suffix' 
342fc04 Recognize shared library files with a numerical suffix
 2013-05-21 15:13:10 -04:00
Brad King
02ba802977 Merge topic 'cmake-help-generators-fix' 
dea4d26 Docs: cmake -G selects a "build system" generator
 2013-05-21 15:13:02 -04:00
Brad King
a784e6f9f7 Merge topic 'fix-sublime-source-flags' 
8e94767 Sublime: Honor source-level COMPILE_FLAGS property
 2013-05-21 15:12:58 -04:00
Brad King
f292ffb62c Merge topic 'vs-windows-forms' 
79ec786 VS: Add Windows Forms Support
 2013-05-21 15:12:48 -04:00
Brad King
1a2a0dadda Merge topic 'test-moc-with-empty-COMPILE_DEFINITIONS' 
5c0f2a1 Test the use of target transitive compile definitions with moc.
 2013-05-21 15:12:42 -04:00
Brad King
80f30aa6bf Merge topic 'Automoc-Qt4-Qt5' 
6489015 Remove an endif() followed by an if() for the same condition.
e7813b1 Add a test for Qt5Automoc
27fb96b Make the QtAutomoc test compile with either Qt 4 or Qt 5
 2013-05-21 15:12:35 -04:00
Stephen Kelly
eabefa8b02 Error on relative path in INCLUDE_DIRECTORIES target property. 
Add policy CMP0021 to preserve existing behavior in projects expecting
it from earlier CMake versions.
 2013-05-21 14:59:17 -04:00
Stephen Kelly
444e752294 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4 
The call

 find_package(Qt4 QUIET)

should be non-FATAL in that case. This fixes #14142.
 2013-05-21 14:52:26 -04:00
Stephen Kelly
342fc04010 Recognize shared library files with a numerical suffix 
When processing link line entries we check for matches with known naming
patterns for static and shared libraries.  Teach this logic to recognize
numerical suffixes after shared library names such as "libfoo.so.1".
 2013-05-21 14:50:16 -04:00
Stephen Kelly
dea4d263d3 Docs: cmake -G selects a "build system" generator 
-G is not only for makefile generators.
 2013-05-21 14:43:42 -04:00
Stephen Kelly
8e947670cf Sublime: Honor source-level COMPILE_FLAGS property 
Make the code match the comment.
 2013-05-21 14:42:14 -04:00
Kitware Robot
f206cce2ca CMake Nightly Date Stamp 2013-05-21 00:01:03 -04:00
Stephen Kelly
994dc70bc4 Remove unused vector population. 
The call to GetEnabledLanguages does not have side-effects.
 2013-05-20 17:47:21 +02:00
Brad King
7e0c45e9cf VS: Allow /Fa to set AssemblerListingLocation (#14153) 
Generate the default AssemblerListingLocation through the flag map so
that it can be overridden by a user /Fa flag.  Also teach the VS 7-9
generators to map /Fa to AssemblerListingLocation.

While at it, fix the AssemblerListingLocation default value to have a
trailing slash after the configuration name.  This ensures it will be
treated as a directory and not a file name.
 2013-05-20 08:40:09 -04:00
Kitware Robot
5261fde940 CMake Nightly Date Stamp 2013-05-20 00:01:03 -04:00
Kitware Robot
03071d30fe CMake Nightly Date Stamp 2013-05-19 00:01:03 -04:00
Stephen Kelly
3c7c332929 Fix brace indentation. 2013-05-18 09:54:50 +02:00
Kitware Robot
cd82e3f8f5 CMake Nightly Date Stamp 2013-05-18 00:01:04 -04:00
Brad King
ffda082e65 Sanitize linker name to parse implicit link line (#14154) 
Teach CMakeParseImplicitLinkInfo to convert the CMAKE_LINKER file name
to a regular expression that matches only the original name.  Escape
special characters like '+' so they are not treated as regex syntax.
Extend the ImplicitLinkInfoTest to test handling of a CMAKE_LINKER value
with many special characters.
 2013-05-17 08:47:35 -04:00
Stephen Kelly
44258cc26c Remove unused typedef. 2013-05-17 09:01:01 +02:00
Kitware Robot
edeabd18e6 CMake Nightly Date Stamp 2013-05-17 00:01:04 -04:00
Brad King
5e993a2822 Merge topic 'fix-moc-with-empty-COMPILE_DEFINITIONS' 
33ed186 automoc: Read target defines unconditionally
 2013-05-16 14:48:01 -04:00
Stephen Kelly
33ed186fce automoc: Read target defines unconditionally 
Commit 429e3699 (Process COMPILE_DEFINITIONS as generator expressions
in QtAutomoc., 2013-01-25) introduced a check for the existence of the
COMPILE_DEFINITIONS property on the target before processing it.

At the time, compile definitions from linked targets were added to the
COMPILE_DEFINITIONS property by target_link_libraries. The way such
transitive compile definitions worked was changed in subsequent
commit a1c4905f (Use the link information as a source of compile
definitions and includes., 2013-02-12), so that the COMPILE_DEFINITIONS
property may be empty, despite the fact that there are definitions
which should be used.
 2013-05-16 14:43:45 -04:00
Brad King
a052a79949 Merge topic 'CTest-less-cd' 
9969bfb CTest: avoid useless changing of directory
 2013-05-16 14:43:44 -04:00
Brad King
86cecd1c6b Merge topic 'cpack-reg-key-doc' 
3fde03c Improve documentation for CPACK_PACKAGE_INSTALL_REGISTRY_KEY.
 2013-05-16 14:38:43 -04:00
Brad King
f122dd3d47 Merge topic 'vs-configurations' 
42bb42d VS: Always initialize CMAKE_CONFIGURATION_TYPES in IDE generators
 2013-05-16 14:38:40 -04:00
Brad King
e477f21af2 Merge topic 'MemChecker-improvements' 
10bc50e Tests: ignore Guard Malloc messages in MemChecker tests
159c3e9 Tests: add a test with custom options passed to valgrind
61ddb93 CTest: fix comment documenting cmBoundsCheckerParser class
cbdfcb0 Tests: add test for non-existent Valgrind suppression file
3b5b758 CTest: drop suppression for gcc 2.9.6 errors from default Valgrind flags
7752253 Tests: verify that memory checker output files are always present
abf1df4 Tests: remove code duplication in CTestTestMemCheck tests
f499422 CTest: remove unreachable code and CTestTestMemcheckUnknown test
dde6306 CTest: use an output file for Valgrind (#14110)
bcc0f3f Tests: create output files for all memory checkers
 2013-05-16 14:38:35 -04:00
Brad King
62a9bdb466 Merge topic 'only-first-output-regex' 
12cf7bc CTest: break after first regex match on output
 2013-05-16 14:38:31 -04:00
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