Commit Graph

27669 Commits

Author SHA1 Message Date
Brad King bd9c7f9b2c Ninja: Add policy to require explicit custom command byproducts
Add policy CMP0058 to avoid generating 'phony' ninja rules for unknown
custom command dependencies.  This requires projects to specify their
custom command byproducts explicitly.  With this requirement we no
longer have to assume that unknown custom command dependencies are
generated and can instead simply assume they are source files expected
to exist when the build starts.  This is particularly important in
in-source builds.  It is also helpful for out-of-source builds to allow
Ninja to diagnose missing files before running custom command rules that
depend on them.
2015-03-20 17:40:12 -04:00
Domen Vrankar 18917d66d4 CPack/RPM ignore install prefix relocation path
Patch adds possibility to remove
CPACK_PACKAGING_INSTALL_PREFIX from
the list of relocation paths when
crating a relocatable rpm.
2015-03-20 21:52:49 +01:00
Brad King ed8e30b00d cmGlobalNinjaGenerator: Optimize handling of known build outputs
Teach WriteUnknownExplicitDependencies to take ownership of the set of
WriteBuild outputs immediately since no other methods need the data.
This avoids re-inserting the whole set into another already populated
set.
2015-03-20 13:33:13 -04:00
Brad King ad094f435e cmGlobalNinjaGenerator: Fix spelling of "unknown" 2015-03-20 13:32:55 -04:00
Steven Vancoillie 3556fb1b81 SunPro: Add position independent code flag for Fortran compiler 2015-03-20 13:05:05 -04:00
Brad King 00842df48d PGI: Remove invalid -fPIE flag (#15460)
The PGI compilers on Linux do not have the -fPIE flag.  Remove the table
entry added by commit v2.8.9~125^2~2 (Add platform variables for
position independent code flags, 2012-05-05), which likely included it
only as part of a sweeping introduction of such flags.
2015-03-20 12:59:54 -04:00
Mark Studenka a21e8df0da UseJava: Fix add_jar argument parsing (#14655)
Since commit v2.8.11~63^2 (UseJava.cmake: require explicit request to
include jars, 2013-03-26) the argument parsing always overrides the
variable settings even if the corresponding arguments are not passed.
Re-order logic to fix this.
2015-03-20 10:46:13 -04:00
Justin Borodinsky 610464c12e QtAutogen: Ensure write access to AutogenInfo.cmake (#15416)
ConfigureFile uses the input file permissions, but we require write
access in cmQtAutoGenerators::SetupAutoGenerateTarget to append to the
file.
2015-03-20 10:33:52 -04:00
Stanislav Ionascu f85db2f323 Qbs: Add new 'extra' generator for qbs project files 2015-03-20 10:25:11 -04:00
Brad King c95e523db8 Merge topic 'file-globbing-directory-listing'
6e54b0b9 Help: Add notes for topic 'file-globbing-directory-listing'
a2c068a7 file: Teach GLOB to list directories optionally
2015-03-20 09:47:52 -04:00
Brad King f447027307 Merge topic 'fix-FindPackageHandleStandardArgs-doc'
39451413 FPHSA: Revise documented command signature
2015-03-20 09:47:50 -04:00
Brad King d4d56f636b Merge topic 'update-kwsys'
0e8325db Merge branch 'upstream-kwsys' into update-kwsys
bc67dbed KWSys 2015-03-18 (9367a33b)
2015-03-20 09:47:48 -04:00
Brad King c3f416726b Merge topic 'ninja-no-circular-phony'
80afe28a Ninja: Do not generate circular phony rules (#15454)
2015-03-20 09:47:46 -04:00
Brad King ac7d8684c5 Merge topic 'update-kwiml'
67940795 Merge branch 'upstream-kwiml' into update-kwiml
ded79a97 KWIML: Teach ABI.h about Xtensa architecture
2015-03-20 09:47:43 -04:00
Brad King 4faa4c60ce Merge topic 'cpack_rpm_component_fall_through'
be089724 CPack/RPM prevent component attributes leakage
ffc1b945 CPack/RPM improved component override test
2015-03-20 09:47:39 -04:00
Brad King 543b20f269 Merge topic 'WCDH-fix-cxx_nullptr-workaround'
f9d09626 WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers
2015-03-20 09:47:37 -04:00
Brad King 1b1144b91d Merge topic 'mingw-compile-features'
2aaf4f60 Help: Add notes for topic 'mingw-compile-features'
f94727a9 Record compile features for GNU on Windows (#15443)
2015-03-20 09:47:35 -04:00
Brad King 6e54b0b910 Help: Add notes for topic 'file-globbing-directory-listing' 2015-03-20 09:45:51 -04:00
Domen Vrankar a2c068a7ce file: Teach GLOB to list directories optionally
GLOB lists directories by default and GLOB_RECURSE does not.
LIST_DIRECTORIES enables user to control the behavior explicitly for
consistently for both GLOB and GLOB_RECURSE.
2015-03-20 09:45:25 -04:00
Brad King 2aaf4f6081 Help: Add notes for topic 'mingw-compile-features' 2015-03-20 09:35:59 -04:00
Kitware Robot a066f73263 CMake Nightly Date Stamp 2015-03-20 00:01:03 -04:00
Todd Gamblin 13807bcb41 BlueGene/Q Platform files
- based on the BlueGene/P platform files.
- tested by Todd Gamblin (LLNL) and David DeMarle (Kitware)
2015-03-18 23:40:12 -07:00
Kitware Robot 486e9f4f49 CMake Nightly Date Stamp 2015-03-19 00:01:03 -04:00
Brad King 82a37d3ce5 cmGlobalNinjaGenerator: Drop unused member 2015-03-18 16:15:01 -04:00
Brad King 80afe28a10 Ninja: Do not generate circular phony rules (#15454)
The phony rules added by commit v2.8.12~248^2 (Ninja: Custom Command
file depends don't need to exist before building, 2013-06-07) are
circular, e.g.

  build side-effect: phony side-effect

This is not diagnosed by Ninja as of version 1.5, but the dependency
does not make sense.  Simply drop it and use phony rules of the form

  build side-effect: phony

instead.

Reported-by: Daniel Dunbar
2015-03-18 12:55:27 -04:00
Brad King 54a5cdbb4c Tests: Compute Xcode version for any generator on OS X
Store the version in CMake_TEST_XCODE_VERSION for use by tests that work
with any generator on OS X but may depend on the Xcode version providing
the tools.
2015-03-18 15:23:53 +01:00
Gregor Jasny 394514135e FPHSA: Revise documented command signature
For mode 2 the first argument is not the literal NAME
but the package name.

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
2015-03-18 15:15:44 +01:00
Brad King 0e8325db66 Merge branch 'upstream-kwsys' into update-kwsys 2015-03-18 08:58:11 -04:00
KWSys Robot bc67dbede9 KWSys 2015-03-18 (9367a33b)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ 9367a33b | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 4a698414..9367a33b
Brad King (1):
      20f50727 SystemInformation: Add missing 'break' in StacktraceSignalHandler

Sean McBride (2):
      093eae34 SystemInformation: Fix -Wswitch-enum warnings
      9367a33b testHashSTL: Fix warnings by marking private functions static

Change-Id: Ia4ba110c901698f08797412da5773abf4c4c5330
2015-03-18 08:58:08 -04:00
Kitware Robot 380db3de00 CMake Nightly Date Stamp 2015-03-18 00:01:04 -04:00
Brad King 6794079523 Merge branch 'upstream-kwiml' into update-kwiml 2015-03-17 14:27:27 -04:00
Max Filippov ded79a976e KWIML: Teach ABI.h about Xtensa architecture
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
2015-03-17 14:26:20 -04:00
Roman Wüger f9d0962689 WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers
Use just '0' instead of 'static_cast<void*>(0)' because the latter
will not automatically convert to pointers to other types.
2015-03-17 13:46:43 -04:00
Brad King f94727a9c2 Record compile features for GNU on Windows (#15443)
Drop the 'UNIX' condition on GNU compiler features.

Suggested-by: David Demelier <demelier.david@gmail.com>
2015-03-17 13:32:08 -04:00
Domen Vrankar be089724e9 CPack/RPM prevent component attributes leakage
Fixes mantis bug report with id 15169. Some
component specific attributes were leaking
to next component. Leakage handling was
implemented in different locations but there
were still attributes that leaked. Patch
encapsulates generator into function so all
current leaks are fixed and no future leaks
can occur.
2015-03-17 17:36:36 +01:00
Domen Vrankar ffc1b94510 CPack/RPM improved component override test
Component specific attributes test passed
even when attribute was able to leak to
the next component as library package is
the last that is generated. This patch
fixes the test as header package is generated
in the middle so leakage causes the test to
fail.
2015-03-17 17:36:36 +01:00
Brad King a5cab2e739 Merge topic 'wix-installer-theme'
1bda8f1f CPackWIX: Customize CMake installer theme.
2015-03-17 10:14:56 -04:00
Brad King 0320993456 Merge topic 'cpack_rpm_old_version_tests'
140a53a8 CPack/RPM architecture test fixup
4552bc88 CPack/RPM relocation paths test fixup
2015-03-17 10:14:54 -04:00
Brad King 8915cddcde Merge topic 'FindMatlab-rewrite'
49c8dcf7 FindMatlab: Rewrite module and provide a usage API
2015-03-17 10:14:52 -04:00
Brad King e9072d26c0 Merge topic 'output-ctest-env-vars'
874fdd91 CTest: Output test-specific env vars in verbose mode (#15446)
2015-03-17 10:14:49 -04:00
Zach Mullen 874fdd914a CTest: Output test-specific env vars in verbose mode (#15446)
Any environment vars that were configured for a test via the
ENVIRONMENT property will now be output when the test is run
with verbose logging enabled.
2015-03-17 10:11:33 -04:00
Raffi Enficiaud 49c8dcf7bb FindMatlab: Rewrite module and provide a usage API
Implement a brand new FindMatlab module:

- Add support for versions and components.
- Find Matlab and its version in a more precise and multiplatform way.
- Add API to create a new mex extension with documentation.
- Add API to add matlab unit tests (with or without the unit test framework).
- Find as much as possible based on a single Matlab_ROOT_DIR cache entry
  and allow the user to change it to re-find everything.
2015-03-17 09:47:04 -04:00
Kitware Robot 4fb9abc562 CMake Nightly Date Stamp 2015-03-17 00:01:03 -04:00
Kitware Robot 0ac7d871fa CMake Nightly Date Stamp 2015-03-16 00:01:03 -04:00
Domen Vrankar 140a53a810 CPack/RPM architecture test fixup
Fixed architecture test that was
missing architecture in regular
expressions - bug was detected
on older rpm versions where the
check failed.
Extended architecture test that takes
into account older versions of rpm.
This patch is related to 15442.
2015-03-15 21:08:19 +01:00
Domen Vrankar 4552bc886d CPack/RPM relocation paths test fixup
Patch fixes bug in test reported with
id 15442 - older versions of rpm print
out package info a bit differently so
we should ignore white spaces
2015-03-15 20:37:16 +01:00
Kitware Robot 607131bf8c CMake Nightly Date Stamp 2015-03-15 00:01:03 -04:00
Kitware Robot 262656b2d6 CMake Nightly Date Stamp 2015-03-14 00:01:05 -04:00
Kitware Robot 0769644212 CMake Nightly Date Stamp 2015-03-13 00:01:03 -04:00
Nils Gladitz 1bda8f1fdb CPackWIX: Customize CMake installer theme. 2015-03-12 20:44:27 +01:00