Brad King
4f129615b3
Merge topic 'UseJava-fix-arg-parse'
...
a21e8df0 UseJava: Fix add_jar argument parsing (#14655 )
2015-03-23 09:18:41 -04:00
Brad King
ed99514fc1
Merge topic 'cpack-bundle-codesign'
...
fb3e4de8 CPack: Add support to overwrite or pass additional parameter to codesign
2015-03-23 09:18:40 -04:00
Brad King
114ddb072c
Merge topic 'autogen-write-access'
...
610464c1 QtAutogen: Ensure write access to AutogenInfo.cmake (#15416 )
2015-03-23 09:18:38 -04:00
Brad King
45583e5272
Merge topic 'cpack-rpm-ignore-default-prefix'
...
18917d66 CPack/RPM ignore install prefix relocation path
2015-03-23 09:18:36 -04:00
Brad King
d0af020713
Merge topic 'SunPro-Fortran-KPIC'
...
3556fb1b SunPro: Add position independent code flag for Fortran compiler
2015-03-23 09:18:34 -04:00
Brad King
88abc78723
Merge topic 'pgi-no-pie'
...
00842df4 PGI: Remove invalid -fPIE flag (#15460 )
2015-03-23 09:18:32 -04:00
Brad King
a37937f7c0
Merge topic 'xcode-xctest'
...
4178cd88 Help: Add notes for topic 'xcode-xctest'
87a4b858 Tests: Add XCTest example to test Frameworks and Cocoa App Bundles
ba14510b OS X: Add FindXCTest module
3714955b OS X: Add handling for XCTest bundles
54a5cdbb Tests: Compute Xcode version for any generator on OS X
2015-03-23 09:18:29 -04:00
Brad King
cc8b8cdc75
Merge topic 'ctest-repeat-until-fail'
...
6bce0276 Help: Add notes for topic 'ctest-repeat-until-fail'
fde70a1b ctest: Add a new --repeat-until-fail option
2015-03-23 09:18:26 -04:00
André Klitzing
fb3e4de8e8
CPack: Add support to overwrite or pass additional parameter to codesign
2015-03-23 09:15:43 -04:00
Brad King
4178cd88fc
Help: Add notes for topic 'xcode-xctest'
2015-03-23 09:12:20 -04:00
Gregor Jasny
87a4b8580c
Tests: Add XCTest example to test Frameworks and Cocoa App Bundles
...
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
2015-03-23 09:12:20 -04:00
Gregor Jasny
ba14510b4e
OS X: Add FindXCTest module
...
Add a module to lookup XCTest Framework and xctest utility.
It also provides APIs for creating 'xctest' targets.
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
2015-03-23 09:12:19 -04:00
Gregor Jasny
3714955b9c
OS X: Add handling for XCTest bundles
...
An XCTest bundle is a CFBundle with a special product-type and bundle
extension. For more information about XCTest visit the Mac Developer
library at:
http://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/testing_with_xcode/
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
2015-03-23 09:12:18 -04:00
Brad King
6bce027662
Help: Add notes for topic 'ctest-repeat-until-fail'
2015-03-23 09:08:22 -04:00
Bill Hoffman
fde70a1b26
ctest: Add a new --repeat-until-fail option
...
This option tells ctest to run each test N times until the test fails or
the N times have run. This is useful for finding random failing tests.
2015-03-23 09:08:22 -04:00
Kitware Robot
d67196d0e8
CMake Nightly Date Stamp
2015-03-23 00:01:03 -04:00
Kitware Robot
aeb9fb9774
CMake Nightly Date Stamp
2015-03-22 00:01:05 -04:00
Kitware Robot
2ec1c0d6e0
CMake Nightly Date Stamp
2015-03-21 00:01:03 -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
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
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
Kitware Robot
486e9f4f49
CMake Nightly Date Stamp
2015-03-19 00:01:03 -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