mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 20:29:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
35,368 Commits 2 Branches 401 Tags
48cfb295a2810e541bd286f352d77d840be345f7
Commit Graph

22474 Commits

Author SHA1 Message Date
Daniel Pfeifer 48cfb295a2 cmFortranParser: remove unnecessary typedef 2017-03-29 18:48:48 +02:00
Daniel Pfeifer 90bb5f64a4 cmCommandArgumentParserHelper: remove unnecessary include 2017-03-29 18:48:47 +02:00
Daniel Pfeifer ab5f4e81f3 cmFortranParserImpl: remove unnecessary include 2017-03-29 18:48:47 +02:00
Daniel Pfeifer 21a6ed49f2 cmFileCommand: add <cm_curl.h> include 2017-03-29 18:48:47 +02:00
Daniel Pfeifer a2275bdd63 cmFileCommand: remove unnecessary friend declaration 2017-03-29 18:48:47 +02:00
Brad King 6dc7262bf7 Merge topic 'vs-rc-defines' 
fff34934 MSVC: Restore _DEBUG preprocessor definition in RC debug builds
79a91538 RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache
c77194ec VS: Honor preprocessor definitions in RC flags
1449f6f6 cmVisualStudio10TargetGenerator: De-duplicate preprocessor defs
8a619e8c cmIDEOptions: Add GetDefines method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !640
 2017-03-29 09:14:54 -04:00
