reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-19 19:11:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,431 Commits 4 Branches 185 Tags
Commit Graph

42431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
55ad9304ed README: Explain how to bootstrap via MSYS2 on Windows 
Inspired-by: Bartosz Kosiorek <bartosz.kosiorek@tomtom.com>
 2019-02-19 07:10:59 -05:00
Brad King
75b45956e0 Merge branch 'release-3.14' 2019-02-18 10:22:55 -05:00
Brad King
566652b0c8 Merge topic 'file_symlink_docs' 
0f5a9f7934 Help: Clarify and improve readability of link-related file subcommands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2974
 2019-02-18 10:22:35 -05:00
Brad King
926a97e975 Merge branch 'file_symlink_docs' into release-3.14 
Merge-request: !2974
 2019-02-18 09:22:13 -05:00
Brad King
0923246b2e Merge topic 'require-xcode-5' 
afb325018e Xcode: Require at least Xcode 5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2975
 2019-02-18 09:20:16 -05:00
Brad King
bafd0ffa98 Merge branch 'release-3.14' 2019-02-18 09:11:21 -05:00
Brad King
0f2eb9ac6f Merge topic 'get_filename_component_docs' 
2cc145928c Help: Remove outdated statement about get_filename_component()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2973
 2019-02-18 09:09:55 -05:00
Brad King
786edf9ab4 Merge topic 'externalproject_docs' 
f2072a6554 Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behavior
f2820bce15 Release notes: Make ExternalProject dot points consistent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2978
 2019-02-18 09:09:02 -05:00
Brad King
1f8ed41419 Merge branch 'externalproject_docs' into release-3.14 
Merge-request: !2978
 2019-02-18 09:08:05 -05:00
Brad King
36323162cb Merge branch 'get_filename_component_docs' into release-3.14 
Merge-request: !2973
 2019-02-18 09:06:57 -05:00
Brad King
03e10384ec Merge topic 'delete_copy_assign' 
ae5e97a005 Delete some default constructors and assignment operators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2968
 2019-02-18 09:05:30 -05:00
Brad King
d2489f2fde Merge topic 'autogen_test_fix' 
91344e7a46 Autogen: Fix RerunMocPlugin test for Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2971
 2019-02-18 09:04:47 -05:00
Kitware Robot
f1235fd37d CMake Nightly Date Stamp 2019-02-18 00:01:19 -05:00
Kitware Robot
8ec1942f62 CMake Nightly Date Stamp 2019-02-17 00:01:05 -05:00
Craig Scott
f2072a6554 Help: Clarify ExternalProject_Add()'s LOG_MERGED_STDOUTERR behavior 
The output is only merged for a step if it is logging to file. This
option is ignored for steps that are logging normally.

A minor grammatical error has also been fixed as part of this change.
 2019-02-17 13:30:07 +11:00
Craig Scott
f2820bce15 Release notes: Make ExternalProject dot points consistent 
Use same phrasing and command linking.
 2019-02-17 13:17:56 +11:00
Gregor Jasny
afb325018e Xcode: Require at least Xcode 5 2019-02-16 15:20:39 +01:00
Craig Scott
0f5a9f7934 Help: Clarify and improve readability of link-related file subcommands 2019-02-16 20:55:49 +11:00
Kitware Robot
657b30905a CMake Nightly Date Stamp 2019-02-16 00:01:07 -05:00
Craig Scott
2cc145928c Help: Remove outdated statement about get_filename_component() 
After !2853, the statement that the "longest file extension is
always considered" is no longer true. Both NAME_WLE and
LAST_EXT now return details based on the shortest file
extension.

Fixes: 7a25ef326b (Help: Add documentation for new get_filename_component components, 2019-01-24, 3.14.0-rc1)
 2019-02-16 15:26:23 +11:00
Brad King
820424d95d Merge topic 'systools-cleanup' 
bd20cc29a2 cmSystemTools: Remove redundant cmCopyFile() and Split()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2966
 2019-02-15 10:04:49 -05:00
Kyle Edwards
160735c479 Merge topic 'remove_return_void' 
30faf72625 Remove return from void function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2969
 2019-02-15 10:02:10 -05:00
Brad King
f2dc10d55c Merge topic 'ninja-swift-library-name' 
157570b5a2 Add placeholder for Swift's library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2902
 2019-02-15 10:00:21 -05:00
Brad King
3c9c91a360 Merge topic 'update-kwsys' 
f510aafbfc Merge branch 'upstream-KWSys' into update-kwsys
a930de85d8 KWSys 2019-02-14 (e270ce9f)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2967
 2019-02-15 09:59:40 -05:00
Vitaly Stakhovsky
bd20cc29a2 cmSystemTools: Remove redundant cmCopyFile() and Split() 2019-02-15 09:52:29 -05:00
Brad King
442cb77bf3 Merge branch 'release-3.14' 2019-02-15 09:21:20 -05:00
Brad King
6646623993 Merge topic 'tests-intel-fixup' 
8fc0c98f08 Tests: Fix Module.WriteCompilerDetectionHeader for Intel on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2963
 2019-02-15 07:58:57 -05:00
Brad King
e6897c72e7 CMake 3.14.0-rc2 v3.14.0-rc2 2019-02-15 07:46:43 -05:00
Brad King
bb99ab8e53 Merge branch 'release-3.14' 2019-02-15 07:45:14 -05:00
Brad King
029abf9733 Merge topic 'FindLibXml2' 
fd86a4de04 FindLibXml2: Document LibXml2_FOUND as preferred case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2970
 2019-02-15 07:44:34 -05:00
