Commit Graph

42419 Commits

Author SHA1 Message Date
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 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
Kitware Robot 657b30905a CMake Nightly Date Stamp 2019-02-16 00:01:07 -05: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
Brad King 50ba2f019b Merge topic 'fix-legacy-implicit-includes'
6fc3382944 Update logic for sysroot in detected implicit include directories
2ad14ef4ea cmAlgorithms: Add cmHasPrefix to match existing cmHasSuffix
557b2d6e65 Fix regression in -I/usr/include exclusion logic
017598a444 macOS: Fix addition of <sdk>/usr/include to default implicit include dirs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2957
2019-02-14 10:14:47 -05:00
Brad King fd74eba140 Merge topic 'fix-pointer-truncation'
76a5ac2100 cmListFileLexer: Add missing include to avoid possible pointer truncation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2956
2019-02-14 10:14:08 -05:00
Brad King 49a53cac87 Merge topic 'update-kwsys'
ec13bd5230 Tests: Disable test that builds KWSys if not also building CMake
ded4bc136e Merge branch 'upstream-KWSys' into update-kwsys
f3999a21c8 KWSys 2019-02-12 (44676809)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2953
2019-02-14 10:11:54 -05:00
Brad King 8fc0c98f08 Tests: Fix Module.WriteCompilerDetectionHeader for Intel on Windows
Fix a condition added by commit 091afa7342 (Tests: Teach tests when to
treat clang-cl as MSVC, 2018-11-06) to be specific to Clang.
2019-02-14 09:27:40 -05:00
Brad King 5c26e3c5e3 VS: Fix validation of Windows 8.1 SDK
The check added by commit 0a29a31161 (VS2017: Verify Windows 8.1 SDK
before using it, 2017-04-25, v3.8.1~2^2) used the wrong path to
`windows.h` within the SDK, leading to it never being detected.

Fixes: #18923
2019-02-14 08:25:26 -05:00
Kitware Robot 5b3683ec8a CMake Nightly Date Stamp 2019-02-14 00:01:06 -05:00
Sebastian Holtermann a40864ae53 Autogen: Refactor RerunRccDepends test with fixed timestamp comparison
This refactors and simplifies the QtAutogen.RerunRccDepends test.
Repetitive task are packed into macros.
By using version strings to store file timestamps, timestamp comparison
becomes more reliable.  Test status and error messages are improved.
2019-02-13 23:01:46 +01:00
Sebastian Holtermann 724359489e Autogen: Refactor RerunRccConfigChange test
This refactors and simplifies the QtAutogen.RerunRccConfigChange test.
Repetitive task are packed into macros.
Test status and error messages are improved.
2019-02-13 22:54:32 +01:00
Sebastian Holtermann 6ed4ae4bad Autogen: Refactor RerunMocBasic test with fixed timestamp comparison
This refactors and simplifies the QtAutogen.RerunMocBasic test.
Repetitive task are packed into macros.
By using version strings to store file timestamps, timestamp comparison
becomes more reliable.  Test status and error messages are improved.
2019-02-13 22:54:32 +01:00
Sebastian Holtermann fedbd16f35 Autogen: Refactor RerunMocPlugin test with fixed timestamp comparison
This refactors and simplifies the QtAutogen.RerunMocPlugin test.
Repetitive task are packed into macros.
By using version strings to store file timestamps, timestamp comparison
becomes more reliable.  Test status and error messages are improved.
2019-02-13 22:49:20 +01:00
Saleem Abdulrasool 157570b5a2 Add placeholder for Swift's library name
This allows us to set the proper link name for the Swift library
(soname).  Because this needs to be passed to the object being compiled,
we need to create a new placeholder so that it can be sent along to the
frontend.  Default to the target name unless it is explicitly provided.
2019-02-13 09:25:29 -08:00
Brad King 9f351b93ab Merge branch 'fix-pointer-truncation' into release-3.14
Merge-request: !2956
2019-02-13 10:28:02 -05:00