Brad King
fe3c678778
Help: Link to cmake-properties.7 manual from set_property docs
2015-07-14 14:41:31 -04:00
Brad King
7a40998329
Merge topic 'coverage_no_tests'
...
e6cf1c48
ctest_coverage: Always do coverage for CTEST_EXTRA_COVERAGE_GLOB
2015-07-14 10:34:30 -04:00
Brad King
ead29a4e3d
Merge topic 'refactor-rule-var-includes'
...
c736de7b
Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables
6f94b03c
Place <DEFINES> before <FLAGS> consistently across compilers
2015-07-14 10:34:28 -04:00
Brad King
1b05417e3c
Merge topic 'FindXercesC-versioned-library-2'
...
38ddabb1
FindXercesC: Also search for xerces-c_2 (#15648 )
2015-07-14 10:34:26 -04:00
Brad King
e7251049a4
Merge topic 'factor-out-common-generator'
...
80d75246
cmNinjaTargetGenerator: Restore addition of Fortran format flags
2015-07-14 10:34:24 -04:00
Kitware Robot
860c2055e5
CMake Nightly Date Stamp
2015-07-14 00:01:05 -04:00
Zack Galbreath
e6cf1c489c
ctest_coverage: Always do coverage for CTEST_EXTRA_COVERAGE_GLOB
...
Do not ignore a coverage request if CTEST_EXTRA_COVERAGE_GLOB was
specified. Prior to this change, if no lines of code were covered by
any tests then CTest would neglect to generate a Coverage.xml file.
This change allows us to report uncovered files for a project with no
tests.
2015-07-13 14:17:59 -04:00
Brad King
9efc21e738
Merge branch 'release'
2015-07-13 14:13:46 -04:00
Brad King
c736de7b28
Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables
...
Teach the Makefile and Ninja generators to substitute for an <INCLUDES>
placeholder instead of putting -I in <FLAGS>. Update our values for
CMAKE_<LANG>_COMPILE_OBJECT,
CMAKE_<LANG>_CREATE_ASSEMBLY_SOURCE, and
CMAKE_<LANG>_CREATE_PREPROCESSED_SOURCE
to place <INCLUDES> just before <FLAGS>.
2015-07-13 10:49:46 -04:00
Brad King
6f94b03c97
Place <DEFINES> before <FLAGS> consistently across compilers
...
Update our values for
CMAKE_<LANG>_COMPILE_OBJECT,
CMAKE_<LANG>_CREATE_ASSEMBLY_SOURCE, and
CMAKE_<LANG>_CREATE_PREPROCESSED_SOURCE
to place <DEFINES> before <FLAGS> consistently across supported
compilers. We already do this for most compilers, so update the rest
for consistency.
2015-07-13 10:49:46 -04:00
Brad King
80d75246d4
cmNinjaTargetGenerator: Restore addition of Fortran format flags
...
Restore call to AppendFortranFormatFlags accidentally dropped by
commit 0837538e
(cmCommonTargetGenerator: Adopt GetFlags method,
2015-07-09). It was added originally by commit 6a56740e
(cmNinjaTargetGenerator: Add Fortran flag generation, 2015-07-09).
2015-07-13 09:54:33 -04:00
Brad King
8c9c9aa07f
CMake 3.3.0-rc4
2015-07-13 09:20:37 -04:00
Brad King
179aa0bb0a
Merge branch 'release'
2015-07-13 09:19:17 -04:00
Brad King
e30fe3eba2
Merge topic 'fix-command-rename'
...
d4f032b5
cmState: Restore renamed commands on cleanup.
2015-07-13 09:17:46 -04:00
Brad King
93bd154075
Merge topic 'FindMPI-Intel-5'
...
cfd23d3f
FindMPI: Extend Intel-MPI 5+ workaround for recent GCCs
2015-07-13 09:17:44 -04:00
Brad King
fdfa89d9f5
Merge topic 'update-prebuilt-openssl'
...
fbd7fd0f
Utilities/Release: Update to openssl-1.0.2d
2015-07-13 09:17:42 -04:00
Brad King
b3a405badd
Merge branch 'fix-command-rename' into release
2015-07-13 08:51:06 -04:00
Brad King
13f5f066ff
Merge branch 'FindMPI-Intel-5' into release
2015-07-13 08:51:00 -04:00
Roger Leigh
38ddabb194
FindXercesC: Also search for xerces-c_2 ( #15648 )
...
This is the previous stable release name used on Windows.
2015-07-13 12:00:33 +01:00
Kitware Robot
c8f46af11b
CMake Nightly Date Stamp
2015-07-13 00:01:05 -04:00
Stephen Kelly
d4f032b546
cmState: Restore renamed commands on cleanup.
...
Commit v3.3.0-rc1~196^2~7 (cmake: Simplify command clean up
loop., 2015-04-12) introduced a bug that built-in commands which
were renamed no longer had their original name restored when
cleanup is performed between configure runs. Check for that
and restore the commands with their original name.
Extend the complex test for this. That test is run by ctest with
the --build-two-config command line option.
2015-07-12 10:09:54 +02:00
Kitware Robot
e3f5e5d5b4
CMake Nightly Date Stamp
2015-07-12 00:01:04 -04:00
Kitware Robot
b1e43a5647
CMake Nightly Date Stamp
2015-07-11 00:01:05 -04:00
Brad King
fbd7fd0f84
Utilities/Release: Update to openssl-1.0.2d
...
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
2015-07-10 14:02:05 -04:00
Brad King
704e624f19
Merge topic 'update-kwsys'
...
f0cd7324
Merge branch 'upstream-kwsys' into update-kwsys
abeee541
KWSys 2015-07-08 (d3ba91e1)
2015-07-10 09:02:37 -04:00
Brad King
f0cd7324b6
Merge branch 'upstream-kwsys' into update-kwsys
2015-07-10 09:02:02 -04:00
KWSys Robot
abeee54113
KWSys 2015-07-08 (d3ba91e1)
...
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ d3ba91e1 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 8504e845..d3ba91e1
Brad King (1):
d3ba91e1 System: Drop Shell_* APIs
2015-07-10 09:01:49 -04:00
Sean Brennan
cfd23d3f1f
FindMPI: Extend Intel-MPI 5+ workaround for recent GCCs
...
Extend the workaround added by commit v3.2.0-rc1~278^2 (FindMPI:
Workaround Intel MPI 5.0.1 exit code problem, 2014-12-04) with an
additional/alternate keyword to recognize the case with recent GCCs.
2015-07-10 08:55:39 -04:00
Brad King
92b3bd50fe
Merge topic 'autorcc-qt-5.1'
...
9a271e13
cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644 )
2015-07-10 08:51:24 -04:00
Brad King
1dd96df94d
Merge topic 'OUTPUT_NAME-genex'
...
809159c9
Add generator expression support to OUTPUT_NAME target property
9a1ef0dc
Help: Improve OUTPUT_NAME documentation formatting
2015-07-10 08:51:21 -04:00
Brad King
42d0420649
Merge topic 'factor-out-common-generator'
...
fed5eb5b
cmNinjaTargetGenerator: Use GetDefines method
eacacacd
cmCommonTargetGenerator: Adopt GetDefines method
0837538e
cmCommonTargetGenerator: Adopt GetFlags method
f4875bbd
cmNinjaTargetGenerator: Add OX X framework flags
7891f5d7
cmMakefileTargetGenerator: Fix comment typo
73bfad72
cmNinjaTargetGenerator: Factor out AddIncludeFlags helper
6a56740e
cmNinjaTargetGenerator: Add Fortran flag generation
058074d4
cmCommonTargetGenerator: Adopt GetFrameworkFlags
ab824018
cmCommonTargetGenerator: Adopt AppendFortranFormatFlags
0b22c0b8
cmCommonTargetGenerator: Adopt AddFortranFlags and friends
b2f51aef
cmCommonTargetGenerator: Adopt Convert method
cdb5b657
cmCommonTargetGenerator: Adopt ModuleDefinitionFile member
beee7937
cmCommonTargetGenerator: Adopt GetFeature and friends
abfa5f2d
cmCommonTargetGenerator: Adopt ConfigName member
9d41f6d8
cmLocalCommonGenerator: Adopt ConfigName member
a4a2518d
cmLocalUnixMakefileGenerator3: Provide GetConfigName() accessor
...
2015-07-10 08:51:19 -04:00
Brad King
4b486ccb1b
Merge topic 'move-command-line-escape-code'
...
df97bea2
cmOutputConverter: Adopt command line escaping code
bb7eefe4
cmOutputConverter: Adopt EscapeWindowsShellArgument method
cedd6e65
cmLocalVisualStudio7Generator: Remove unused include
30faf20c
cmLocalGenerator: Remove unused include
2015-07-10 08:51:14 -04:00
Brad King
ef39edc303
Merge topic 'FindIce-imported-targets'
...
889b22e2
Help: Add notes for topic 'FindIce-imported-targets'
cd4d2e9c
FindIce: document imported targets
748f1eae
FindIce: create imported targets for components
2015-07-10 08:51:12 -04:00
Brad King
2ffa8ae29c
Merge topic 'compiler-feature-AppleClang-std-flags'
...
228643af
AppleClang: Use modern C++14 standard flags for Apple Clang 6.1
2015-07-10 08:51:09 -04:00
Kitware Robot
9f9d26465f
CMake Nightly Date Stamp
2015-07-10 00:01:06 -04:00
Brad King
9a271e1323
cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 ( #15644 )
...
In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their
input changes, 2014-09-17) we added use of the rcc "--list" option.
Prior to Qt 5.2 this option was called just "-list", and the older name
is still supported by the newer tools. Use the older name of the option
for compatibility with Qt 5.0 and 5.1.
2015-07-09 13:02:07 -04:00
Robert Goulet
809159c9b7
Add generator expression support to OUTPUT_NAME target property
2015-07-09 11:48:10 -04:00
Brad King
9a1ef0dcfd
Help: Improve OUTPUT_NAME documentation formatting
...
Also link to its variants.
2015-07-09 11:28:52 -04:00
Brad King
fed5eb5b0e
cmNinjaTargetGenerator: Use GetDefines method
...
Simplify the per-source ComputeDefines implementation by getting
target-wide defines from GetDefines. Technically this changes behavior
by no-longer de-duplicating/sorting defines from both the target and the
source, but this makes it consistent with the Makefile generator. It
may also later help move target-wide defines into per-target compilation
rules.
2015-07-09 10:15:08 -04:00
Brad King
eacacacdce
cmCommonTargetGenerator: Adopt GetDefines method
...
Move the member up from cmMakefileTargetGenerator so it can be re-used
later by cmNinjaTargetGenerator.
2015-07-09 10:10:25 -04:00
Brad King
0837538e46
cmCommonTargetGenerator: Adopt GetFlags method
...
De-duplicate per-target flag computation in Makefile and Ninja target
generators.
2015-07-09 10:06:24 -04:00
Brad King
f4875bbdd6
cmNinjaTargetGenerator: Add OX X framework flags
...
Teach ComputeFlagsForObject to add -F flags just like the Makefile
generator does.
2015-07-09 10:04:10 -04:00
Brad King
7891f5d7e7
cmMakefileTargetGenerator: Fix comment typo
2015-07-09 10:04:00 -04:00
Brad King
73bfad72d3
cmNinjaTargetGenerator: Factor out AddIncludeFlags helper
...
Factor an AddIncludeFlags method out of ComputeFlagsForObject just like
cmMakefileTargetGenerator has already.
2015-07-09 09:59:25 -04:00
Brad King
6a56740e27
cmNinjaTargetGenerator: Add Fortran flag generation
...
Make ComputeFlagsForObject consistent with the Makefile generator
in regard to Fortran flags.
2015-07-09 09:54:56 -04:00
Brad King
058074d499
cmCommonTargetGenerator: Adopt GetFrameworkFlags
...
Move the member up from cmMakefileTargetGenerator.
2015-07-09 09:50:07 -04:00
Brad King
ab8240189d
cmCommonTargetGenerator: Adopt AppendFortranFormatFlags
...
Move up from cmMakefileTargetGenerator.
2015-07-09 09:50:07 -04:00
Brad King
0b22c0b815
cmCommonTargetGenerator: Adopt AddFortranFlags and friends
...
Move AddFortranFlags, GetFortranModuleDirectory, and supporting members
up from cmMakefileTargetGenerator.
2015-07-09 09:50:07 -04:00
Brad King
b2f51aef0d
cmCommonTargetGenerator: Adopt Convert method
...
Move it up from cmMakefileTargetGenerator.
2015-07-09 09:50:06 -04:00
Brad King
cdb5b65752
cmCommonTargetGenerator: Adopt ModuleDefinitionFile member
...
De-duplicate the ModuleDefinitionFile and AddModuleDefinitionFlag
members from the Makefile and Ninja target generators.
2015-07-09 09:50:06 -04:00