Brad King
3bc2fb55b4 Merge topic 'vs2017-sdk81' 
5c26e3c5e3 VS: Fix validation of Windows 8.1 SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dedmen Miller <dedmenmiller@googlemail.com>
Merge-request: !2962
 2019-02-15 07:29:05 -05:00
Albert Astals Cid
ae5e97a005 Delete some default constructors and assignment operators 
They are unused, but if someone used them they would lead to
problems since they would copy the internal raw pointers
and the destructor would cause double delete
 2019-02-15 07:25:47 -05:00
Brad King
3411c81575 Merge topic 'try_compile-expand-compile-defs' 
cde2596a19 try_compile: Restore expansion of ;-list in COMPILE_DEFINITIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2965
 2019-02-15 07:19:51 -05:00
Brad King
113a395ee7 Merge branch 'try_compile-expand-compile-defs' into release-3.14 
Merge-request: !2965
 2019-02-15 06:47:59 -05:00
Brad King
dac6cf1b99 Merge branch 'FindLibXml2' into release-3.14 
Merge-request: !2970
 2019-02-15 06:47:22 -05:00
Saleem Abdulrasool
fd86a4de04 FindLibXml2: Document LibXml2_FOUND as preferred case 
Both `LIBXML2_FOUND` and `LibXml2_FOUND` are provided but the modern
convention is to use the case that matches the module name.
 2019-02-15 06:41:32 -05:00
Brad King
cde2596a19 try_compile: Restore expansion of ;-list in COMPILE_DEFINITIONS 
The quoting added by commit 8c5221fb1f (try_compile: Preserve special
characters in COMPILE_DEFINITIONS, 2019-01-21, v3.14.0-rc1~108^2~3)
broke the case that the `COMPILE_DEFINITIONS` value contains a `;`.
Without the quoting the `;` would be generated literally in an unquoted
argument in the test `CMakeLists.txt` file and would then be expanded.
With quoting the `;` is preserved, which is not the old behavior.

Fix this by expanding the `;`-list ahead of time.  Add test cases for
behavior with both `#` and `;`.

This was noticed with the PGI compiler where we set
`CMAKE_CXX*_STANDARD_COMPILE_OPTION` to values like `--c++17;-A`.  The
symptom had also been observed while preparing commit ef8f237686
(ParseImplicitIncludeInfo: add SunPro Fortran and PGI compiler, Cray
fix, 2019-01-29, v3.14.0-rc1~26^2~2) but was not recognized at the time
as a regression.  Revert the workaround added by that commit.

Fixes: #18919
 2019-02-15 06:21:19 -05:00
Sebastian Holtermann
91344e7a46 Autogen: Fix RerunMocPlugin test for Ninja generator 2019-02-15 10:56:55 +01:00
Kitware Robot
a2a903fe42 CMake Nightly Date Stamp 2019-02-15 00:01:08 -05:00
Albert Astals Cid
30faf72625 Remove return from void function 2019-02-14 17:34:06 +01:00
Brad King
9d3710affe Merge branch 'vs2017-sdk81' into release-3.14 
Merge-request: !2962
 2019-02-14 11:24:16 -05:00
Brad King
8c4de81944 Merge topic 'autogen_refactor_rerun_tests' 
a40864ae53 Autogen: Refactor RerunRccDepends test with fixed timestamp comparison
724359489e Autogen: Refactor RerunRccConfigChange test
6ed4ae4bad Autogen: Refactor RerunMocBasic test with fixed timestamp comparison
fedbd16f35 Autogen: Refactor RerunMocPlugin test with fixed timestamp comparison

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2959
 2019-02-14 11:01:42 -05:00
Brad King
f510aafbfc Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2019-02-14 (e270ce9f)
 2019-02-14 10:55:44 -05:00
KWSys Upstream
a930de85d8 KWSys 2019-02-14 (e270ce9f) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit e270ce9fc60971006e934e9d53d11be5f85efc39 (master).

Upstream Shortlog
-----------------

Albert Astals Cid (2):
      95ced423 hashtable: delete assignment operator instead of poisoning it
      6090d36b Glob: Use the default copy constructor and assignment operator
 2019-02-14 10:55:44 -05:00
Brad King
e3353a0175 Merge branch 'release-3.14' 2019-02-14 10:35:22 -05:00
Brad King
0069825f50 Merge topic 'fortran-submodule-names' 
d80ecba5c2 Fortran: Fix submodule file names across compilers
72057d9c15 Fortran: Thread compiler id through to internal Fortran parser
7ae329e2ed Fortran: Factor out .mod and .smod file name construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.co>
Merge-request: !2958
 2019-02-14 10:25:15 -05:00
Brad King
2f51f281a8 Merge branch 'fortran-submodule-names' into release-3.14 
Merge-request: !2958
 2019-02-14 10:24:43 -05:00
Brad King
d80ecba5c2 Fortran: Fix submodule file names across compilers 
The naming convention for submodule files varies across compilers.  Add
a table to the compiler information modules and thread the information
through to the Fortran module dependency parser.  Fill out the table for
compiler ids known to support Fortran submodules.

Fixes: #18746
 2019-02-14 10:23:02 -05:00
Brad King
72057d9c15 Fortran: Thread compiler id through to internal Fortran parser 2019-02-14 10:23:02 -05:00
Brad King
7ae329e2ed Fortran: Factor out .mod and .smod file name construction 2019-02-14 10:23:02 -05:00