Commit Graph

17179 Commits

Author SHA1 Message Date
Brad King 1ac8523c3b Merge topic 'install-EXPORT-absolute-prefix'
dd089e08 install: Allow absolute EXPORT destination with relative targets (#15258)
2014-12-19 08:26:55 -05:00
Kitware Robot d48ccbe458 CMake Nightly Date Stamp 2014-12-19 00:01:09 -05:00
Brad King cd7bde80bf Merge topic 'update-kwsys'
3470704f Merge branch 'upstream-kwsys' into update-kwsys
6a5ab894 KWSys 2014-12-16 (cc4046a8)
2014-12-18 10:16:42 -05:00
Brad King 45b1e31451 Merge topic 'vs-nsight-tegra-min-api'
eeaa25e5 Add 'ANDROID_API_MIN' target property to set Android Target MIN API
2014-12-18 10:16:40 -05:00
Brad King a39e65a817 Merge topic 'fix-sha2-cast-constness'
d4d2d72f sha2: Fix -Wcast-qual warnings by adding const to some casts
2014-12-18 10:16:38 -05:00
Kitware Robot 2a45da6ea4 CMake Nightly Date Stamp 2014-12-18 00:01:20 -05:00
Brad King 3470704f5a Merge branch 'upstream-kwsys' into update-kwsys 2014-12-17 15:00:39 -05:00
Brad King 9c7c6e434a Merge topic 'ctest_memcheck-no-empty-BC-output'
1c812979 ctest_memcheck: Do not open empty BC output file name
2014-12-17 14:54:14 -05:00
Brad King f408667d19 Merge topic 'fix_coverage_scanbuild_errors'
0622f92d CTest: Remove code to fix scanbuild errors
2014-12-17 14:44:19 -05:00
Sean McBride d4d2d72f5d sha2: Fix -Wcast-qual warnings by adding const to some casts 2014-12-17 13:53:04 -05:00
Dmitry Polyanitsa eeaa25e521 Add 'ANDROID_API_MIN' target property to set Android Target MIN API
Also add a 'CMAKE_ANDROID_API_MIN' variable to set the property
default.  Teach the VS generator to write the MIN API value into
Nsight Tegra project files.
2014-12-17 11:17:28 -05:00
Kitware Robot ddd193fcdd CMake Nightly Date Stamp 2014-12-17 00:01:08 -05:00
Brad King 1c8129795a ctest_memcheck: Do not open empty BC output file name
In cmCTestMemCheckHandler::PostProcessBoundsCheckerTest return early
if the output file name is empty.  We already do this in the similar
cmCTestMemCheckHandler::AppendMemTesterOutput method.
2014-12-16 13:49:38 -05:00
Kitware Robot f30bac5eb4 CMake Nightly Date Stamp 2014-12-16 00:01:09 -05:00
Joseph Snyder 0622f92d23 CTest: Remove code to fix scanbuild errors
Remove code from cmParseBlanketJSCoverage.cxx and
cmParseDelphiCoverage.cxx which caused scanbuild errors
about not reading the value that was stored.
2014-12-15 12:48:08 -05:00
Brad King dd089e08b5 install: Allow absolute EXPORT destination with relative targets (#15258)
When install(EXPORT) is given an absolute destination we cannot compute
the install prefix relative to the installed export file location.
Previously we disallowed installation of targets in such exports with a
relative destination, but did not enforce this for target property
values besides the location of the main target file.  This could lead to
broken installations when the EXPORT is installed to an absolute path
but usage requirements are specified relative to the install prefix.

Since an EXPORT installed to an absolute destination cannot be relocated
we can just hard-code the value of CMAKE_INSTALL_PREFIX as the base for
relative paths.  This will allow absolute install(EXPORT) destinations
to work with relative destinations for targets and usage requirements.

Extend the ExportImport test with a case covering this behavior.
2014-12-15 11:45:49 -05:00
Brad King 872ad7a26d Merge topic 'assert-no-string-conversion'
2e92570b Fix some Clang -Wstring-conversion warnings
2014-12-15 11:06:49 -05:00
Brad King 6da3f17309 Merge topic 'suncc-fixes'
97b65f81 Misc. fixes for the Oracle / Sun compiler.
2014-12-15 11:06:44 -05:00
Kitware Robot bbabb9d810 CMake Nightly Date Stamp 2014-12-15 00:01:07 -05:00
Kitware Robot 18817e07d6 CMake Nightly Date Stamp 2014-12-14 00:01:08 -05:00
Kitware Robot fef31f1f21 CMake Nightly Date Stamp 2014-12-13 00:01:30 -05:00
Sean McBride 2e92570bda Fix some Clang -Wstring-conversion warnings
Some false positives, but some flagged faulty asserts
where the ! was inside the string instead of outside.
2014-12-12 14:38:23 -05:00
Brad King 9f41c45f43 Merge topic 'catch-ctest-errors-better'
d8589e64 ctest: count errors from scripts properly
2014-12-12 11:16:04 -05:00
Brad King 9c4ef206c7 Merge topic 'drop-double-underscores'
111be180 Rename header guards to not start with double underscore
2014-12-12 11:16:00 -05:00
Chuck Atkins 97b65f8156 Misc. fixes for the Oracle / Sun compiler.
A few pieces of code have some ambiguous type deduction that seems to
resolve correctly for most compilers but not for the Oracle compiler.
This makes those few instances more explicit.
2014-12-12 10:04:47 -05:00
Kitware Robot 17f638a4c9 CMake Nightly Date Stamp 2014-12-12 00:01:09 -05:00
Sean McBride 111be1801f Rename header guards to not start with double underscore
Use regex to find/replace:

__(cm.*_h)
\1

Then fix QCMake.h by hand.
2014-12-11 13:53:06 -05:00
Kitware Robot 3171fe0afa CMake Nightly Date Stamp 2014-12-11 00:01:07 -05:00
Ben Boeckel d8589e6437 ctest: count errors from scripts properly
In the unlikely event that someone has a billion+ scripts (or some
codepath returns negative numbers), we could overflow and make a pile of
errors a non-error. This change also allows us to use flags for the
error in the future rather than just "something went wrong".
2014-12-10 17:22:21 -05:00
Kitware Robot a7d8345d8c CMake Nightly Date Stamp 2014-12-10 00:01:08 -05:00
Brad King 3b9477231d Merge topic 'find_library-updated-directory-content'
ce331bab find_library: Fix repeat call after changing directory content (#15293)
2014-12-09 10:54:54 -05:00
Kitware Robot 2372cdaa3a CMake Nightly Date Stamp 2014-12-09 00:01:08 -05:00
Brad King ce331bab92 find_library: Fix repeat call after changing directory content (#15293)
We use cmGlobalGenerator::GetDirectoryContent to avoid repeating
directory listings.  However, GetDirectoryContent loads content from
disk at most once.  This breaks find_library calls that occur when disk
content has changed since preceding find_library calls.

Teach cmGlobalGenerator::GetDirectoryContent to save the directory
modification time when content is loaded and re-load content if it
changes.

Create a RunCMake.find_library test with a case covering this.
2014-12-08 15:35:50 -05:00
Brad King e72987dc11 Merge topic 'custom-command-multiple-outputs'
6c67b816 Makefile: Workaround Borland Make bug with multiple outputs
65ea5eb7 Tests: Cover rebuild with multiple custom command outputs (#15116)
644b4688 Makefile: Fix rebuild with multiple custom command outputs (#15116)
8a4c6d2d Xcode: Fix rebuild with multiple custom command outputs (#15116)
2014-12-08 09:07:18 -05:00
Brad King 47c41d902c Merge topic 'file-LOCK-timeout-type'
97841dad file: Use 'long' to represent the parsed LOCK TIMEOUT value
2014-12-08 09:07:14 -05:00
Brad King 79d1e1347a Merge topic 'ctest-binary-pipe'
29b0c8c3 ctest --launch: write to cout and cerr in binary
2014-12-08 09:07:12 -05:00
Brad King b61994d0a7 Merge topic 'vs-inherit-wd'
f545eb0b VS: Inherit target-level "-wd" flags in source files (#15284)
2014-12-08 09:07:08 -05:00
Brad King 90070a65d2 Merge topic 'try_compile-link-flags'
88eb5824 try_compile: Pass linker flags into test project (#14066)
a4f9b6f0 CMakeDetermineCompilerABI: Use normal linker flags in ABI project
2014-12-08 09:07:04 -05:00
Kitware Robot cfe666f1a2 CMake Nightly Date Stamp 2014-12-08 00:01:08 -05:00
Kitware Robot 9e6e6801d0 CMake Nightly Date Stamp 2014-12-07 00:01:16 -05:00
Brad King 6c67b8168c Makefile: Workaround Borland Make bug with multiple outputs
Given a rule of the form

  out1 out2: dep1
  out1 out2: dep2

Borland Make complains that there are multiple rules for "out1"
even though this works when there is only one output.  Instead
generate

  out1 out2: dep1 dep2

for Borland Make, but only when there are multiple outputs.
2014-12-06 07:36:52 -05:00
Kitware Robot bec5b3df01 CMake Nightly Date Stamp 2014-12-06 00:01:15 -05:00
Ruslan Baratov 97841dad2b file: Use 'long' to represent the parsed LOCK TIMEOUT value
Convert the StringToInt helper into a StringToLong helper with a 'long'
result type.  This will make the helper more useful to other callers
that want to use strtol.

While at it, also check errno after calling strtol in case the
conversion fails with a range error.
2014-12-05 12:59:37 -05:00
Ben Boeckel 29b0c8c360 ctest --launch: write to cout and cerr in binary
Because ctest reads in binary but writes in text mode, Windows' newline
transformation can be applied multiple times causing '\n' in the source
application to be written out as '\r\r\n' instead.
2014-12-05 12:47:18 -05:00
Brad King 644b4688d7 Makefile: Fix rebuild with multiple custom command outputs (#15116)
Fix the generated makefiles for custom commands with multiple outputs to
list all the outputs on the left hand side of the build rule.  This is
much simpler and more reliable than the old multiple-output-pair
infrastructure.
2014-12-05 09:55:49 -05:00
Brad King 8a4c6d2d2e Xcode: Fix rebuild with multiple custom command outputs (#15116)
The Xcode generator uses Makefiles under a run-script build-phase to
drive custom commands.  Fix the generated makefiles for custom commands
with multiple outputs to list all the outputs on the left hand side of
the build rule.  This is much simpler and more reliable than the old
multiple-output-pair infrastructure.
2014-12-05 09:52:09 -05:00
Kitware Robot c90633df9e CMake Nightly Date Stamp 2014-12-05 00:01:15 -05:00
Brad King f545eb0b0b VS: Inherit target-level "-wd" flags in source files (#15284)
If a source file COMPILE_FLAGS option adds "-wd", the .vcxproj file
will have a DisableSpecificWarnings setting for the source file.
Add to the setting a reference to %(DisableSpecificWarnings) to
inherit any such flags set for the whole target.
2014-12-04 15:40:04 -05:00
Brad King c7bd275393 Merge topic 'cached-regex-clear-fixed'
ceecd790 cmMakefile: store the number of last matches in a CMake var
7878d061 test: add a test for clearing regex results
2014-12-04 10:23:26 -05:00
Brad King e4665171f4 Merge topic 'fix-add_library-check-for-shared'
bd360ee3 add_library: Fix target type check for non-shared-lib platforms
2014-12-04 10:23:24 -05:00