reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-03-05 02:17:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,730 Commits 4 Branches 185 Tags
Commit Graph

37730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
192ab741ec FindPythonLibs: Allow find_library to search paths from system environment 
Drop the `NO_SYSTEM_ENVIRONMENT_PATH` option from our `find_library`
calls.  No other find modules do this.  Also, since commit
v3.3.0-rc1~430^2 (Teach find_(library|file|path) to get prefixes from
PATH, 2015-02-18) we always search the `lib` directory of each prefix
before the `bin` directory and so should prefer the non-`.dll` name.

Issue: #17336
 2017-10-11 11:07:58 -04:00
Brad King
3976a1066a FindPythonLibs: Prefer libs early in search path regardless of name 
Add `NAMES_PER_DIR` to all `find_library` invocations so that we
consider all possible names in each search directory before moving on to
the next directory.  This helps find the package that appears earliest
in the search path regardless of how it names its libraries.

Fixes: #17336
 2017-10-11 10:58:22 -04:00
Brad King
b1aa8a4773 FindXMLRPC: Drop unnecessary exec_program code paths 
We always have `execute_process` now, so drop our ancient `exec_program`
code paths that are never used anymore.
 2017-10-11 10:31:32 -04:00
Brad King
609a6fe96d Merge branch 'clang-msvc-help' into release-3.10 
Merge-request: !1373
 2017-10-11 09:28:09 -04:00
Brad King
a4b216711b Merge branch 'release-3.10' 2017-10-11 08:27:30 -04:00
Brad King
4594880be7 Merge topic 'cpack-deb-mr-1296-fix' 
c5db2f9a CPack/Deb: fix for regex passing even if invalid characters are present
529729d6 CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exception

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1375
 2017-10-11 08:26:24 -04:00
Brad King
155c1505a5 Merge branch 'cpack-deb-mr-1296-fix' into release-3.10 
Merge-request: !1375
 2017-10-11 08:25:30 -04:00
Brad King
5fd0ce61f7 Merge topic 'linked-tree' 
ff09abb8 cmLinkedTree: avoid unnecessary copies during Push of T

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1351
 2017-10-11 08:24:23 -04:00
Brad King
86edb6660b Merge topic 'simplify-env-var-determination' 
5731f6d5 cm{Unset,Set}Command: use std::string to determine the env variable name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1350
 2017-10-11 08:22:58 -04:00
Brad King
7237d9489a Merge topic 'ExternalProject-CMP0054' 
491d2108 ExternalProject: Avoid if() auto-dereferene in quoted arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1369
 2017-10-11 08:21:14 -04:00
Brad King
ce45b3e4e3 Merge branch 'ExternalProject-CMP0054' into release-3.10 
Merge-request: !1369
 2017-10-11 08:20:25 -04:00
Brad King
491d210898 ExternalProject: Avoid if() auto-dereferene in quoted arguments 
The implementation of this module doesn't expect such dereferences
to happen, but can when a project sets a variable called `x`.
Set `CMP0054` explicitly to get its NEW behavior.

Fixes: #17335
 2017-10-11 08:19:58 -04:00
Brad King
027bcee513 Merge topic 'UseJava_OUTPUT_DIR' 
dead049e UseJava: OUTPUT_DIR must exists in all cases.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1368
 2017-10-11 08:18:50 -04:00
Brad King
5d6ba8f2da Merge topic 'autogen-skip-ui' 
e95429fd Autogen: Docs: Extend SKIP_AUTOUIC documentation
814cddbe Autogen: Docs: Add examples for AUTORCC_OPTIONS and AUTOUIC_OPTIONS
1c196268 Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1366
 2017-10-11 08:17:57 -04:00
Brad King
401737f9ff Merge topic 'update-kwsys' 
f1a4ecdc Merge branch 'upstream-KWSys' into update-kwsys
c551ff58 KWSys 2017-10-10 (239bc737)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1370
 2017-10-11 08:15:24 -04:00
