Commit Graph

40019 Commits

Author SHA1 Message Date
Martin Storsjö de5a4653d7 Add WindowsPhone and WindowsStore platform modules for Clang/GNU C/CXX
Just like the existing WindowsPhone and WindowsStore platform modules
for MSVC, just include the corresponding Windows platform modules.

MinGW tools (both with GCC and Clang) can be used for building for
Windows Store, even though it isn't a very common or simple setup.
2018-07-08 00:06:37 +03:00
Kitware Robot c29dda6c99 CMake Nightly Date Stamp 2018-07-07 00:01:10 -04:00
Brad King b74962d898 Merge topic 'vsnasm-quoting'
cb694f8cd6 VS: Properly quote arguments in nasm.xml

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2179
2018-07-06 09:43:23 -04:00
Brad King edfeeba347 Merge topic 'FindCURL-per-config'
59b3e78451 FindCURL: Find debug and release variants separately
6a9fe250a7 FindCURL: Improve CURL::libcurl property code layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1940
2018-07-06 09:42:31 -04:00
Brad King 9d1bc0a918 Merge topic 'list-command-insert'
a08154d493 list: Allow inserting at the end of a list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2181
2018-07-06 09:41:24 -04:00
Kitware Robot f6b20179aa CMake Nightly Date Stamp 2018-07-06 00:01:08 -04:00
Daniel Chabrowski a08154d493 list: Allow inserting at the end of a list
Fixes: #18069
2018-07-05 13:53:49 -04:00
Brad King 6683edc803 Merge branch 'release-3.12' 2018-07-05 11:41:56 -04:00
Brad King d101446a56 Merge topic 'doc-add_compile_definitions'
89e3e62e13 Help: fix add_compile_definitions() documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2192
2018-07-05 11:41:23 -04:00
Brad King 7f9652773a Merge topic 'UseSWIG-legacy-targets'
8f2b483c06 Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targets
38ffcedd26 UseSWIG: reintroduce legacy target name management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2188
2018-07-05 11:39:09 -04:00
Brad King 5c60e80c46 Merge topic 'FindLua-CMP0012'
91f4adb028 FindLua: Set CMP0012 to NEW for the revised search code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rolf Eike Beer <eike@sf-mail.de>
Acked-by: Alexander Grund <github@grundis.de>
Merge-request: !2189
2018-07-05 11:38:03 -04:00
Brad King 8dac71ee72 Merge topic 'gitignore-vscode'
9c01704e9f gitignore: Ignore a .vscode directory in the source tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2182
2018-07-05 11:36:25 -04:00
Brad King 326ebdf12a Merge topic 'revert-subdirectory-linking'
0d7114987c Revert "target_link_libraries: Allow use with targets in other directories"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2191
2018-07-05 11:31:17 -04:00
Brad King ca733cdf45 Merge topic 'math-hex'
5dbee9d2d0 math: Add options to calculate and format output as hexadecimal
8661e7052c math: Diagnose divide-by-zero
7c4c13ffef math: Reject unexpected expression input explicitly
5b0f73a15a math: Use 64-bit integer type for computation
963b8d9f6c math: Add RunCMake.math test to prepare for error cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2056
2018-07-05 10:26:05 -04:00
Brad King 0f3d7a1398 Merge branch 'doc-add_compile_definitions' into release-3.12
Merge-request: !2192
2018-07-05 10:23:20 -04:00
Marc Chevrier 89e3e62e13 Help: fix add_compile_definitions() documentation
Fixes: #18147
2018-07-05 10:21:09 -04:00
Kitware Robot 5fec622ece CMake Nightly Date Stamp 2018-07-05 00:01:04 -04:00
Kitware Robot 80d29a8ac4 CMake Nightly Date Stamp 2018-07-04 00:01:06 -04:00
Hiroshi Miura 59b3e78451 FindCURL: Find debug and release variants separately
Fixes: #17887
2018-07-03 13:40:49 -04:00
Hiroshi Miura 6a9fe250a7 FindCURL: Improve CURL::libcurl property code layout 2018-07-03 13:31:48 -04:00
Brad King 84ecbf44b6 Merge branch 'revert-subdirectory-linking' into release-3.12
Merge-request: !2191
2018-07-03 12:54:32 -04:00
Brad King 890be0145d Merge branch 'FindLua-CMP0012' into release-3.12
Merge-request: !2189
2018-07-03 12:54:24 -04:00
Brad King f598166124 Merge branch 'backport-UseSWIG-legacy-targets' into release-3.12
Merge-request: !2188
2018-07-03 12:54:13 -04:00
Brad King 8f2b483c06 Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targets
Resolve conflicts by integrating changes from both sides.
2018-07-03 12:48:02 -04:00
Marc Chevrier 38ffcedd26 UseSWIG: reintroduce legacy target name management
Fixes: #18140
2018-07-03 12:46:59 -04:00
Dakota Hawkins 9c01704e9f gitignore: Ignore a .vscode directory in the source tree 2018-07-03 11:48:14 -04:00
Adriaan de Groot 91f4adb028 FindLua: Set CMP0012 to NEW for the revised search code
Code added by commit v3.12.0-rc1~53^2 (FindLua: Search for lua.h using
more conventional paths, 2018-05-20) depends on `CMP0012` NEW behavior.
Set the policy explicitly for the scope of the FindLua module.