Brad King 4a6a27ad85 Merge topic 'update-kwsys' 
cdd2875a Merge branch 'upstream-KWSys' into update-kwsys
e9c5505b KWSys 2017-03-28 (34999b6a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !637
 2017-03-29 09:12:41 -04:00
Brad King 2b9086d266 Merge topic 'vfproj-object-libs-fix' 
7a411dfb VS: Fix OBJECT library support in Intel Fortran projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !636
 2017-03-29 09:12:20 -04:00
Kitware Robot 3e4e6594da CMake Nightly Date Stamp 2017-03-29 00:01:07 -04:00
Brad King c77194ec47 VS: Honor preprocessor definitions in RC flags 
The VS generators use the C (or CXX) preprocessor definitions for
the Windows Resource Compiler tool.  This causes definitions parsed
out of `CMAKE_RC_FLAGS[_<CONFIG>]` variables to be dropped.  Fix
the implementation to preserve both.

Issue: #16745
 2017-03-28 13:10:55 -04:00
Brad King 1449f6f63d cmVisualStudio10TargetGenerator: De-duplicate preprocessor defs 2017-03-28 13:10:55 -04:00
Brad King 8a619e8c85 cmIDEOptions: Add GetDefines method 2017-03-28 13:10:55 -04:00
Christian Pfeiffer 7a411dfbf6 VS: Fix OBJECT library support in Intel Fortran projects 
The `TargetExt` for `.vfproj` object libraries should be `.lib`
to match the `OutputFile` value.  Otherwise Visual Fortran raises
warnings:

    TargetPath(...) does not match the Library's OutputFile
    property value (...)
 2017-03-28 10:34:26 -04:00
Brad King cdd2875ad2 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-03-28 (34999b6a)
 2017-03-28 10:18:10 -04:00
Brad King 83199f8daf Merge topic 'InstallRequiredSystemLibraries-vs2017' 
6eb609fd InstallRequiredSystemLibraries: Find VS 2017 redist directory
cf784d9f Add undocumented CMake language means to find VS 2017
082c0375 InstallRequiredSystemLibraries: Split VS 2017 search paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !632
 2017-03-28 10:14:59 -04:00
Brad King 4d97086848 Merge topic 'ninja-fix-sysconf-non-limit' 
92fe00d3 Ninja: Fix command line limit when sysconf has no ARG_MAX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !633
 2017-03-28 10:14:40 -04:00
Kitware Robot 21499431e0 CMake Nightly Date Stamp 2017-03-28 00:01:03 -04:00
Christian Pfeiffer 92fe00d33c Ninja: Fix command line limit when sysconf has no ARG_MAX 
The `sysconf(3)` manual explains that the return value can be `-1` for
limits if there is no definite limit.  Recognize this case and skip
using the value as a limit candidate.  Otherwise we use response files
unconditionally on such systems instead of checking other limits.

Fixes: #16740
 2017-03-27 13:42:19 -04:00
Brad King cf784d9ff5 Add undocumented CMake language means to find VS 2017 
Add a query to the `cmake_host_system_information` command to get
the location of a VS 2017 installation.  Leave it undocumented and
for internal use for now.
 2017-03-27 11:43:01 -04:00
Brad King 341b42024b Merge topic 'cm-sys-stat' 
e9fc7ff5 Add self-sufficient wrapper for <sys/stat.h>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !625
 2017-03-27 09:05:13 -04:00
Brad King 0ff8f127fb Merge topic 'update-kwsys' 
ea2a91a4 Merge branch 'upstream-KWSys' into update-kwsys
fda80fde KWSys 2017-03-24 (7e9f7b7b)
64490637 update-kwsys: Disable custom gitattributes during import
f1a55839 update-third-party: Add helper to disable custom gitattributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !624
 2017-03-27 09:02:02 -04:00
Kitware Robot deec8919ba CMake Nightly Date Stamp 2017-03-27 00:01:02 -04:00
Kitware Robot d6ef21cf70 CMake Nightly Date Stamp 2017-03-26 00:01:02 -04:00
Kitware Robot 3ac205f7dc CMake Nightly Date Stamp 2017-03-25 00:01:03 -04:00
Daniel Pfeifer e9fc7ff505 Add self-sufficient wrapper for <sys/stat.h> 2017-03-24 22:58:25 +01:00
Brad King ea2a91a432 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-03-24 (7e9f7b7b)

Resolve conflicts in `.gitattributes` by integrating changes from both
sides.  Keep the `our-c-style` attribute that KWSys uses, but drop their
definition of it in favor of ours (Git only allows custom attributes in
the top level anyway).  Then add our own attribute line to unset the
`format.clang-format` attribute for KWSys sources since we do not want
to format third-party code ourselves.
 2017-03-24 15:17:25 -04:00
Brad King 8047bd6c0d Merge topic 'iwyu' 
41ec3528 IWYU: use pragma export
72ea66b1 Autogen: include what you use
2a827b82 cmCPackGenerator: Move macros to bottom of file
bcd08aa3 cmCTest: Move macros to bottom of file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !619
 2017-03-24 08:33:47 -04:00
Brad King 5bded841b4 Merge topic '16680-ios-bundle-resources' 
b5189fda Apple: Add test for bundle resource layout
c51c2cfa Apple: Fix Resources location for all generators
060be58c Xcode: Properly handle Bundle Resources with more than one hierarchy level
484ccb0c Xcode: Properly handle non-resource Bundle files on iOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !613
 2017-03-24 08:32:41 -04:00
Kitware Robot 6cd8aa3c2a CMake Nightly Date Stamp 2017-03-24 00:01:07 -04:00
Daniel Pfeifer 41ec352832 IWYU: use pragma export 2017-03-23 23:38:46 +01:00
Daniel Pfeifer 72ea66b1cf Autogen: include what you use 2017-03-23 23:20:10 +01:00
Daniel Pfeifer 2a827b8244 cmCPackGenerator: Move macros to bottom of file 
Since the class name is used in the macros, the iwyu tool gets confused
wheter it needs a forward declaration or not.
 2017-03-23 23:08:57 +01:00
Daniel Pfeifer bcd08aa383 cmCTest: Move macros to bottom of file 
Since the class name is used in the macros, the iwyu tool gets confused
wheter it needs a forward declaration or not.
 2017-03-23 23:08:56 +01:00
Gregor Jasny c51c2cfac6 Apple: Fix Resources location for all generators 
Issue: #16680
 2017-03-23 16:43:55 +01:00
Brad King 677b3cbf28 Merge topic 'server-mode-fix-home-dir-check' 
8285ad51 server-mode: Make CMAKE_HOME_DIRECTORY more reliable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !611
 2017-03-23 08:46:30 -04:00
Brad King 324d7f5a50 Merge branch 'server-mode-fix-home-dir-check' into release 2017-03-23 08:42:51 -04:00
Kitware Robot 82db83d2f1 CMake Nightly Date Stamp 2017-03-23 00:01:06 -04:00
Gregor Jasny 060be58c6f Xcode: Properly handle Bundle Resources with more than one hierarchy level 
Issue: #16680
 2017-03-22 23:36:11 +01:00
Gregor Jasny 484ccb0c45 Xcode: Properly handle non-resource Bundle files on iOS 
Issue: #16680
 2017-03-22 21:16:42 +01:00
Tobias Hunger 8285ad511a server-mode: Make CMAKE_HOME_DIRECTORY more reliable 
Make CMAKE_HOME_DIRECTORY detection work more reliably in the face
of symlinks.

Closes #16736
 2017-03-22 17:31:02 +01:00
Brad King 5d2f30f5ac Merge topic '14335-duplicate-else' 
edac95b9 cmIfCommand: Reject duplicate else() and misplaced elseif()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !594
 2017-03-22 09:24:49 -04:00
Brad King 10cbb87fa3 Merge topic 'ninja-fortran-depfile-fix' 
805706b3 Ninja: Fix Fortran `include` dependency on generated file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !601
 2017-03-22 08:52:18 -04:00
Brad King b5d8a6de48 Merge topic 'cuda_no_ninja_response_support' 
feaea065 CUDA: Disable support for using response files.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !596
 2017-03-22 08:50:05 -04:00
Brad King 989484d51f Merge topic 'module-def-and-WINDOWS_EXPORT_ALL_SYMBOLS' 
075f6454 Support WINDOWS_EXPORT_ALL_SYMBOLS with `.def` files
21c4ec4f cmGlobalVisualStudioGenerator: Simplify __create_def command generation
24361a45 bindexplib: Add support for parsing and integrating `.def` files
845c4824 bindexplib: Add method for parsing and integrating `.def` files
4f90e793 bindexplib: Revise coding style of CMake-specific methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !581
 2017-03-22 08:49:09 -04:00
Gregor Jasny edac95b955 cmIfCommand: Reject duplicate else() and misplaced elseif() 
Closes: #14335
 2017-03-22 08:42:35 -04:00
Kitware Robot 564add478d CMake Nightly Date Stamp 2017-03-22 00:01:04 -04:00
Brad King 849f1ec1c0 Merge branch 'ninja-fortran-depfile-fix' into release 2017-03-21 15:37:07 -04:00
Brad King 805706b36d Ninja: Fix Fortran include dependency on generated file 
Work around upstream ninja issue 1251 by converting include directories
used by our Fortran dependency scanner to the same path format that we
use in preprocessor `-I` flags and in the `build.ninja` manifest.

Fixes: #16722
 2017-03-21 15:19:01 -04:00
Brad King 1356ef4f84 Merge branch 'cuda_no_ninja_response_support' into release 2017-03-21 11:15:49 -04:00
Robert Maynard feaea0658c CUDA: Disable support for using response files. 2017-03-21 11:09:18 -04:00