Brad King
48a58e91a6 Merge topic 'update-curl' 
bb759148 curl: Update build within CMake to account for 7.56 changes
9e3ef40e Merge branch 'upstream-curl' into update-curl
de7c21d6 curl 2017-10-04 (3ea76790)
2fad0e20 curl: Update script to get curl 7.56.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1372
 2017-10-11 08:14:44 -04:00
Brad King
165eff9382 Merge branch 'update-curl' into release-3.10 
Merge-request: !1372
 2017-10-11 08:13:15 -04:00
Brad King
6ada7f2e9b Merge topic 'test-tolerate-clang-sanitizers' 
0be7d61a Tests: Teach RunCMake to ignore clang unused sanitizer flag warnings
3f567a98 Tests: Refactor RunCMake output line ignore regex construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1371
 2017-10-11 08:12:58 -04:00
Kitware Robot
6e1fd9269c CMake Nightly Date Stamp 2017-10-11 00:01:06 -04:00
Domen Vrankar
c5db2f9a0f CPack/Deb: fix for regex passing even if invalid characters are present 
Regex [+-~] passes all characters between + and ~ and not only
+, - and ~
 2017-10-11 00:10:10 +02:00
Domen Vrankar
529729d6e7 CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exception 
CPACK_DEBIAN_PACKAGE_VERSION variable could in the past also
contain release and epoch version so regex test should expect
the entire versioning if both CPACK_DEBIAN_PACKAGE_RELEASE
and CPACK_DEBIAN_PACKAGE_EPOCH are not set.
Also since the checks were not performed in the past the regex
test of CPACK_DEBIAN_PACKAGE_VERSION variable content should
only report author warnings instead of errors in case of the
test fail.

Fixes: #17339
 2017-10-11 00:10:01 +02:00
Brad King
b6d3a1c09a Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI 
The LLVM/Clang installer on Windows provides a `LLVM/bin` directory
containing `clang.exe` and `clang++.exe` command-line tools that have a
GNU-like command-line but target the MSVC ABI (instead of MinGW).  We
do not support this combination, so diagnose and reject it explicitly.
Tell users what to do to use the `clang-cl.exe` tool instead.

Issue: #16439
 2017-10-10 14:56:43 -04:00
Brad King
0a5987fa59 Merge branch 'autogen-skip-ui' into release-3.10 
Merge-request: !1366
 2017-10-10 13:53:34 -04:00
Sebastian Holtermann
e95429fd85 Autogen: Docs: Extend SKIP_AUTOUIC documentation 2017-10-10 13:52:49 -04:00
Brad King
f3bb9fcf0c Merge topic 'doc-lang-clarify' 
1ed11f1c Help: Minor text clarifications in cmake-language(7) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1358
 2017-10-10 13:46:34 -04:00
Matthias Maennich
5731f6d5b1 cm{Unset,Set}Command: use std::string to determine the env variable name 2017-10-10 13:28:39 -04:00
Brad King
25b16ba3dc Merge branch 'doc-lang-clarify' into release-3.10 
Merge-request: !1358
 2017-10-10 11:29:26 -04:00
Brad King
1ed11f1c0d Help: Minor text clarifications in cmake-language(7) manual 
Clarify definitions of `bracket_open` and `bracket_close` productions.

In note about unquoted arguments containing unescaped double quotes,
provide examples of how they can be written as quoted arguments.

Also clarify location of nested calls supported by variable function
scope.

Suggested-by: Дилян Палаузов <dilyan.palauzov@aegee.org>
 2017-10-10 11:26:00 -04:00
Brad King
bb7591487d curl: Update build within CMake to account for 7.56 changes 2017-10-10 11:15:20 -04:00
Brad King
9e3ef40edb Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2017-10-04 (3ea76790)
 2017-10-10 11:15:16 -04:00
