Brad King
358be9b320
Merge topic 'generate-qch-doc'
...
85582d14
Help: Add option to create and install Qt .qch file.
2014-04-01 11:06:21 -04:00
Brad King
780f81b9e7
Merge topic 'simplify-ninja-linker-command'
...
2b896752
Ninja: Simplify code for linker commands
2014-04-01 11:06:19 -04:00
Brad King
f70b2253f6
Merge topic 'fix_policy_diagnostics'
...
77b581c2
Policies: omit warnings about unset policies when they are actually set to NEW
2014-04-01 11:06:17 -04:00
Brad King
242e13bfe6
Merge topic 'clang-warnings'
...
8c9c4fe1
Remove 'return' statements that can never be reached
50ca77f4
create_test_sourcelist: Initialize variable at declaration
2014-04-01 11:06:15 -04:00
Brad King
a5a6d53782
Merge topic 'cmake-gui-symlinks'
...
480be00b
cmake-gui: Don't resolve symlinks with using file dialog.
2014-04-01 11:06:14 -04:00
Brad King
ce9ffd6b23
Merge topic 'find_package-check-quiet'
...
83934757
Find*: Make find_package(.. QUIET) affect Check* modules.
4c0cc9ab
Check*.cmake : Add CMAKE_REQUIRED_QUIET flag.
2014-04-01 11:06:12 -04:00
Brad King
8617de566f
Merge topic 'hpux-processorcount'
...
c3e238dd
ProcessorCount: use mpsched on HPUX if machinfo is not present
2014-04-01 11:06:11 -04:00
Brad King
05d3570cf5
Merge topic 'ExternalProject_GitUpdate'
...
f2128d4c
ExternalProject: Improve handling of git remote branches
ff2451dc
ExternalProject: Strip trailing space from git hash
2014-04-01 11:06:09 -04:00
Brad King
382c9ee859
Merge topic 'link-line-quoting'
...
423009c1
Makefile: Generate single-quoted object lists for Watcom
a863a8fe
cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath
2014-04-01 11:06:08 -04:00
Brad King
09498984b1
Merge topic 'UseSWIG-NO_SONAME'
...
f26147b8
UseSWIG: Enable NO_SONAME on swig modules (#14815 )
2014-04-01 11:06:06 -04:00
Jiri Malak
2b89675256
Ninja: Simplify code for linker commands
...
Use GetCreateRuleVariable function instead of redundant code for Rule
variable name. Use temporary variables to improve code.
2014-04-01 10:58:58 -04:00
Daniele E. Domenichelli
f2128d4c28
ExternalProject: Improve handling of git remote branches
...
ExternalProject handles git remote branches by commit hash. Due to
this, the git repository ends in detached states, and local commits
are discarded.
Use "git rebase" for remote branches instead of "git checkout". If
there are uncommitted changes, use "git stash save/pop" to save changes
and restore them after the rebase. If any of these operations fails,
try to restore the original status and exit with a fatal error, asking
the user to resolve the conflicts manually.
This also makes the behaviour of ExternalProject using git more similar
to the svn version, and probably more likely to what the user expects
by setting GIT_TAG to a branch.
2014-04-01 10:51:58 -04:00
Daniele E. Domenichelli
ff2451dc24
ExternalProject: Strip trailing space from git hash
2014-04-01 10:51:53 -04:00
Julien Schueller
f26147b871
UseSWIG: Enable NO_SONAME on swig modules ( #14815 )
...
Swig modules are plugins and do not need the SONAME field set.
2014-04-01 10:48:13 -04:00
Jack Morrison
2e2939c365
FindGTest: Teach GTEST_ADD_TESTS about TEST_P
...
Previously the GTEST_ADD_TESTS function would miss parameterized tests
because it only considered TEST and TEST_F. Add TEST_P to the list of
considered tests and will run all instantiations of this parameterized
test together.
This is perhaps not as correct as searching for all instantiations of
this parameterized test and separating those into separate runs, but
this will at least run tests that were previously missing.
For reference: https://code.google.com/p/googletest/wiki/Documentation
2014-04-01 09:48:20 -04:00
Brad King
065166cf76
CTestCustom: Suppress Clang "will never be executed" warnings in lexers
...
Clang -Wunreachable-code-return warns on some generated lexer code.
2014-04-01 08:58:23 -04:00
Kitware Robot
e3e1ba3f78
CMake Nightly Date Stamp
2014-04-01 00:01:05 -04:00
Stephen Kelly
85582d14fe
Help: Add option to create and install Qt .qch file.
2014-03-31 23:55:08 +02:00
Stephen Kelly
857d30b52e
cmGlobalGenerator: Add interface to call ForceLinkerLanguages
...
Avoid calling it too early when cmGeneratorTarget instances don't
yet exist.
2014-03-31 23:18:44 +02:00
Stephen Kelly
28e1d2f8fc
cmStringCommand: Add GENEX_STRIP subcommand.
...
Strip out any generator expressions in the input string.
2014-03-31 23:18:44 +02:00
Stephen Kelly
bf98cc252f
Genex: Evaluate TARGET_OBJECTS as a normal expression.
2014-03-31 23:18:44 +02:00
Stephen Kelly
8cd113ad1d
cmTarget: Store strings instead of cmSourceFile* to represent SOURCES.
...
This will allow the strings to contain generator expressions.
At this point, generator expressions are still not part of the
SOURCES property when it is read.
2014-03-31 23:18:44 +02:00
Stephen Kelly
4959f3413c
cmSourceFileLocation: Collapse full path for directory comparisons.
...
Otherwise Matches() ends up doing a comparison of
the directories
/path/to/dir/subdir/..
and
/path/to/dir
as strings and not matching where it should.
2014-03-31 23:18:43 +02:00
Stephen Kelly
fcc9287897
cmSourceFileLocation: Remove unused Update method.
...
The string overload is never called. This allows the removal of
the unused UpdateDirectory method.
2014-03-31 23:18:43 +02:00
Stephen Kelly
59e8740aca
cmTarget: Remove AddSourceFile method
...
It is no longer used.
2014-03-31 23:18:43 +02:00
Stephen Kelly
26d494ba01
cmTarget: Use string API to add sources to cmTarget objects.
...
Continue to call GetOrCreateSource where necessary to create
cmSourceFile objects which have the GENERATED attribute set.
2014-03-31 23:18:43 +02:00
Stephen Kelly
d38423ecc4
cmTarget: Add a method to obtain list of filenames for sources.
2014-03-31 23:18:43 +02:00
Stephen Kelly
b1cbba68ce
cmSourceFileLocation: Make copyable and assignable.
...
This allows using it in containers and algorithms.
2014-03-31 23:18:43 +02:00
Stephen Kelly
0ed5ce4cd8
cmTarget: Rename AddSource method for backward compatibility.
...
Add a new AddSource method for future use.
2014-03-31 23:18:43 +02:00
Stephen Kelly
99a9c51f1a
cmTarget: Use GetSourceFiles for languages.
2014-03-31 23:18:43 +02:00
Stephen Kelly
beaa7e0377
cmGeneratorTarget: Compute the object directory early.
...
Ensure it is populated before tracing dependencies.
2014-03-31 23:18:43 +02:00
Nils Gladitz
77b581c2f0
Policies: omit warnings about unset policies when they are actually set to NEW
2014-03-31 09:45:10 -04:00
Sean McBride
8c9c4fe1a6
Remove 'return' statements that can never be reached
...
Clang -Wunreachable-code-return warns otherwise.
2014-03-31 09:41:05 -04:00
Sean McBride
50ca77f4a0
create_test_sourcelist: Initialize variable at declaration
...
Clang -Wconditional-uninitialized warns otherwise.
2014-03-31 09:41:05 -04:00
Kitware Robot
521b930bf4
CMake Nightly Date Stamp
2014-03-31 00:01:05 -04:00
Clinton Stimpson
480be00bfa
cmake-gui: Don't resolve symlinks with using file dialog.
...
This fixes bug #14274 where a clang++ symlink was resolved to
a clang executable.
2014-03-29 22:41:44 -06:00
Kitware Robot
9298987a82
CMake Nightly Date Stamp
2014-03-30 00:01:06 -04:00
Clinton Stimpson
83934757c9
Find*: Make find_package(.. QUIET) affect Check* modules.
...
Fixes issues #14812 and #14813 where find_package(OpenMP QUIET) and
find_package(Qt4 QUIET) would still print out messages when calling
check*() functions.
Also a partial fix for #14445 where building CMake
(without cmake-gui) when Qt5 is installed and Qt4 is not installed
and warnings come out of FindQt4.cmake.
2014-03-29 20:22:54 -06:00
Clinton Stimpson
4c0cc9ab91
Check*.cmake : Add CMAKE_REQUIRED_QUIET flag.
...
Setting this flag can silence messages from the Check*.cmake modules.
This can be used by Find*.cmake modules when they are in silent mode.
2014-03-29 20:14:23 -06:00
Kitware Robot
5bad8ae342
CMake Nightly Date Stamp
2014-03-29 00:01:05 -04:00
Rolf Eike Beer
c3e238dd53
ProcessorCount: use mpsched on HPUX if machinfo is not present
...
Co-Author: Gerhard Grimm <gerhard.grimm@detec.com>
2014-03-28 18:02:49 +01:00
Kitware Robot
cab2e31443
CMake Nightly Date Stamp
2014-03-28 00:01:05 -04:00
Jiri Malak
423009c17f
Makefile: Generate single-quoted object lists for Watcom
...
Drop the CMAKE_NO_QUOTED_OBJECTS internal variable from the Makefile
generators. The underlying problem is with the Watcom linker, not with
WMake. The Watcom linker wants object files to be single-quoted. Add
<LINK-RULE>_USE_WATCOM_QUOTE platform information variables to tell the
generators to use Watcom-style single quotes for object files on link
lines.
On Windows, Watcom uses the GetCommandLine API to get the original
command-line string and do custom parsing that expects single quotes.
On POSIX systems, Watcom approximates the original command line by
joining all argv[] entries separated by a single space. Therefore we
need to double-quote the single-quoted arguments so that the shell does
not consume them and they are available for the parser to see.
2014-03-27 13:45:29 -04:00
Jiri Malak
a863a8fecd
cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath
...
Use one code path whether the components list is empty or not.
Fix indentation accordingly.
2014-03-27 13:45:27 -04:00
Brad King
ede0419a37
Merge topic 'osx-CFBundle-info-plist'
...
90e22f8f
OS X: Fix Info.plist placement in a CFBundle
2014-03-27 11:12:10 -04:00
Brad King
e8451d6426
Merge topic 'threads-cleanup'
...
693f8bf3
FindThreads: simplify checking for SunOS
858ce31f
FindThreads: avoid useless checks if a thread library is already found
fdf7bd27
FindThreads: replace MATCHES with STREQUAL
2014-03-27 11:12:08 -04:00
Brad King
0301e36fcd
Merge topic 'suppress-diagnostic-context-note-warnings'
...
53674755
CTestCustom: Suppress "note: in expansion of macro" diagnostic context
2014-03-27 11:12:07 -04:00
Brad King
c53e82093f
Merge topic 'fix-CTestTestMemcheck-xcode2-missing-dirs'
...
27b81213
Tests/CTestTestMemcheck: Help Xcode 2.x create output dirs
2014-03-27 11:12:05 -04:00
Kitware Robot
e03ac807cf
CMake Nightly Date Stamp
2014-03-27 00:01:18 -04:00
Brad King
27b812132c
Tests/CTestTestMemcheck: Help Xcode 2.x create output dirs
...
Add the PRE_BUILD step to all targets that need it so the output
directories get created no matter which target is built first.
2014-03-26 15:09:56 -04:00