diff options
73 files changed, 83 insertions, 89 deletions
diff --git a/.gitlab/ci/borland-env.ps1 b/.gitlab/ci/borland-env.ps1 index b3b532e..b3b532e 100755..100644 --- a/.gitlab/ci/borland-env.ps1 +++ b/.gitlab/ci/borland-env.ps1 diff --git a/.gitlab/ci/borland.ps1 b/.gitlab/ci/borland.ps1 index 146a047..146a047 100755..100644 --- a/.gitlab/ci/borland.ps1 +++ b/.gitlab/ci/borland.ps1 diff --git a/.gitlab/ci/clang-env.ps1 b/.gitlab/ci/clang-env.ps1 index 451fca3..451fca3 100755..100644 --- a/.gitlab/ci/clang-env.ps1 +++ b/.gitlab/ci/clang-env.ps1 diff --git a/.gitlab/ci/clang.ps1 b/.gitlab/ci/clang.ps1 index e455ebc..e455ebc 100755..100644 --- a/.gitlab/ci/clang.ps1 +++ b/.gitlab/ci/clang.ps1 diff --git a/.gitlab/ci/cmake-env.ps1 b/.gitlab/ci/cmake-env.ps1 index 505fa44..505fa44 100755..100644 --- a/.gitlab/ci/cmake-env.ps1 +++ b/.gitlab/ci/cmake-env.ps1 diff --git a/.gitlab/ci/cmake.ps1 b/.gitlab/ci/cmake.ps1 index f6b5cc7..f6b5cc7 100755..100644 --- a/.gitlab/ci/cmake.ps1 +++ b/.gitlab/ci/cmake.ps1 diff --git a/.gitlab/ci/env.ps1 b/.gitlab/ci/env.ps1 index 754521b..754521b 100755..100644 --- a/.gitlab/ci/env.ps1 +++ b/.gitlab/ci/env.ps1 diff --git a/.gitlab/ci/env_mingw_osdn_io_mingw_makefiles.ps1 b/.gitlab/ci/env_mingw_osdn_io_mingw_makefiles.ps1 index f6e1f0a..f6e1f0a 100755..100644 --- a/.gitlab/ci/env_mingw_osdn_io_mingw_makefiles.ps1 +++ b/.gitlab/ci/env_mingw_osdn_io_mingw_makefiles.ps1 diff --git a/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 b/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 index f6e1f0a..f6e1f0a 100755..100644 --- a/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 +++ b/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 diff --git a/.gitlab/ci/env_windows_arm64_package.ps1 b/.gitlab/ci/env_windows_arm64_package.ps1 index a898007..a898007 100755..100644 --- a/.gitlab/ci/env_windows_arm64_package.ps1 +++ b/.gitlab/ci/env_windows_arm64_package.ps1 diff --git a/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 b/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 index eb7bf6e..eb7bf6e 100755..100644 --- a/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 +++ b/.gitlab/ci/env_windows_arm64_vs2022_ninja.ps1 diff --git a/.gitlab/ci/env_windows_borland5.5.ps1 b/.gitlab/ci/env_windows_borland5.5.ps1 index 0d2e46b..0d2e46b 100755..100644 --- a/.gitlab/ci/env_windows_borland5.5.ps1 +++ b/.gitlab/ci/env_windows_borland5.5.ps1 diff --git a/.gitlab/ci/env_windows_borland5.8.ps1 b/.gitlab/ci/env_windows_borland5.8.ps1 index 0d2e46b..0d2e46b 100755..100644 --- a/.gitlab/ci/env_windows_borland5.8.ps1 +++ b/.gitlab/ci/env_windows_borland5.8.ps1 diff --git a/.gitlab/ci/env_windows_clang_ninja.ps1 b/.gitlab/ci/env_windows_clang_ninja.ps1 index 17002ef..17002ef 100755..100644 --- a/.gitlab/ci/env_windows_clang_ninja.ps1 +++ b/.gitlab/ci/env_windows_clang_ninja.ps1 diff --git a/.gitlab/ci/env_windows_clang_nmake.ps1 b/.gitlab/ci/env_windows_clang_nmake.ps1 index 89fa360..89fa360 100755..100644 --- a/.gitlab/ci/env_windows_clang_nmake.ps1 +++ b/.gitlab/ci/env_windows_clang_nmake.ps1 diff --git a/.gitlab/ci/env_windows_i386_package.ps1 b/.gitlab/ci/env_windows_i386_package.ps1 index a898007..a898007 100755..100644 --- a/.gitlab/ci/env_windows_i386_package.ps1 +++ b/.gitlab/ci/env_windows_i386_package.ps1 diff --git a/.gitlab/ci/env_windows_intelclassic_ninja.ps1 b/.gitlab/ci/env_windows_intelclassic_ninja.ps1 index 99f83b9..99f83b9 100755..100644 --- a/.gitlab/ci/env_windows_intelclassic_ninja.ps1 +++ b/.gitlab/ci/env_windows_intelclassic_ninja.ps1 diff --git a/.gitlab/ci/env_windows_inteloneapi_ninja.ps1 b/.gitlab/ci/env_windows_inteloneapi_ninja.ps1 index 3bd1d46..3bd1d46 100755..100644 --- a/.gitlab/ci/env_windows_inteloneapi_ninja.ps1 +++ b/.gitlab/ci/env_windows_inteloneapi_ninja.ps1 diff --git a/.gitlab/ci/env_windows_msvc_v71_nmake.ps1 b/.gitlab/ci/env_windows_msvc_v71_nmake.ps1 index cb3806d..cb3806d 100755..100644 --- a/.gitlab/ci/env_windows_msvc_v71_nmake.ps1 +++ b/.gitlab/ci/env_windows_msvc_v71_nmake.ps1 diff --git a/.gitlab/ci/env_windows_openwatcom1.9.ps1 b/.gitlab/ci/env_windows_openwatcom1.9.ps1 index 49c28f7..49c28f7 100755..100644 --- a/.gitlab/ci/env_windows_openwatcom1.9.ps1 +++ b/.gitlab/ci/env_windows_openwatcom1.9.ps1 diff --git a/.gitlab/ci/env_windows_orangec6.73.1.ps1 b/.gitlab/ci/env_windows_orangec6.73.1.ps1 index 96e36a1..96e36a1 100755..100644 --- a/.gitlab/ci/env_windows_orangec6.73.1.ps1 +++ b/.gitlab/ci/env_windows_orangec6.73.1.ps1 diff --git a/.gitlab/ci/env_windows_vs2022_x64.ps1 b/.gitlab/ci/env_windows_vs2022_x64.ps1 index 42aec11..42aec11 100755..100644 --- a/.gitlab/ci/env_windows_vs2022_x64.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64.ps1 diff --git a/.gitlab/ci/env_windows_vs2022_x64_jom.ps1 b/.gitlab/ci/env_windows_vs2022_x64_jom.ps1 index c933421..c933421 100755..100644 --- a/.gitlab/ci/env_windows_vs2022_x64_jom.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64_jom.ps1 diff --git a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 index ae4a058..ae4a058 100755..100644 --- a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 diff --git a/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 index 44bb090..44bb090 100755..100644 --- a/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64_ninja_multi.ps1 diff --git a/.gitlab/ci/env_windows_vs2022_x64_nmake.ps1 b/.gitlab/ci/env_windows_vs2022_x64_nmake.ps1 index 62463cd..62463cd 100755..100644 --- a/.gitlab/ci/env_windows_vs2022_x64_nmake.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64_nmake.ps1 diff --git a/.gitlab/ci/env_windows_x86_64_package.ps1 b/.gitlab/ci/env_windows_x86_64_package.ps1 index a898007..a898007 100755..100644 --- a/.gitlab/ci/env_windows_x86_64_package.ps1 +++ b/.gitlab/ci/env_windows_x86_64_package.ps1 diff --git a/.gitlab/ci/innosetup-env.ps1 b/.gitlab/ci/innosetup-env.ps1 index 96e9d8c..96e9d8c 100755..100644 --- a/.gitlab/ci/innosetup-env.ps1 +++ b/.gitlab/ci/innosetup-env.ps1 diff --git a/.gitlab/ci/innosetup.ps1 b/.gitlab/ci/innosetup.ps1 index a7f4eb3..a7f4eb3 100755..100644 --- a/.gitlab/ci/innosetup.ps1 +++ b/.gitlab/ci/innosetup.ps1 diff --git a/.gitlab/ci/intel-env.ps1 b/.gitlab/ci/intel-env.ps1 index 75f7286..75f7286 100755..100644 --- a/.gitlab/ci/intel-env.ps1 +++ b/.gitlab/ci/intel-env.ps1 diff --git a/.gitlab/ci/intel-vars.ps1 b/.gitlab/ci/intel-vars.ps1 index dde0aa2..dde0aa2 100755..100644 --- a/.gitlab/ci/intel-vars.ps1 +++ b/.gitlab/ci/intel-vars.ps1 diff --git a/.gitlab/ci/intel.ps1 b/.gitlab/ci/intel.ps1 index 2262669..2262669 100755..100644 --- a/.gitlab/ci/intel.ps1 +++ b/.gitlab/ci/intel.ps1 diff --git a/.gitlab/ci/ispc-env.ps1 b/.gitlab/ci/ispc-env.ps1 index 816c485..816c485 100755..100644 --- a/.gitlab/ci/ispc-env.ps1 +++ b/.gitlab/ci/ispc-env.ps1 diff --git a/.gitlab/ci/ispc.ps1 b/.gitlab/ci/ispc.ps1 index 524896f..524896f 100755..100644 --- a/.gitlab/ci/ispc.ps1 +++ b/.gitlab/ci/ispc.ps1 diff --git a/.gitlab/ci/jom.ps1 b/.gitlab/ci/jom.ps1 index 6c28005..6c28005 100755..100644 --- a/.gitlab/ci/jom.ps1 +++ b/.gitlab/ci/jom.ps1 diff --git a/.gitlab/ci/mingw-env.ps1 b/.gitlab/ci/mingw-env.ps1 index d68a7f7..d68a7f7 100755..100644 --- a/.gitlab/ci/mingw-env.ps1 +++ b/.gitlab/ci/mingw-env.ps1 diff --git a/.gitlab/ci/mingw.ps1 b/.gitlab/ci/mingw.ps1 index a1b5b11..a1b5b11 100755..100644 --- a/.gitlab/ci/mingw.ps1 +++ b/.gitlab/ci/mingw.ps1 diff --git a/.gitlab/ci/msvc.ps1 b/.gitlab/ci/msvc.ps1 index e8388a4..e8388a4 100755..100644 --- a/.gitlab/ci/msvc.ps1 +++ b/.gitlab/ci/msvc.ps1 diff --git a/.gitlab/ci/ninja-env.ps1 b/.gitlab/ci/ninja-env.ps1 index 67c7036..67c7036 100755..100644 --- a/.gitlab/ci/ninja-env.ps1 +++ b/.gitlab/ci/ninja-env.ps1 diff --git a/.gitlab/ci/ninja-nightly.ps1 b/.gitlab/ci/ninja-nightly.ps1 index 071b077..071b077 100755..100644 --- a/.gitlab/ci/ninja-nightly.ps1 +++ b/.gitlab/ci/ninja-nightly.ps1 diff --git a/.gitlab/ci/ninja.ps1 b/.gitlab/ci/ninja.ps1 index 0af3b4f..0af3b4f 100755..100644 --- a/.gitlab/ci/ninja.ps1 +++ b/.gitlab/ci/ninja.ps1 diff --git a/.gitlab/ci/openwatcom-env.ps1 b/.gitlab/ci/openwatcom-env.ps1 index 14ea523..14ea523 100755..100644 --- a/.gitlab/ci/openwatcom-env.ps1 +++ b/.gitlab/ci/openwatcom-env.ps1 diff --git a/.gitlab/ci/openwatcom.ps1 b/.gitlab/ci/openwatcom.ps1 index 4f1012c..4f1012c 100755..100644 --- a/.gitlab/ci/openwatcom.ps1 +++ b/.gitlab/ci/openwatcom.ps1 diff --git a/.gitlab/ci/orangec-env.ps1 b/.gitlab/ci/orangec-env.ps1 index 3a5d232..3a5d232 100755..100644 --- a/.gitlab/ci/orangec-env.ps1 +++ b/.gitlab/ci/orangec-env.ps1 diff --git a/.gitlab/ci/orangec.ps1 b/.gitlab/ci/orangec.ps1 index 2201e12..2201e12 100755..100644 --- a/.gitlab/ci/orangec.ps1 +++ b/.gitlab/ci/orangec.ps1 diff --git a/.gitlab/ci/package_windows.ps1 b/.gitlab/ci/package_windows.ps1 index 9ec2942..9ec2942 100755..100644 --- a/.gitlab/ci/package_windows.ps1 +++ b/.gitlab/ci/package_windows.ps1 diff --git a/.gitlab/ci/post_build.ps1 b/.gitlab/ci/post_build.ps1 index fbd8ae8..fbd8ae8 100755..100644 --- a/.gitlab/ci/post_build.ps1 +++ b/.gitlab/ci/post_build.ps1 diff --git a/.gitlab/ci/post_build_windows_arm64_package.ps1 b/.gitlab/ci/post_build_windows_arm64_package.ps1 index f98d995..f98d995 100755..100644 --- a/.gitlab/ci/post_build_windows_arm64_package.ps1 +++ b/.gitlab/ci/post_build_windows_arm64_package.ps1 diff --git a/.gitlab/ci/post_build_windows_i386_package.ps1 b/.gitlab/ci/post_build_windows_i386_package.ps1 index f98d995..f98d995 100755..100644 --- a/.gitlab/ci/post_build_windows_i386_package.ps1 +++ b/.gitlab/ci/post_build_windows_i386_package.ps1 diff --git a/.gitlab/ci/post_build_windows_x86_64_package.ps1 b/.gitlab/ci/post_build_windows_x86_64_package.ps1 index f98d995..f98d995 100755..100644 --- a/.gitlab/ci/post_build_windows_x86_64_package.ps1 +++ b/.gitlab/ci/post_build_windows_x86_64_package.ps1 diff --git a/.gitlab/ci/pre_build.ps1 b/.gitlab/ci/pre_build.ps1 index 3a56687..3a56687 100755..100644 --- a/.gitlab/ci/pre_build.ps1 +++ b/.gitlab/ci/pre_build.ps1 diff --git a/.gitlab/ci/python-env.ps1 b/.gitlab/ci/python-env.ps1 index ce16493..ce16493 100755..100644 --- a/.gitlab/ci/python-env.ps1 +++ b/.gitlab/ci/python-env.ps1 diff --git a/.gitlab/ci/python.ps1 b/.gitlab/ci/python.ps1 index 27f1807..27f1807 100755..100644 --- a/.gitlab/ci/python.ps1 +++ b/.gitlab/ci/python.ps1 diff --git a/.gitlab/ci/qt-env.ps1 b/.gitlab/ci/qt-env.ps1 index 22b1099..22b1099 100755..100644 --- a/.gitlab/ci/qt-env.ps1 +++ b/.gitlab/ci/qt-env.ps1 diff --git a/.gitlab/ci/repackage/wix.ps1 b/.gitlab/ci/repackage/wix.ps1 index 6dbd466..6dbd466 100755..100644 --- a/.gitlab/ci/repackage/wix.ps1 +++ b/.gitlab/ci/repackage/wix.ps1 diff --git a/.gitlab/ci/sccache-env.ps1 b/.gitlab/ci/sccache-env.ps1 index 66dc6eb..66dc6eb 100755..100644 --- a/.gitlab/ci/sccache-env.ps1 +++ b/.gitlab/ci/sccache-env.ps1 diff --git a/.gitlab/ci/swift-env.ps1 b/.gitlab/ci/swift-env.ps1 index 871b31c..871b31c 100755..100644 --- a/.gitlab/ci/swift-env.ps1 +++ b/.gitlab/ci/swift-env.ps1 diff --git a/.gitlab/ci/swift.ps1 b/.gitlab/ci/swift.ps1 index b970dce..b970dce 100755..100644 --- a/.gitlab/ci/swift.ps1 +++ b/.gitlab/ci/swift.ps1 diff --git a/.gitlab/ci/vcvarsall.ps1 b/.gitlab/ci/vcvarsall.ps1 index f91b100..f91b100 100755..100644 --- a/.gitlab/ci/vcvarsall.ps1 +++ b/.gitlab/ci/vcvarsall.ps1 diff --git a/.gitlab/ci/wix3-env.ps1 b/.gitlab/ci/wix3-env.ps1 index a872b74..a872b74 100755..100644 --- a/.gitlab/ci/wix3-env.ps1 +++ b/.gitlab/ci/wix3-env.ps1 diff --git a/.gitlab/ci/wix3.ps1 b/.gitlab/ci/wix3.ps1 index 8f5ae4b..8f5ae4b 100755..100644 --- a/.gitlab/ci/wix3.ps1 +++ b/.gitlab/ci/wix3.ps1 diff --git a/.gitlab/ci/wix4.ps1 b/.gitlab/ci/wix4.ps1 index 6209f2b..6209f2b 100755..100644 --- a/.gitlab/ci/wix4.ps1 +++ b/.gitlab/ci/wix4.ps1 diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 1df33a8..bd21e3d 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -990,7 +990,7 @@ if( NOT HDF5_FOUND ) HDF5_VERSION_DEFINE REGEX "^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+" ) if( "${HDF5_VERSION_DEFINE}" MATCHES - "H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)(-patch([0-9]+))?\"" ) + "H5_VERSION[ \t]+\"([0-9\\.]+)(-patch([0-9]+))?\"" ) set( HDF5_VERSION "${CMAKE_MATCH_1}" ) if( CMAKE_MATCH_3 ) set( HDF5_VERSION ${HDF5_VERSION}.${CMAKE_MATCH_3}) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 2f4c8ff..7170842 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 29) -set(CMake_VERSION_PATCH 20240430) +set(CMake_VERSION_PATCH 20240501) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) diff --git a/Source/LexerParser/cmGccDepfileLexer.cxx b/Source/LexerParser/cmGccDepfileLexer.cxx index ca5577e..d926c8b 100644 --- a/Source/LexerParser/cmGccDepfileLexer.cxx +++ b/Source/LexerParser/cmGccDepfileLexer.cxx @@ -548,8 +548,8 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 12 -#define YY_END_OF_BUFFER 13 +#define YY_NUM_RULES 13 +#define YY_END_OF_BUFFER 14 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -557,11 +557,12 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[31] = +static const flex_int16_t yy_accept[32] = { 0, - 0, 0, 13, 11, 9, 6, 11, 10, 11, 11, - 11, 9, 0, 6, 10, 1, 8, 7, 0, 0, - 5, 0, 3, 2, 0, 8, 0, 4, 0, 0 + 0, 0, 14, 12, 10, 7, 12, 11, 12, 12, + 12, 10, 0, 7, 11, 1, 9, 8, 0, 0, + 6, 0, 4, 2, 3, 0, 9, 0, 5, 0, + 0 } ; static const YY_CHAR yy_ec[256] = @@ -601,40 +602,40 @@ static const YY_CHAR yy_meta[11] = 1, 2, 1, 1, 2, 1, 1, 1, 1, 3 } ; -static const flex_int16_t yy_base[33] = +static const flex_int16_t yy_base[34] = { 0, - 0, 0, 36, 46, 25, 46, 31, 27, 18, 9, + 0, 0, 39, 46, 26, 46, 32, 28, 25, 9, 17, 15, 25, 46, 17, 46, 0, 46, 15, 27, - 46, 14, 46, 46, 27, 46, 13, 46, 33, 46, - 42, 13 + 46, 14, 46, 46, 46, 27, 46, 13, 46, 33, + 46, 42, 13 } ; -static const flex_int16_t yy_def[33] = +static const flex_int16_t yy_def[34] = { 0, - 30, 1, 30, 30, 31, 30, 30, 30, 30, 30, - 30, 31, 30, 30, 30, 30, 32, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 0, - 30, 30 + 31, 1, 31, 31, 32, 31, 31, 31, 31, 31, + 31, 32, 31, 31, 31, 31, 33, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 0, 31, 31 } ; static const flex_int16_t yy_nxt[57] = { 0, 4, 5, 6, 7, 5, 8, 4, 9, 10, 11, - 17, 18, 19, 17, 17, 26, 21, 18, 20, 21, - 22, 23, 15, 24, 13, 16, 25, 21, 22, 26, - 27, 28, 15, 14, 13, 30, 29, 23, 30, 30, - 30, 30, 25, 12, 12, 3, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30 + 17, 18, 19, 17, 17, 27, 21, 18, 20, 21, + 22, 23, 15, 24, 13, 25, 26, 21, 22, 27, + 28, 29, 16, 15, 14, 13, 30, 23, 31, 31, + 31, 31, 26, 12, 12, 3, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31 } ; static const flex_int16_t yy_chk[57] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 10, 10, 10, 10, 32, 27, 22, 19, 10, 11, - 11, 11, 15, 11, 12, 9, 11, 13, 13, 20, - 20, 25, 8, 7, 5, 3, 25, 29, 0, 0, - 0, 0, 29, 31, 31, 30, 30, 30, 30, 30, - 30, 30, 30, 30, 30, 30 + 10, 10, 10, 10, 33, 28, 22, 19, 10, 11, + 11, 11, 15, 11, 12, 11, 11, 13, 13, 20, + 20, 26, 9, 8, 7, 5, 26, 30, 3, 0, + 0, 0, 30, 32, 32, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31 } ; /* The intent behind this definition is that it'll catch @@ -930,7 +931,7 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 31 ) + if ( yy_current_state >= 32 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -977,6 +978,13 @@ YY_RULE_SETUP case 3: YY_RULE_SETUP { + // Unescape the colon. + yyextra->addToCurrentPath(":"); + } + YY_BREAK +case 4: +YY_RULE_SETUP +{ // 2N+1 backslashes plus space -> N backslashes plus space. size_t c = (strlen(yytext) - 1) / 2; std::string s(c, '\\'); @@ -984,7 +992,7 @@ YY_RULE_SETUP yyextra->addToCurrentPath(s.c_str()); } YY_BREAK -case 4: +case 5: YY_RULE_SETUP { // 2N backslashes plus space -> 2N backslashes, end of filename. @@ -993,24 +1001,24 @@ YY_RULE_SETUP yyextra->newDependency(); } YY_BREAK -case 5: -/* rule 5 can match eol */ +case 6: +/* rule 6 can match eol */ YY_RULE_SETUP { // A line continuation ends the current file name. yyextra->newRuleOrDependency(); } YY_BREAK -case 6: -/* rule 6 can match eol */ +case 7: +/* rule 7 can match eol */ YY_RULE_SETUP { // A newline ends the current file name and the current rule. yyextra->newEntry(); } YY_BREAK -case 7: -/* rule 7 can match eol */ +case 8: +/* rule 8 can match eol */ YY_RULE_SETUP { // A colon ends the rules @@ -1019,8 +1027,8 @@ YY_RULE_SETUP yyextra->newEntry(); } YY_BREAK -case 8: -/* rule 8 can match eol */ +case 9: +/* rule 9 can match eol */ YY_RULE_SETUP { // A colon followed by space or line continuation ends the rules @@ -1028,28 +1036,28 @@ YY_RULE_SETUP yyextra->newDependency(); } YY_BREAK -case 9: +case 10: YY_RULE_SETUP { // Rules and dependencies are separated by blocks of whitespace. yyextra->newRuleOrDependency(); } YY_BREAK -case 10: +case 11: YY_RULE_SETUP { // Got a span of plain text. yyextra->addToCurrentPath(yytext); } YY_BREAK -case 11: +case 12: YY_RULE_SETUP { // Got an otherwise unmatched character. yyextra->addToCurrentPath(yytext); } YY_BREAK -case 12: +case 13: YY_RULE_SETUP ECHO; YY_BREAK @@ -1351,7 +1359,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 31 ) + if ( yy_current_state >= 32 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -1380,11 +1388,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 31 ) + if ( yy_current_state >= 32 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 30); + yy_is_jam = (yy_current_state == 31); (void)yyg; return yy_is_jam ? 0 : yy_current_state; diff --git a/Source/LexerParser/cmGccDepfileLexer.in.l b/Source/LexerParser/cmGccDepfileLexer.in.l index 6336b5f..a0a0f22 100644 --- a/Source/LexerParser/cmGccDepfileLexer.in.l +++ b/Source/LexerParser/cmGccDepfileLexer.in.l @@ -27,6 +27,10 @@ NEWLINE \r?\n // Unescape the hash. yyextra->addToCurrentPath("#"); } +\\: { + // Unescape the colon. + yyextra->addToCurrentPath(":"); + } (\\\\)*\\[ ] { // 2N+1 backslashes plus space -> N backslashes plus space. size_t c = (strlen(yytext) - 1) / 2; diff --git a/Tests/Architecture/CMakeLists.txt b/Tests/Architecture/CMakeLists.txt index 3d10ee0..8b3d0af 100644 --- a/Tests/Architecture/CMakeLists.txt +++ b/Tests/Architecture/CMakeLists.txt @@ -1,30 +1,21 @@ cmake_minimum_required(VERSION 3.5) project(Architecture C) -function(test_for_xcode4 result_var) - set(${result_var} 0 PARENT_SCOPE) - if(APPLE) - execute_process(COMMAND xcodebuild -version - OUTPUT_VARIABLE ov RESULT_VARIABLE rv - ) - if("${rv}" STREQUAL "0" AND ov MATCHES "^Xcode ([0-9]+)\\.") - if(NOT CMAKE_MATCH_1 VERSION_LESS 4) - set(${result_var} 1 PARENT_SCOPE) - endif() - endif() - endif() -endfunction() - -test_for_xcode4(is_xcode4) - -set(arch0 i386) -set(arch1 ppc) - -if(is_xcode4) - # Xcode 4, use modern architectures as defaults - # Arch 'ppc' no longer works: tools no longer available starting with Xcode 4 +if (CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 12) + # Since Xcode 12 we have two architectures again: arm64 and x86_64. + set(arch0 x86_64) + set(arch1 arm64) +elseif(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 10) + # Xcode 10 / 11 do not have two supported architectures for the host. + message(STATUS "Skip test x86_64 only") + return() +elseif(CMake_TEST_XCODE_VERSION VERSION_GREATER_EQUAL 4) + # Xcode 4 no longer supports ppc, but does support x86_64. set(arch0 i386) set(arch1 x86_64) +else() + set(arch0 i386) + set(arch1 ppc) endif() add_library(foo foo.c) @@ -43,7 +34,6 @@ if(CMAKE_OSX_ARCHITECTURES) endif() endif() -message("is_xcode4='${is_xcode4}'") message("archs='${archs}'") message("arch0='${arch0}'") message("arch1='${arch1}'") diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt index 5ddae83..dbafc85 100644 --- a/Tests/BuildDepends/CMakeLists.txt +++ b/Tests/BuildDepends/CMakeLists.txt @@ -47,6 +47,10 @@ if(NOT CMAKE_GENERATOR MATCHES "Visual Studio ([^9]|9[0-9])") list(APPEND _cmake_options "-DTEST_MULTI3=1") endif() +if (APPLE) + list(APPEND _cmake_options "-DCMake_TEST_XCODE_VERSION=${CMake_TEST_XCODE_VERSION}") +endif() + file(MAKE_DIRECTORY ${BuildDepends_BINARY_DIR}/Project) message("Creating Project/foo.cxx") write_file(${BuildDepends_BINARY_DIR}/Project/foo.cxx diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt index a320d53..2abda2e 100644 --- a/Tests/BuildDepends/Project/CMakeLists.txt +++ b/Tests/BuildDepends/Project/CMakeLists.txt @@ -1,19 +1,7 @@ cmake_minimum_required(VERSION 2.6) project(testRebuild) -if(APPLE) - set(CMake_TEST_XCODE_VERSION 0) - if(XCODE_VERSION) - set(CMake_TEST_XCODE_VERSION "${XCODE_VERSION}") - else() - execute_process( - COMMAND xcodebuild -version - OUTPUT_VARIABLE _version ERROR_VARIABLE _version_err - ) - if(_version MATCHES "^Xcode ([0-9]+(\\.[0-9]+)*)") - set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}") - endif() - endif() +if(APPLE AND CMake_TEST_XCODE_VERSION) # only use multi-arch if the sysroot exists on this machine # Ninja needs -M which could not be used with multiple -arch flags if(EXISTS "${CMAKE_OSX_SYSROOT}" AND NOT "${CMAKE_GENERATOR}" MATCHES "Ninja") diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5d9d193..a75f6c2 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -299,25 +299,20 @@ if(BUILD_TESTING) "Should the tests that use '--build-target package' be run?" ON) mark_as_advanced(CTEST_TEST_CPACK) - set(CTEST_TEST_OSX_ARCH 0) set(CMake_TEST_XCODE_VERSION 0) if(APPLE) - set(CTEST_TEST_OSX_ARCH 1) if(XCODE_VERSION) set(CMake_TEST_XCODE_VERSION "${XCODE_VERSION}") else() execute_process( COMMAND xcodebuild -version - OUTPUT_VARIABLE _version ERROR_VARIABLE _version_err + OUTPUT_VARIABLE _version + RESULT_VARIABLE _failed ) - if(_version MATCHES "^Xcode ([0-9]+(\\.[0-9]+)*)") + if(NOT _failed AND _version MATCHES "^Xcode ([0-9]+(\\.[0-9]+)*)") set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}") endif() endif() - if(NOT CMake_TEST_XCODE_VERSION VERSION_LESS 10) - # Since Xcode 10 we do not have two supported architectures for the host. - set(CTEST_TEST_OSX_ARCH 0) - endif() if(CMAKE_OSX_SYSROOT) execute_process( COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version ProductName @@ -578,10 +573,13 @@ if(BUILD_TESTING) if("${CMAKE_GENERATOR}" MATCHES "Make") ADD_TEST_MACRO(Policy0002 Policy0002) endif() - if(CTEST_TEST_OSX_ARCH) + if(CMake_TEST_XCODE_VERSION) + set(Architecture_BUILD_OPTIONS -DCMake_TEST_XCODE_VERSION=${CMake_TEST_XCODE_VERSION}) ADD_TEST_MACRO(Architecture Architecture) set_tests_properties(Architecture PROPERTIES PASS_REGULAR_EXPRESSION "(file is not of required architecture|does not match cputype|not the architecture being linked|but attempting to link with file built for)") + set_property(TEST Architecture APPEND PROPERTY + PASS_REGULAR_EXPRESSION "Skip test x86_64 only|found architecture '.*', required architecture '.*'") endif() list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX}) @@ -949,6 +947,8 @@ if(BUILD_TESTING) "${CMake_BINARY_DIR}/Tests/BuildDepends" ${build_generator_args} --build-project BuildDepends + --build-options + "-DCMake_TEST_XCODE_VERSION=${CMake_TEST_XCODE_VERSION}" ) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BuildDepends") diff --git a/Tests/RunCMake/CPack_WIX/print-msi.ps1 b/Tests/RunCMake/CPack_WIX/print-msi.ps1 index 01fdbc8..01fdbc8 100755..100644 --- a/Tests/RunCMake/CPack_WIX/print-msi.ps1 +++ b/Tests/RunCMake/CPack_WIX/print-msi.ps1 diff --git a/Utilities/Release/win/qt-5.15.10-win-x86-msvc.ps1 b/Utilities/Release/win/qt-5.15.10-win-x86-msvc.ps1 index e1d9ad1..e1d9ad1 100755..100644 --- a/Utilities/Release/win/qt-5.15.10-win-x86-msvc.ps1 +++ b/Utilities/Release/win/qt-5.15.10-win-x86-msvc.ps1 diff --git a/Utilities/Release/win/sign-package.ps1 b/Utilities/Release/win/sign-package.ps1 index fdaff14..fdaff14 100755..100644 --- a/Utilities/Release/win/sign-package.ps1 +++ b/Utilities/Release/win/sign-package.ps1 |