mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 23:28:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
35,475 Commits 2 Branches 401 Tags
5e616fcf9ac1675fa4f3e7c1dc7f0e3dfb014df3
Commit Graph

35475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 5e616fcf9a CMP0026: Fix OLD behavior with file written during configure step 
Refactoring in commit 60307c5056 (cmGeneratorTarget: Replace source
classifier implementation, 2017-04-07) accidentally regressed support
for CMP0026's OLD behavior in the case of a source file written by
project code during the configure step after getting a LOCATION.  We
should not perform full source classification until the generate step
because files written by the project's configure step may not exist yet.

Add special logic to support this case.  Add a test case for it.

Reported-by: David Stoup <david.stoup@kitware.com>
 2017-04-17 10:10:15 -04:00
Brad King 60307c5056 cmGeneratorTarget: Replace source classifier implementation 
Compute and memoize the list of sources with their kinds for each
configuration just once.
 2017-04-07 15:35:48 -04:00
Brad King a9784d0e26 cmGeneratorTarget: Remove unnecessary condition 
Remove a condition where the "then" and "else" cases do the same thing.
 2017-04-07 14:29:47 -04:00
Kitware Robot 8bb5c14fd8 CMake Nightly Date Stamp 2017-04-07 00:01:04 -04:00
Brad King 2ec40c746f Merge topic 'doc-dev-review-comments' 
43381b4d Help/dev: Document preferred page for MR comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !672
 2017-04-06 15:54:23 -04:00
Brad King 43381b4de7 Help/dev: Document preferred page for MR comments 2017-04-06 09:53:19 -04:00
Brad King da9fe11b98 Merge topic 'include_external_msproject-map-config' 
227de0b9 include_external_msproject: Honor MAP_IMPORTED_CONFIG_<CONFIG>
4cd815f0 VS: Pass whole target to WriteProjectConfigurations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !669
 2017-04-06 09:38:36 -04:00
Brad King 0ef6b24988 Merge topic 'codelite-virtual-dirs' 
8243fe7c CodeLite: Distribute source files into folders (virtual directories)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !653
 2017-04-06 09:38:05 -04:00
Brad King a6530f3ee2 Merge topic 'bindexplib-format' 
c216e803 bindexplib: Run clang-format on header file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !670
 2017-04-06 09:37:19 -04:00
Kitware Robot 5d4db33e70 CMake Nightly Date Stamp 2017-04-06 00:01:04 -04:00
Brad King c216e80308 bindexplib: Run clang-format on header file 2017-04-05 15:51:38 -04:00
Beeble 227de0b95d include_external_msproject: Honor MAP_IMPORTED_CONFIG_<CONFIG> 
This allows projects added via `include_external_msproject` to compile
the preferred configuration despite different naming conventions.
 2017-04-05 13:44:03 -04:00
Beeble 4cd815f0b3 VS: Pass whole target to WriteProjectConfigurations 2017-04-05 13:37:45 -04:00
Brad King 333ff168eb Merge topic 'fix-genex-example' 
3ecbe76e Help: Fix error in $<COMPILE_LANGUAGE:lang> example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !667
 2017-04-05 10:29:57 -04:00
Brad King d9bd7adfdf Merge topic 'prop-is-multi-config' 
01826231 Tests: Add case for GENERATOR_IS_MULTI_CONFIG
38fd5866 Add GENERATOR_IS_MULTI_CONFIG global property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !657
 2017-04-05 10:22:23 -04:00
Brad King fe263c9882 Merge topic 'cpack-wix-root' 
fde8dfa4 CPackWIX: Add documentation for CPACK_WIX_ROOT
fb22ba63 CPackWIX: Fix variable documentation indentations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !665
 2017-04-05 10:17:47 -04:00
Brad King 0d17a82b0b Merge topic 'revert-cpack_nsis_sign_uninstaller' 
1b1ad2a2 Revert "CPack/NSIS: Sign the uninstaller"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !597
 2017-04-05 10:17:21 -04:00