Curl Upstream
de7c21d677 curl 2017-10-04 (3ea76790) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 3ea76790571c1f7cf1bed34fabffd3cc20ad3dd3 (curl-7_56_0).
 2017-10-10 11:15:03 -04:00
Brad King
2fad0e20b6 curl: Update script to get curl 7.56.0 2017-10-10 11:14:42 -04:00
Brad King
0be7d61abf Tests: Teach RunCMake to ignore clang unused sanitizer flag warnings 
These can show up in Release builds of CMake because some tests still
build Debug.
 2017-10-10 09:37:49 -04:00
Brad King
3f567a9847 Tests: Refactor RunCMake output line ignore regex construction 
Avoid one giant line.
 2017-10-10 09:35:31 -04:00
Brad King
8af7a16be7 Merge topic 'tryrun-strcpy' 
a483b7ea TryRun: do not call strcpy()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1364
 2017-10-10 09:10:54 -04:00
Brad King
60c688c6c3 Merge topic 'xcode-tests-ios-deployment-target' 
3a49b4eb Xcode 9: Lower iOS deployment version to get armv7 builds
78a560e4 Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1365
 2017-10-10 09:10:05 -04:00
Brad King
f686c45d62 Merge branch 'xcode-tests-ios-deployment-target' into release-3.10 
Merge-request: !1365
 2017-10-10 09:09:03 -04:00
Gregor Jasny
3a49b4eb78 Xcode 9: Lower iOS deployment version to get armv7 builds 2017-10-10 09:08:44 -04:00
Gregor Jasny
78a560e42b Revert "Xcode: Adjust tests to drop of 32bit iOS architectures" 
This reverts commit d210b2813072c874ee13fcc941e41aacacf09874.
 2017-10-10 09:08:44 -04:00
Brad King
f3bbb37b25 Merge branch 'release-3.10' 2017-10-10 09:03:48 -04:00
Brad King
54739743e5 Merge topic 'doc_bundle_wrong_plist_property' 
a56d9ecf Help: Fix wrong property reference for an app bundle's Info.plist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1362
 2017-10-10 09:02:50 -04:00
Brad King
0a6dd27e86 Merge topic 'target_properties_doc_cleanup' 
b8010bda Help: Fix Example appearing in target property list of contents

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1361
 2017-10-10 09:02:22 -04:00
Brad King
9c81265438 Merge branch 'target_properties_doc_cleanup' into release-3.10 
Merge-request: !1361
 2017-10-10 09:00:57 -04:00
Brad King
581b9d9c77 Merge branch 'doc_bundle_wrong_plist_property' into release-3.10 
Merge-request: !1362
 2017-10-10 09:00:38 -04:00
Brad King
e5f1be0f64 Merge branch 'FindCUDA-cuda-9-nppi' into release-3.10 
Merge-request: !1360
 2017-10-10 08:59:51 -04:00
Brad King
dba09a3c21 Merge topic 'FindProtobuf-doc-typo' 
107fe8d5 FindProtobuf: fix documentation typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1359
 2017-10-10 08:58:07 -04:00
Brad King
ea6e5903e7 Merge topic 'ipo-escape-toolchain-path' 
11f4c19d IPO: Fix support for spaces in path to archive tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Merge-request: !1356
 2017-10-10 08:57:05 -04:00
Brad King
e110ab9e21 Merge topic 'FindCUDA-cuda-9-nppi' 
16589bf4 FindCUDA: Update for CUDA 9 breakup of nppi into multiple libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1360
 2017-10-10 08:52:35 -04:00
Brad King
6702ace882 Merge topic 'FindJava-tolerant-versions' 
6feb0c33 FindJava: Revise version parsing to support Java 9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1355
 2017-10-10 08:51:03 -04:00
Brad King
75ce489c20 Merge topic 'revise-3.10-relnotes' 
3cebe2ab Help: Revise 3.10 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1357
 2017-10-10 08:50:32 -04:00