diff options
| author | Brad King <brad.king@kitware.com> | 2024-04-16 12:49:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-04-16 12:49:25 (GMT) |
| commit | c5774572c13d1d72558ebc534943551a3272e706 (patch) | |
| tree | 1f148e7407d78548b8fd2cc35c40272d5353ef53 | |
| parent | 1c9e514d2838fe7cb4b3c8efc682ae762c6891d8 (diff) | |
| parent | 8f89ecb0739bdc07bdee2bbd08d8f53e4604ed8a (diff) | |
| download | CMake-c5774572c13d1d72558ebc534943551a3272e706.zip CMake-c5774572c13d1d72558ebc534943551a3272e706.tar.gz CMake-c5774572c13d1d72558ebc534943551a3272e706.tar.bz2 | |
Merge topic 'lcc-updates-2024-04'
8f89ecb073 Tests: Exclude more tests found to be failing on broken libc on Elbrus
b0551cce64 cmArgumentParserTypes: Workaround for ICE on e2k
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9426
| -rw-r--r-- | Source/cmArgumentParserTypes.h | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Source/cmArgumentParserTypes.h b/Source/cmArgumentParserTypes.h index 7daae09..3e0fae4 100644 --- a/Source/cmArgumentParserTypes.h +++ b/Source/cmArgumentParserTypes.h @@ -4,7 +4,7 @@ #include "cmConfigure.h" // IWYU pragma: keep -#if defined(__SUNPRO_CC) +#if defined(__SUNPRO_CC) || defined(__EDG__) # include <string> # include <vector> diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index a82c79f..9e85179 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -1087,11 +1087,22 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "e2k" AND NOT DEFINED CMake_TEST_E2K_BROKEN_L DEB.CUSTOM_NAMES DEB.DEB_PACKAGE_VERSION_BACK_COMPATIBILITY DEB.PROJECT_META DEB.DEPENDENCIES + DEB.EXTRA + DEB.GENERATE_SHLIBS_LDCONFIG + DEB.LONG_FILENAMES + DEB.MD5SUMS + DEB.EMPTY_DIR + DEB.DEFAULT_PERMISSIONS + DEB.VERSION + DEB.TIMESTAMPS RPM.PARTIALLY_RELOCATABLE_WARNING RPM.PER_COMPONENT_FIELDS RPM.USER_FILELIST RPM.DIST RPM.AUTO_SUFFIXES + 7Z + TXZ + TBZ2 TGZ ZIP STGZ |