Brad King 8e6014f51d Merge topic 'FindCUDA-tll-keywords' 
9f41bfd7 FindCUDA: Add option to use modern form of target_link_libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !663
 2017-04-05 10:16:38 -04:00
Brad King 6e9dc960c5 Merge topic 'CheckIPOSupported-Fortran' 
87199ea6 CheckIPOSupported: Add Fortran support
c92fd256 CheckIPOSupported: Move '_CMakeLTOTest-*' under 'CMakeFiles'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !655
 2017-04-05 10:16:00 -04:00
Brad King 820af5f797 Merge topic 'lang-specific-binutils' 
73934188 Rename CMAKE_GCC_{AR,RANLIB} to CMAKE_LANG_COMPILER_{AR,RANLIB}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !656
 2017-04-05 10:15:40 -04:00
Brad King 4046cb2d10 Merge topic 'bindexplib-arm' 
48fa2914 bindexplib: add ARM support
97c605fd bindexplib: remove unused code
7a8860af bindexplib: clang-format

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !604
 2017-04-05 10:15:18 -04:00
Kitware Robot 52ffedff1c CMake Nightly Date Stamp 2017-04-05 00:01:06 -04:00
Nils Gladitz 3ecbe76e60 Help: Fix error in $<COMPILE_LANGUAGE:lang> example 2017-04-04 23:28:25 +02:00
Nils Gladitz fde8dfa417 CPackWIX: Add documentation for CPACK_WIX_ROOT 
Fixes: #16774
 2017-04-04 21:17:15 +02:00
Nils Gladitz fb22ba6327 CPackWIX: Fix variable documentation indentations 2017-04-04 21:17:15 +02:00
Brad King 1b1ad2a2f4 Revert "CPack/NSIS: Sign the uninstaller" 
This reverts commit 09475c29 (CPack/NSIS: Sign the uninstaller,
2017-03-01) and follow-up commit e1ee7b43 (CPack/NSIS: Avoid a race
condition when generating the installer, 2017-03-22).  The signing
implementation does not work on Linux for a couple reasons:

* The script tries to run the temporary uninstaller executable,
  but of course this cannot be done except on a Windows host.

* The `${NSISDIR}\makensis` file does not exist because `makensis`
  is installed elsewhere.

The result is that existing package configurations can break on Linux.
For example, the CPackComponents test fails.

Revert the feature until an alternative implementation approach can be
found.
 2017-04-04 13:41:54 -04:00
Brad King 01826231f8 Tests: Add case for GENERATOR_IS_MULTI_CONFIG 2017-04-04 09:49:01 -04:00
Bastien Schatt 38fd5866c0 Add GENERATOR_IS_MULTI_CONFIG global property 
Fixes: #16768
 2017-04-04 09:49:00 -04:00
Taylor Braun-Jones 9f41bfd7b9 FindCUDA: Add option to use modern form of target_link_libraries 
This adds the option CUDA_LINK_LIBRARIES_KEYWORD which can be set to PRIVATE,
PUBLIC, or INTERFACE or left empty (the default) to use the old form of
target_link_libraries internally in FindCUDA macros.

Fixes: #16772
 2017-04-04 09:43:05 -04:00
Ruslan Baratov 87199ea66b CheckIPOSupported: Add Fortran support 2017-04-04 09:35:39 -04:00
Ruslan Baratov c92fd25661 CheckIPOSupported: Move '_CMakeLTOTest-*' under 'CMakeFiles' 2017-04-04 09:35:31 -04:00
Brad King 1180fdb656 Merge topic 'ExternalProject-checkout-clarify' 
12a78130 ExternalProject: Run `git checkout` with `--` to clarify arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !660
 2017-04-04 09:27:54 -04:00
Brad King 348519cce5 Merge branch 'release' 2017-04-04 09:26:11 -04:00
Brad King fb3f6fd3fe Merge topic 'FindBoost-vs-toolset-fallback' 
862482df FindBoost: Support prebuilt Windows binaries from SourceForge
3ca6f70f FindBoost: Allow testing for multiple compiler suffixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !639
 2017-04-04 09:20:16 -04:00
