summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'UseJava-fix-arg-parse'Brad King2015-03-231-11/+11
|\ | | | | | | | | a21e8df0 UseJava: Fix add_jar argument parsing (#14655)
| * UseJava: Fix add_jar argument parsing (#14655)Mark Studenka2015-03-201-11/+11
| | | | | | | | | | | | | | 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.
* | Merge topic 'cpack-bundle-codesign'Brad King2015-03-232-3/+16
|\ \ | | | | | | | | | | | | fb3e4de8 CPack: Add support to overwrite or pass additional parameter to codesign
| * | CPack: Add support to overwrite or pass additional parameter to codesignAndré Klitzing2015-03-232-3/+16
| | |
* | | Merge topic 'autogen-write-access'Brad King2015-03-231-0/+14
|\ \ \ | | | | | | | | | | | | | | | | 610464c1 QtAutogen: Ensure write access to AutogenInfo.cmake (#15416)
| * | | QtAutogen: Ensure write access to AutogenInfo.cmake (#15416)Justin Borodinsky2015-03-201-0/+14
| | |/ | |/| | | | | | | | | | | | | ConfigureFile uses the input file permissions, but we require write access in cmQtAutoGenerators::SetupAutoGenerateTarget to append to the file.
* | | Merge topic 'cpack-rpm-ignore-default-prefix'Brad King2015-03-233-4/+25
|\ \ \ | | | | | | | | | | | | | | | | 18917d66 CPack/RPM ignore install prefix relocation path
| * | | CPack/RPM ignore install prefix relocation pathDomen Vrankar2015-03-203-4/+25
| |/ / | | | | | | | | | | | | | | | | | | Patch adds possibility to remove CPACK_PACKAGING_INSTALL_PREFIX from the list of relocation paths when crating a relocatable rpm.
* | | Merge topic 'SunPro-Fortran-KPIC'Brad King2015-03-231-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 3556fb1b SunPro: Add position independent code flag for Fortran compiler
| * | | SunPro: Add position independent code flag for Fortran compilerSteven Vancoillie2015-03-201-0/+1
| |/ /
* | | Merge topic 'pgi-no-pie'Brad King2015-03-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 00842df4 PGI: Remove invalid -fPIE flag (#15460)
| * | | PGI: Remove invalid -fPIE flag (#15460)Brad King2015-03-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'xcode-xctest'Brad King2015-03-2322-3/+1148
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Help: Add notes for topic 'xcode-xctest'Brad King2015-03-231-0/+6
| | | |
| * | | Tests: Add XCTest example to test Frameworks and Cocoa App BundlesGregor Jasny2015-03-2313-0/+890
| | | | | | | | | | | | | | | | Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
| * | | OS X: Add FindXCTest moduleGregor Jasny2015-03-233-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | OS X: Add handling for XCTest bundlesGregor Jasny2015-03-235-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Tests: Compute Xcode version for any generator on OS XBrad King2015-03-181-0/+12
| | |/ | |/| | | | | | | | | | | | | 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.
* | | Merge topic 'ctest-repeat-until-fail'Brad King2015-03-2322-15/+238
|\ \ \ | | | | | | | | | | | | | | | | | | | | 6bce0276 Help: Add notes for topic 'ctest-repeat-until-fail' fde70a1b ctest: Add a new --repeat-until-fail option
| * | | Help: Add notes for topic 'ctest-repeat-until-fail'Brad King2015-03-231-0/+5
| | | |
| * | | ctest: Add a new --repeat-until-fail optionBill Hoffman2015-03-2321-15/+233
| | | | | | | | | | | | | | | | | | | | 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.
* | | | CMake Nightly Date StampKitware Robot2015-03-231-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-03-221-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-03-211-1/+1
| |_|/ |/| |
* | | Merge topic 'file-globbing-directory-listing'Brad King2015-03-2016-6/+201
|\ \ \ | | | | | | | | | | | | | | | | | | | | 6e54b0b9 Help: Add notes for topic 'file-globbing-directory-listing' a2c068a7 file: Teach GLOB to list directories optionally
| * | | Help: Add notes for topic 'file-globbing-directory-listing'Brad King2015-03-201-0/+6
| | | |
| * | | file: Teach GLOB to list directories optionallyDomen Vrankar2015-03-2015-6/+195
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'fix-FindPackageHandleStandardArgs-doc'Brad King2015-03-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 39451413 FPHSA: Revise documented command signature
| * | | | FPHSA: Revise documented command signatureGregor Jasny2015-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mode 2 the first argument is not the literal NAME but the package name. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | Merge topic 'update-kwsys'Brad King2015-03-202-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e8325db Merge branch 'upstream-kwsys' into update-kwsys bc67dbed KWSys 2015-03-18 (9367a33b)
| * \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-03-182-2/+10
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | KWSys 2015-03-18 (9367a33b)KWSys Robot2015-03-182-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'ninja-no-circular-phony'Brad King2015-03-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80afe28a Ninja: Do not generate circular phony rules (#15454)
| * | | | | | Ninja: Do not generate circular phony rules (#15454)Brad King2015-03-181-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'update-kwiml'Brad King2015-03-201-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67940795 Merge branch 'upstream-kwiml' into update-kwiml ded79a97 KWIML: Teach ABI.h about Xtensa architecture
| * \ \ \ \ \ Merge branch 'upstream-kwiml' into update-kwimlBrad King2015-03-171-0/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | KWIML: Teach ABI.h about Xtensa architectureMax Filippov2015-03-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
* | | | | | | Merge topic 'cpack_rpm_component_fall_through'Brad King2015-03-203-664/+633
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be089724 CPack/RPM prevent component attributes leakage ffc1b945 CPack/RPM improved component override test
| * | | | | | | CPack/RPM prevent component attributes leakageDomen Vrankar2015-03-171-652/+621
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | CPack/RPM improved component override testDomen Vrankar2015-03-172-12/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'WCDH-fix-cxx_nullptr-workaround'Brad King2015-03-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9d09626 WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers
| * | | | | | | WCDH: Fix cxx_nullptr workaround for pre-C++11 compilersRoman Wüger2015-03-171-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use just '0' instead of 'static_cast<void*>(0)' because the latter will not automatically convert to pointers to other types.
* | | | | | | Merge topic 'mingw-compile-features'Brad King2015-03-202-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2aaf4f60 Help: Add notes for topic 'mingw-compile-features' f94727a9 Record compile features for GNU on Windows (#15443)
| * | | | | | | Help: Add notes for topic 'mingw-compile-features'Brad King2015-03-201-0/+6
| | | | | | | |
| * | | | | | | Record compile features for GNU on Windows (#15443)Brad King2015-03-171-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the 'UNIX' condition on GNU compiler features. Suggested-by: David Demelier <demelier.david@gmail.com>
* | | | | | | CMake Nightly Date StampKitware Robot2015-03-201-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-03-191-1/+1
| |_|/ / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-03-181-1/+1
|/ / / / /
* | | | | Merge topic 'wix-installer-theme'Brad King2015-03-173-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1bda8f1f CPackWIX: Customize CMake installer theme.
| * | | | | CPackWIX: Customize CMake installer theme.Nils Gladitz2015-03-123-0/+8
| | | | | |