Fixes: #18142
2018-07-03 11:23:22 -04:00
Brad King 4330f10186 Merge topic 'safe_property'
42cc0644d5 Autogen: Use default and remove custom GetSafeProperty functions
127094f2f0 Add GetSafeProperty method to cmTarget, cmGeneratorTarget and cmSourceFile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2185
2018-07-03 10:56:31 -04:00
Brad King c4b1c0751d Merge topic 'cpack-external'
4c71548766 Help: Add release notes for CPack External generator
47c87cdd1f Help: Add documentation for CPack External generator
2ef966bc77 Testing: Add test for CPack External generator
80914d88da CPack: Add "CPack External" generator
3ced881db6 cmCPackGenerator: Store CPACK_INSTALL_CMAKE_PROJECTS in an internal field
4938abb600 cmCPackGenerator: Refactor InstallProjectViaInstallCMakeProjects()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2142
2018-07-03 10:55:06 -04:00
Brad King f4d4d5df5b Merge topic 'LINK_DEPENDS'
724bd7790e LINK_DEPENDS: add support of 'generator expressions'
cc9f88af53 LINK_DEPENDS: add support for property INTERFACE_LINK_DEPENDS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2175
2018-07-03 10:52:24 -04:00
Brad King 5d933ad77b Merge branch 'release-3.12' 2018-07-03 10:48:46 -04:00
Brad King 83db42fa99 Merge topic 'cpack-fix-deb-packaging'
2774259100 CPack/Deb: Restore setting of root as the owner of files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2178
2018-07-03 10:48:03 -04:00
Brad King 3017e501f3 Merge topic 'rel-explicit-ccmake'
eb63a07eaa Utilities/Release: Explicitly enable ccmake on macOS and Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2186
2018-07-03 10:46:51 -04:00
Daniel Franke 5dbee9d2d0 math: Add options to calculate and format output as hexadecimal 2018-07-03 09:55:58 -04:00
Brad King 0d7114987c Revert "target_link_libraries: Allow use with targets in other directories"
Revert commit v3.12.0-rc1~82^2 (target_link_libraries: Allow use with
targets in other directories, 2018-05-11).  The RHS target scoping and
visibility rules are not clear and will need further investigation
before the feature can be added.

Issue: #17943
2018-07-03 09:39:28 -04:00
Kitware Robot b49b4066c0 CMake Nightly Date Stamp 2018-07-03 00:01:06 -04:00
David Benjamin cb694f8cd6 VS: Properly quote arguments in nasm.xml
Most arguments were quoted, but some weren't, causing problems if the
arguments contained whitespace.

In particular, the _STL_EXTRA_DISABLED_WARNINGS value takes spaces and
CMake's NASM support applies all add_definitions lines to NASM. The -D
flag is missing quotes, so projects using NASM and setting
_STL_EXTRA_DISABLED_WARNINGS break in the Visual Studio generator.

Likewise, the -o flag is missing quotes, which means filenames with
spaces do not work.

(The -U flag is unlikely to need quotes, but include them for
consistency.)

Extend the existing VSNASM test to cover these cases.
2018-07-02 18:50:12 -04:00
Brad King 39851a6d43 Merge branch 'cpack-fix-deb-packaging' into release-3.12
Merge-request: !2178
2018-07-02 13:19:54 -04:00
Andrew Fuller 2774259100 CPack/Deb: Restore setting of root as the owner of files
Refactoring in commit v3.10.0-rc1~220^2 (cmCPackDebGenerator: Use
libarchive to create .deb file) accidentally broke this for the
top-level archive.
2018-07-02 13:17:43 -04:00
Brad King 8ad3396158 Merge topic 'policy_max_docs'
19f338109d Help: Clarify ...<max> behavior for policy-related commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2180
2018-07-02 11:48:56 -04:00
Brad King ea6ad5e4be Merge branch 'policy_max_docs' into release-3.12
Merge-request: !2180
2018-07-02 11:48:00 -04:00
Brad King eb63a07eaa Utilities/Release: Explicitly enable ccmake on macOS and Linux
Since commit v3.12.0-rc1~325^2 (ccmake: Check for curses more robustly
before enabling, 2018-03-21) we may not enable ccmake by default when
using a non-system curses (e.g. the static curses we build on Linux for
our binaries).  Enable the option explicitly for our prebuilt binaries.
2018-07-02 11:36:15 -04:00
Kyle Edwards 4c71548766 Help: Add release notes for CPack External generator 2018-07-02 09:51:02 -04:00
Kyle Edwards 47c87cdd1f Help: Add documentation for CPack External generator 2018-07-02 09:51:02 -04:00
Kyle Edwards 2ef966bc77 Testing: Add test for CPack External generator
This test case ensures that the CPack External generator produces
the proper .json file, and also ensures that the version negotation
with CPACK_EXT_REQUESTED_VERSIONS works properly.
2018-07-02 09:51:02 -04:00
Kyle Edwards 80914d88da CPack: Add "CPack External" generator
This generator doesn't actually package the files. Instead, it
provides a metadata JSON file that can be used by external packaging
software to do its own packaging. This JSON file provides information
about the components, component groups, installation types, and CMake
projects.
2018-07-02 09:51:02 -04:00
Kyle Edwards 3ced881db6 cmCPackGenerator: Store CPACK_INSTALL_CMAKE_PROJECTS in an internal field
By storing this information in an internal field in the class, it
can be used later on by generators that need it.
2018-07-02 09:51:02 -04:00
Kyle Edwards 4938abb600 cmCPackGenerator: Refactor InstallProjectViaInstallCMakeProjects()
This refactoring will allow cmCPackExtGenerator to skip the install
step while still gathering up information about the CPack components
and groups. Besides, this function was too long, and needed to be
broken up anyway.
2018-07-02 09:51:02 -04:00
Sebastian Holtermann 42cc0644d5 Autogen: Use default and remove custom GetSafeProperty functions 2018-07-02 12:53:44 +02:00
Sebastian Holtermann 127094f2f0 Add GetSafeProperty method to cmTarget, cmGeneratorTarget and cmSourceFile 2018-07-02 12:39:54 +02:00