Brad King d34daca368 Merge topic 'mac-implicit-link-no-lto-flag' 
53f17333 CMakeParseImplicitLinkInfo: Ignore ld -lto_library flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !658
 2017-04-04 09:18:39 -04:00
Brad King 1c8775c99f Merge topic 'server-mode-test-no-pyc' 
e51d9395 Tests: Avoid generating .pyc files during Server test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !659
 2017-04-04 09:17:41 -04:00
Brad King bc04c6ba1e Merge topic 'test-CMakeOnly.AllFindModules-local-exclude' 
fe21ccc4 Tests: Optionally skip local packages versions in CMakeOnly.AllFindModules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !661
 2017-04-04 09:07:44 -04:00
Brad King 0f51d44aea Merge topic 'test-CMake.GetPrerequisites-config-message' 
c2c22862 Tests: Fix CMake.GetPrerequisites test config message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !654
 2017-04-04 09:07:16 -04:00
Brad King c792926b35 Merge topic 'xcode-current-arch' 
a1221905 Xcode: Detect CURRENT_ARCH for use by generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !648
 2017-04-04 09:04:17 -04:00
Mikhail Paulyshka 48fa291469 bindexplib: add ARM support 
Fixes: #16728
 2017-04-04 08:52:46 -04:00
Kitware Robot 4b9e15fb47 CMake Nightly Date Stamp 2017-04-04 00:01:04 -04:00
Brad King fe21ccc486 Tests: Optionally skip local packages versions in CMakeOnly.AllFindModules 
Some machines have incomplete or otherwise broken installations of
specific packages.  Allow local configuration to prevent the test from
failing on such packages if the version number cannot be extracted.
 2017-04-03 16:04:17 -04:00
Brad King 12a781301c ExternalProject: Run git checkout with -- to clarify arguments 
Fix the case when the tag name to be checked out also happens to match a
path name.  Unfortunately we cannot do this for Git versions prior to
1.8.5 because they do not "do what I mean" to checkout remote branches
when the `--` argument is given.

Fixes: #16678
 2017-04-03 14:34:35 -04:00
Ruslan Baratov 7393418844 Rename CMAKE_GCC_{AR,RANLIB} to CMAKE_LANG_COMPILER_{AR,RANLIB} 
The variables recently added by commit b9d36826 (Add 'CMAKE_GCC_AR' and
'CMAKE_GCC_RANLIB' variables, 2017-03-08) are more appropriately managed
with language-specific names rather than toolchain-specific names.
 2017-04-03 14:10:50 -04:00
Brad King 1a6e47aa3d Merge branch 'server-mode-test-no-pyc' into release 2017-04-03 13:37:27 -04:00
Brad King e51d939525 Tests: Avoid generating .pyc files during Server test 
Avoid writing any files to the source tree during testing.

Fixes: #16770
 2017-04-03 13:36:48 -04:00
Brad King 585f94fe69 Merge branch 'mac-implicit-link-no-lto-flag' into release 2017-04-03 13:24:03 -04:00
Brad King 53f17333f8 CMakeParseImplicitLinkInfo: Ignore ld -lto_library flag 
The `ld` tool in Xcode 8.3 now has a `-lto_library <path>` flag.  Ignore
the flag instead of accidentally parsing it as `-l` with `to_library`.

Fixes: #16766
 2017-04-03 13:23:31 -04:00
Brad King c2c2286228 Tests: Fix CMake.GetPrerequisites test config message 
Since commit v2.8.11~239^2~1 (ProcessorCount test: fix path to
cmsysTestsCxx executable, 2013-01-24) we accidentally printed a literal
`${CTEST_CONFIGURATION_TYPE}` instead of the actual build configuration.
Update the message to use a generator expression to get the real build
configuration used.
 2017-04-03 10:45:03 -04:00
Brad King 53e9c2d2a3 Merge branch 'release' 2017-04-03 09:36:54 -04:00