From 74e0173f660c74fec03259f3c123ad93a2e1fff0 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Sat, 4 Jan 2025 20:38:00 +0400 Subject: Tests(NuGet): Fix the test to ignore empty and space-only lines --- Tests/RunCMake/CPack_NuGet/.gitattributes | 3 --- Tests/RunCMake/CPack_NuGet/NuGetLib-cpack-NuGet-check.cmake | 4 ++-- Tests/RunCMake/CPack_NuGet/expected.nuspec | 12 ------------ 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 Tests/RunCMake/CPack_NuGet/.gitattributes diff --git a/Tests/RunCMake/CPack_NuGet/.gitattributes b/Tests/RunCMake/CPack_NuGet/.gitattributes deleted file mode 100644 index 4a8bbd0..0000000 --- a/Tests/RunCMake/CPack_NuGet/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -# Do not check whitespace in the nuspec file for comparison. It needs to -# look identical to the file generated in the test. -expected.nuspec -whitespace diff --git a/Tests/RunCMake/CPack_NuGet/NuGetLib-cpack-NuGet-check.cmake b/Tests/RunCMake/CPack_NuGet/NuGetLib-cpack-NuGet-check.cmake index e83f007..6e930b6 100644 --- a/Tests/RunCMake/CPack_NuGet/NuGetLib-cpack-NuGet-check.cmake +++ b/Tests/RunCMake/CPack_NuGet/NuGetLib-cpack-NuGet-check.cmake @@ -3,9 +3,9 @@ if(NOT generated_nuspec) set(RunCMake_TEST_FAILED "No nuspec file generated under ${RunCMake_TEST_BINARY_DIR}") else() # Read in the generated nuspec file content - file(READ "${generated_nuspec}" actual_nuspec) + file(STRINGS "${generated_nuspec}" actual_nuspec REGEX "^.*[^ ]+$") # Read in the expected file content - file(READ "${CMAKE_CURRENT_LIST_DIR}/expected.nuspec" expected_nuspec) + file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/expected.nuspec" expected_nuspec REGEX "^.*[^ ]+$") # Compare the file contents string(COMPARE EQUAL "${actual_nuspec}" "${expected_nuspec}" nuspec_matches) diff --git a/Tests/RunCMake/CPack_NuGet/expected.nuspec b/Tests/RunCMake/CPack_NuGet/expected.nuspec index d5c6c45..3d96df0 100644 --- a/Tests/RunCMake/CPack_NuGet/expected.nuspec +++ b/Tests/RunCMake/CPack_NuGet/expected.nuspec @@ -6,22 +6,11 @@ 1.2.3 - - - - - - - - - - - @@ -34,5 +23,4 @@ - -- cgit v0.12 From 78e45c2db619e148716b77c5c05b4b699c2a7d59 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Sat, 4 Jan 2025 21:38:04 +0400 Subject: Style: Replace TABs with spaces for indentation in some files Mark files that must use TABs to indent in the `.gitattributes`. Use space instead of TABs in sources and some data/test files. --- .gitattributes | 21 ++ Auxiliary/vim/.gitattributes | 1 + Modules/Internal/CPack/.gitattributes | 2 + Templates/.gitattributes | 1 + .../testVisualStudioSlnParser_data/.gitattributes | 2 +- Tests/CMakeTests/.gitattributes | 1 + Tests/CTestTestLabelRegExp/test.cmake.in | 4 +- Tests/CTestTestSerialInDepends/test.ctest | 8 +- Tests/MFC/mfc1/ReadMe.txt | 12 +- Tests/MFC/mfc1/mfc1.rc | 352 ++++++++++----------- Tests/MSManifest/Subdir2/test_manifest1.in | 2 +- Tests/MSManifest/Subdir2/test_manifest2.in | 18 +- Tests/MumpsCoverage/.gitattributes | 1 + Tests/RunCMake/ParseImplicitData/.gitattributes | 1 + Tests/RunCMake/RunCPack/AppWiX/patch.xml | 10 +- Tests/RunCMake/VS10Project/my.props | 4 +- Tests/iOSNavApp/Classes/NavApp3AppDelegate.m | 6 +- Tests/iOSNavApp/Classes/RootViewController.m | 20 +- Utilities/Release/WiX/CustomAction/.gitattributes | 1 + bootstrap | 9 +- 20 files changed, 253 insertions(+), 223 deletions(-) create mode 100644 Auxiliary/vim/.gitattributes create mode 100644 Modules/Internal/CPack/.gitattributes create mode 100644 Templates/.gitattributes create mode 100644 Tests/RunCMake/ParseImplicitData/.gitattributes create mode 100644 Utilities/Release/WiX/CustomAction/.gitattributes diff --git a/.gitattributes b/.gitattributes index 96a1166..5e2a546 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,6 +10,9 @@ # Do not perform whitespace checks. Do not format. [attr]generated whitespace=-tab-in-indent,-indent-with-non-tab -format.clang-format +# Custom attribute to mark files as TABs indented. +[attr]tab-indent whitespace=-tab-in-indent + bootstrap eol=lf configure eol=lf *.[1-9] eol=lf @@ -22,6 +25,24 @@ configure eol=lf *.sln eol=crlf *.vcproj eol=crlf +Makefile tab-indent +Makefile.in tab-indent +NSIS.template.in tab-indent +coverage.xml.in tab-indent +*.F tab-indent +*.f tab-indent +*.pbxproj.in tab-indent +*.plist.in tab-indent +*.plist tab-indent +*.sln tab-indent +*.s tab-indent +*.vcproj tab-indent +*.vcproj.in tab-indent +*.vfproj.in tab-indent +*.xib tab-indent +*.make tab-indent +.hooks-config tab-indent + *.pfx -text *.png -text *.png.in -text diff --git a/Auxiliary/vim/.gitattributes b/Auxiliary/vim/.gitattributes new file mode 100644 index 0000000..c40dd66 --- /dev/null +++ b/Auxiliary/vim/.gitattributes @@ -0,0 +1 @@ +extract-upper-case.pl tab-indent diff --git a/Modules/Internal/CPack/.gitattributes b/Modules/Internal/CPack/.gitattributes new file mode 100644 index 0000000..ecc9de5 --- /dev/null +++ b/Modules/Internal/CPack/.gitattributes @@ -0,0 +1,2 @@ +# TODO Check if `CPack.distribution.dist.in` could use spaces +CPack.distribution.dist.in tab-indent diff --git a/Templates/.gitattributes b/Templates/.gitattributes new file mode 100644 index 0000000..11b4621 --- /dev/null +++ b/Templates/.gitattributes @@ -0,0 +1 @@ +CPack.GenericLicense.txt conflict-marker-size=79 diff --git a/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes b/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes index 08b4ac4..f8e68b5 100644 --- a/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes +++ b/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes @@ -1 +1 @@ -*.sln-file eol=crlf +*.sln-file eol=crlf tab-indent diff --git a/Tests/CMakeTests/.gitattributes b/Tests/CMakeTests/.gitattributes index c6148fb..d32296d 100644 --- a/Tests/CMakeTests/.gitattributes +++ b/Tests/CMakeTests/.gitattributes @@ -1 +1,2 @@ File-HASH-Input.txt eol=lf +ImplicitLinkInfoTest.cmake.in tab-indent diff --git a/Tests/CTestTestLabelRegExp/test.cmake.in b/Tests/CTestTestLabelRegExp/test.cmake.in index dd40c3b..f1ccd3a 100644 --- a/Tests/CTestTestLabelRegExp/test.cmake.in +++ b/Tests/CTestTestLabelRegExp/test.cmake.in @@ -5,8 +5,8 @@ function(get_test_list TEST_LIST) execute_process(COMMAND ${QUERY_COMMAND} RESULT_VARIABLE RESULT - OUTPUT_VARIABLE OUTPUT - ERROR_VARIABLE ERROR) + OUTPUT_VARIABLE OUTPUT + ERROR_VARIABLE ERROR) if(NOT ${RESULT} STREQUAL "0") message(FATAL_ERROR "command [${QUERY_COMMAND}] failed: RESULT[${RESULT}] OUTPUT[${OUTPUT}] ERROR[${ERROR}]") diff --git a/Tests/CTestTestSerialInDepends/test.ctest b/Tests/CTestTestSerialInDepends/test.ctest index 71c6da2..a3e79f6 100644 --- a/Tests/CTestTestSerialInDepends/test.ctest +++ b/Tests/CTestTestSerialInDepends/test.ctest @@ -4,10 +4,10 @@ set(LOCK_FILE "${TEST_NAME}.lock") file(REMOVE "${LOCK_FILE}") if("${TEST_NAME}" STREQUAL "i_want_to_be_alone") - file(GLOB LOCK_FILES *.lock) - if(LOCK_FILES) - message(FATAL_ERROR "found lock files of other tests even though this test should be running by itself: ${LOCK_FILES}") - endif() + file(GLOB LOCK_FILES *.lock) + if(LOCK_FILES) + message(FATAL_ERROR "found lock files of other tests even though this test should be running by itself: ${LOCK_FILES}") + endif() endif() file(WRITE "${LOCK_FILE}") diff --git a/Tests/MFC/mfc1/ReadMe.txt b/Tests/MFC/mfc1/ReadMe.txt index d84608e..bf8a845 100644 --- a/Tests/MFC/mfc1/ReadMe.txt +++ b/Tests/MFC/mfc1/ReadMe.txt @@ -110,12 +110,12 @@ Resource.h Microsoft Visual C++ reads and updates this file. mfc1.manifest - Application manifest files are used by Windows XP to describe an applications - dependency on specific versions of Side-by-Side assemblies. The loader uses this - information to load the appropriate assembly from the assembly cache or private - from the application. The Application manifest maybe included for redistribution - as an external .manifest file that is installed in the same folder as the application - executable or it may be included in the executable in the form of a resource. + Application manifest files are used by Windows XP to describe an applications + dependency on specific versions of Side-by-Side assemblies. The loader uses this + information to load the appropriate assembly from the assembly cache or private + from the application. The Application manifest maybe included for redistribution + as an external .manifest file that is installed in the same folder as the application + executable or it may be included in the executable in the form of a resource. ///////////////////////////////////////////////////////////////////////////// Other notes: diff --git a/Tests/MFC/mfc1/mfc1.rc b/Tests/MFC/mfc1/mfc1.rc index 346c5fb..4e5710c 100644 --- a/Tests/MFC/mfc1/mfc1.rc +++ b/Tests/MFC/mfc1/mfc1.rc @@ -22,13 +22,13 @@ 1 TEXTINCLUDE BEGIN - "resource.h\0" + "resource.h\0" END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" - "\0" + "#include ""afxres.h""\r\n" + "\0" END 3 TEXTINCLUDE @@ -37,15 +37,15 @@ BEGIN "#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_TRACKER_RESOURCES\r\n" "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#include ""res\\mfc1.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#include ""afxprint.rc"" // printing/print preview resources\r\n" - "#endif\r\n" - "\0" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "LANGUAGE 9, 1\r\n" + "#pragma code_page(1252)\r\n" + "#include ""res\\mfc1.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#include ""afxprint.rc"" // printing/print preview resources\r\n" + "#endif\r\n" + "\0" END #endif // APSTUDIO_INVOKED @@ -82,11 +82,11 @@ BEGIN BUTTON ID_FILE_NEW BUTTON ID_FILE_OPEN BUTTON ID_FILE_SAVE - SEPARATOR + SEPARATOR BUTTON ID_EDIT_CUT BUTTON ID_EDIT_COPY BUTTON ID_EDIT_PASTE - SEPARATOR + SEPARATOR BUTTON ID_FILE_PRINT BUTTON ID_APP_ABOUT END @@ -103,70 +103,70 @@ LANGUAGE 9, 1 IDR_MAINFRAME MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "&New\tCtrl+N", ID_FILE_NEW - MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN - MENUITEM SEPARATOR - MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP - MENUITEM SEPARATOR - MENUITEM "Recent File", ID_FILE_MRU_FILE1,GRAYED - MENUITEM SEPARATOR - MENUITEM "&Close", ID_FILE_CLOSE - MENUITEM "E&xit", ID_APP_EXIT - END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOLBAR - MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR - END - POPUP "&Help" - BEGIN - MENUITEM "&About mfc1...", ID_APP_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP + MENUITEM SEPARATOR + MENUITEM "Recent File", ID_FILE_MRU_FILE1,GRAYED + MENUITEM SEPARATOR + MENUITEM "&Close", ID_FILE_CLOSE + MENUITEM "E&xit", ID_APP_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOLBAR + MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR + END + POPUP "&Help" + BEGIN + MENUITEM "&About mfc1...", ID_APP_ABOUT + END END IDR_mfc1TYPE MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "&New\tCtrl+N", ID_FILE_NEW - MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Close", ID_FILE_CLOSE - MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE - MENUITEM "Save &As...", ID_FILE_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT - MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW - MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP - MENUITEM SEPARATOR - MENUITEM "Recent File", ID_FILE_MRU_FILE1,GRAYED - MENUITEM SEPARATOR - MENUITEM "E&xit", ID_APP_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo\tCtrl+Z", ID_EDIT_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE - END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOLBAR - MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR - END - POPUP "&Window" - BEGIN - MENUITEM "&New Window", ID_WINDOW_NEW - MENUITEM "&Cascade", ID_WINDOW_CASCADE - MENUITEM "&Tile", ID_WINDOW_TILE_HORZ - MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE - END - POPUP "&Help" - BEGIN - MENUITEM "&About mfc1...", ID_APP_ABOUT - END + POPUP "&File" + BEGIN + MENUITEM "&New\tCtrl+N", ID_FILE_NEW + MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Close", ID_FILE_CLOSE + MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE + MENUITEM "Save &As...", ID_FILE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT + MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW + MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP + MENUITEM SEPARATOR + MENUITEM "Recent File", ID_FILE_MRU_FILE1,GRAYED + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_APP_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tCtrl+Z", ID_EDIT_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE + END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOLBAR + MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR + END + POPUP "&Window" + BEGIN + MENUITEM "&New Window", ID_WINDOW_NEW + MENUITEM "&Cascade", ID_WINDOW_CASCADE + MENUITEM "&Tile", ID_WINDOW_TILE_HORZ + MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE + END + POPUP "&Help" + BEGIN + MENUITEM "&About mfc1...", ID_APP_ABOUT + END END @@ -177,20 +177,20 @@ END IDR_MAINFRAME ACCELERATORS BEGIN - "N", ID_FILE_NEW, VIRTKEY,CONTROL - "O", ID_FILE_OPEN, VIRTKEY,CONTROL - "S", ID_FILE_SAVE, VIRTKEY,CONTROL - "P", ID_FILE_PRINT, VIRTKEY,CONTROL - "Z", ID_EDIT_UNDO, VIRTKEY,CONTROL - "X", ID_EDIT_CUT, VIRTKEY,CONTROL - "C", ID_EDIT_COPY, VIRTKEY,CONTROL - "V", ID_EDIT_PASTE, VIRTKEY,CONTROL - VK_BACK, ID_EDIT_UNDO, VIRTKEY,ALT - VK_DELETE, ID_EDIT_CUT, VIRTKEY,SHIFT - VK_INSERT, ID_EDIT_COPY, VIRTKEY,CONTROL - VK_INSERT, ID_EDIT_PASTE, VIRTKEY,SHIFT - VK_F6, ID_NEXT_PANE, VIRTKEY - VK_F6, ID_PREV_PANE, VIRTKEY,SHIFT + "N", ID_FILE_NEW, VIRTKEY,CONTROL + "O", ID_FILE_OPEN, VIRTKEY,CONTROL + "S", ID_FILE_SAVE, VIRTKEY,CONTROL + "P", ID_FILE_PRINT, VIRTKEY,CONTROL + "Z", ID_EDIT_UNDO, VIRTKEY,CONTROL + "X", ID_EDIT_CUT, VIRTKEY,CONTROL + "C", ID_EDIT_COPY, VIRTKEY,CONTROL + "V", ID_EDIT_PASTE, VIRTKEY,CONTROL + VK_BACK, ID_EDIT_UNDO, VIRTKEY,ALT + VK_DELETE, ID_EDIT_CUT, VIRTKEY,SHIFT + VK_INSERT, ID_EDIT_COPY, VIRTKEY,CONTROL + VK_INSERT, ID_EDIT_PASTE, VIRTKEY,SHIFT + VK_F6, ID_NEXT_PANE, VIRTKEY + VK_F6, ID_PREV_PANE, VIRTKEY,SHIFT END ///////////////////////////////////////////////////////////////////////////// @@ -209,11 +209,11 @@ CAPTION "About mfc1" STYLE DS_MODALFRAME | DS_SHELLFONT_FLAG | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 - LTEXT "mfc1 Version 1.0",IDC_STATIC,40,10,119,8, + ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 + LTEXT "mfc1 Version 1.0",IDC_STATIC,40,10,119,8, SS_NOPREFIX - LTEXT "Copyright (C) 2011",IDC_STATIC,40,25,119,8 - DEFPUSHBUTTON "OK",IDOK,178,7,50,16,WS_GROUP + LTEXT "Copyright (C) 2011",IDC_STATIC,40,25,119,8 + DEFPUSHBUTTON "OK",IDOK,178,7,50,16,WS_GROUP END @@ -235,23 +235,23 @@ VS_VERSION_INFO VERSIONINFO FILETYPE 0x1L FILESUBTYPE 0x0L BEGIN - BLOCK "StringFileInfo" - BEGIN + BLOCK "StringFileInfo" + BEGIN BLOCK "040904e4" - BEGIN + BEGIN VALUE "CompanyName", "TODO: " VALUE "FileDescription", "TODO: " - VALUE "FileVersion", "1.0.0.1" - VALUE "InternalName", "mfc1.exe" + VALUE "FileVersion", "1.0.0.1" + VALUE "InternalName", "mfc1.exe" VALUE "LegalCopyright", "TODO: (c) . All rights reserved." - VALUE "OriginalFilename","mfc1.exe" + VALUE "OriginalFilename","mfc1.exe" VALUE "ProductName", "TODO: " - VALUE "ProductVersion", "1.0.0.1" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 1252 + VALUE "ProductVersion", "1.0.0.1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1252 END END @@ -281,95 +281,95 @@ END STRINGTABLE BEGIN // Non-mac-targeting apps remove the two extra substrings - IDR_MAINFRAME "mfc1" + IDR_MAINFRAME "mfc1" // has a file suffix - shell file type too - IDR_mfc1TYPE "\nmfc1\nmfc1\nmfc1 Files (*.mf1)\n.mf1\nmfc1.Document\nmfc1.Document" + IDR_mfc1TYPE "\nmfc1\nmfc1\nmfc1 Files (*.mf1)\n.mf1\nmfc1.Document\nmfc1.Document" END STRINGTABLE BEGIN - AFX_IDS_APP_TITLE "mfc1" - AFX_IDS_IDLEMESSAGE "Ready" + AFX_IDS_APP_TITLE "mfc1" + AFX_IDS_IDLEMESSAGE "Ready" END STRINGTABLE BEGIN - ID_INDICATOR_EXT "EXT" - ID_INDICATOR_CAPS "CAP" - ID_INDICATOR_NUM "NUM" - ID_INDICATOR_SCRL "SCRL" - ID_INDICATOR_OVR "OVR" - ID_INDICATOR_REC "REC" + ID_INDICATOR_EXT "EXT" + ID_INDICATOR_CAPS "CAP" + ID_INDICATOR_NUM "NUM" + ID_INDICATOR_SCRL "SCRL" + ID_INDICATOR_OVR "OVR" + ID_INDICATOR_REC "REC" END STRINGTABLE BEGIN - ID_FILE_NEW "Create a new document\nNew" - ID_FILE_OPEN "Open an existing document\nOpen" - ID_FILE_CLOSE "Close the active document\nClose" - ID_FILE_SAVE "Save the active document\nSave" - ID_FILE_SAVE_AS "Save the active document with a new name\nSave As" - ID_FILE_PAGE_SETUP "Change the printing options\nPage Setup" - ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup" - ID_FILE_PRINT "Print the active document\nPrint" - ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview" - ID_APP_ABOUT "Display program information, version number and copyright\nAbout" - ID_APP_EXIT "Quit the application; prompts to save documents\nExit" - ID_FILE_MRU_FILE1 "Open this document" - ID_FILE_MRU_FILE2 "Open this document" - ID_FILE_MRU_FILE3 "Open this document" - ID_FILE_MRU_FILE4 "Open this document" - ID_FILE_MRU_FILE5 "Open this document" - ID_FILE_MRU_FILE6 "Open this document" - ID_FILE_MRU_FILE7 "Open this document" - ID_FILE_MRU_FILE8 "Open this document" - ID_FILE_MRU_FILE9 "Open this document" - ID_FILE_MRU_FILE10 "Open this document" - ID_FILE_MRU_FILE11 "Open this document" - ID_FILE_MRU_FILE12 "Open this document" - ID_FILE_MRU_FILE13 "Open this document" - ID_FILE_MRU_FILE14 "Open this document" - ID_FILE_MRU_FILE15 "Open this document" - ID_FILE_MRU_FILE16 "Open this document" - ID_NEXT_PANE "Switch to the next window pane\nNext Pane" - ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane" - ID_WINDOW_NEW "Open another window for the active document\nNew Window" - ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons" - ID_WINDOW_CASCADE "Arrange windows so they overlap\nCascade Windows" - ID_WINDOW_TILE_HORZ "Arrange windows as non-overlapping tiles\nTile Windows" - ID_WINDOW_TILE_VERT "Arrange windows as non-overlapping tiles\nTile Windows" - ID_WINDOW_SPLIT "Split the active window into panes\nSplit" - ID_EDIT_CLEAR "Erase the selection\nErase" - ID_EDIT_CLEAR_ALL "Erase everything\nErase All" - ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy" - ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut" - ID_EDIT_FIND "Find the specified text\nFind" - ID_EDIT_PASTE "Insert Clipboard contents\nPaste" - ID_EDIT_REPEAT "Repeat the last action\nRepeat" - ID_EDIT_REPLACE "Replace specific text with different text\nReplace" - ID_EDIT_SELECT_ALL "Select the entire document\nSelect All" - ID_EDIT_UNDO "Undo the last action\nUndo" - ID_EDIT_REDO "Redo the previously undone action\nRedo" - ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar" - ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar" + ID_FILE_NEW "Create a new document\nNew" + ID_FILE_OPEN "Open an existing document\nOpen" + ID_FILE_CLOSE "Close the active document\nClose" + ID_FILE_SAVE "Save the active document\nSave" + ID_FILE_SAVE_AS "Save the active document with a new name\nSave As" + ID_FILE_PAGE_SETUP "Change the printing options\nPage Setup" + ID_FILE_PRINT_SETUP "Change the printer and printing options\nPrint Setup" + ID_FILE_PRINT "Print the active document\nPrint" + ID_FILE_PRINT_PREVIEW "Display full pages\nPrint Preview" + ID_APP_ABOUT "Display program information, version number and copyright\nAbout" + ID_APP_EXIT "Quit the application; prompts to save documents\nExit" + ID_FILE_MRU_FILE1 "Open this document" + ID_FILE_MRU_FILE2 "Open this document" + ID_FILE_MRU_FILE3 "Open this document" + ID_FILE_MRU_FILE4 "Open this document" + ID_FILE_MRU_FILE5 "Open this document" + ID_FILE_MRU_FILE6 "Open this document" + ID_FILE_MRU_FILE7 "Open this document" + ID_FILE_MRU_FILE8 "Open this document" + ID_FILE_MRU_FILE9 "Open this document" + ID_FILE_MRU_FILE10 "Open this document" + ID_FILE_MRU_FILE11 "Open this document" + ID_FILE_MRU_FILE12 "Open this document" + ID_FILE_MRU_FILE13 "Open this document" + ID_FILE_MRU_FILE14 "Open this document" + ID_FILE_MRU_FILE15 "Open this document" + ID_FILE_MRU_FILE16 "Open this document" + ID_NEXT_PANE "Switch to the next window pane\nNext Pane" + ID_PREV_PANE "Switch back to the previous window pane\nPrevious Pane" + ID_WINDOW_NEW "Open another window for the active document\nNew Window" + ID_WINDOW_ARRANGE "Arrange icons at the bottom of the window\nArrange Icons" + ID_WINDOW_CASCADE "Arrange windows so they overlap\nCascade Windows" + ID_WINDOW_TILE_HORZ "Arrange windows as non-overlapping tiles\nTile Windows" + ID_WINDOW_TILE_VERT "Arrange windows as non-overlapping tiles\nTile Windows" + ID_WINDOW_SPLIT "Split the active window into panes\nSplit" + ID_EDIT_CLEAR "Erase the selection\nErase" + ID_EDIT_CLEAR_ALL "Erase everything\nErase All" + ID_EDIT_COPY "Copy the selection and put it on the Clipboard\nCopy" + ID_EDIT_CUT "Cut the selection and put it on the Clipboard\nCut" + ID_EDIT_FIND "Find the specified text\nFind" + ID_EDIT_PASTE "Insert Clipboard contents\nPaste" + ID_EDIT_REPEAT "Repeat the last action\nRepeat" + ID_EDIT_REPLACE "Replace specific text with different text\nReplace" + ID_EDIT_SELECT_ALL "Select the entire document\nSelect All" + ID_EDIT_UNDO "Undo the last action\nUndo" + ID_EDIT_REDO "Redo the previously undone action\nRedo" + ID_VIEW_TOOLBAR "Show or hide the toolbar\nToggle ToolBar" + ID_VIEW_STATUS_BAR "Show or hide the status bar\nToggle StatusBar" END STRINGTABLE BEGIN - AFX_IDS_SCSIZE "Change the window size" - AFX_IDS_SCMOVE "Change the window position" - AFX_IDS_SCMINIMIZE "Reduce the window to an icon" - AFX_IDS_SCMAXIMIZE "Enlarge the window to full size" - AFX_IDS_SCNEXTWINDOW "Switch to the next document window" - AFX_IDS_SCPREVWINDOW "Switch to the previous document window" - AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents" - AFX_IDS_SCRESTORE "Restore the window to normal size" - AFX_IDS_SCTASKLIST "Activate Task List" - AFX_IDS_MDICHILD "Activate this window" - AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview" + AFX_IDS_SCSIZE "Change the window size" + AFX_IDS_SCMOVE "Change the window position" + AFX_IDS_SCMINIMIZE "Reduce the window to an icon" + AFX_IDS_SCMAXIMIZE "Enlarge the window to full size" + AFX_IDS_SCNEXTWINDOW "Switch to the next document window" + AFX_IDS_SCPREVWINDOW "Switch to the previous document window" + AFX_IDS_SCCLOSE "Close the active window and prompts to save the documents" + AFX_IDS_SCRESTORE "Restore the window to normal size" + AFX_IDS_SCTASKLIST "Activate Task List" + AFX_IDS_MDICHILD "Activate this window" + AFX_IDS_PREVIEW_CLOSE "Close print preview mode\nCancel Preview" END #endif #ifdef _UNICODE -IDR_MANIFEST RT_MANIFEST "res\\mfc1.manifest" +IDR_MANIFEST RT_MANIFEST "res\\mfc1.manifest" #endif #ifndef APSTUDIO_INVOKED @@ -387,7 +387,7 @@ IDR_MANIFEST RT_MANIFEST "res\\mfc1.manifest" LANGUAGE 9, 1 #pragma code_page(1252) #include "res\\mfc1.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components +#include "afxres.rc" // Standard components #include "afxprint.rc" // printing/print preview resources #endif #endif // not APSTUDIO_INVOKED diff --git a/Tests/MSManifest/Subdir2/test_manifest1.in b/Tests/MSManifest/Subdir2/test_manifest1.in index f36eead..b2fa573 100644 --- a/Tests/MSManifest/Subdir2/test_manifest1.in +++ b/Tests/MSManifest/Subdir2/test_manifest1.in @@ -1,5 +1,5 @@ - CMake Multiple Manifest Test Application + CMake Multiple Manifest Test Application diff --git a/Tests/MSManifest/Subdir2/test_manifest2.in b/Tests/MSManifest/Subdir2/test_manifest2.in index ec96f11..f91b94e 100644 --- a/Tests/MSManifest/Subdir2/test_manifest2.in +++ b/Tests/MSManifest/Subdir2/test_manifest2.in @@ -1,12 +1,12 @@ - - - - - - - - - + + + + + + + + + diff --git a/Tests/MumpsCoverage/.gitattributes b/Tests/MumpsCoverage/.gitattributes index 9fc9b0f..86e85dc 100644 --- a/Tests/MumpsCoverage/.gitattributes +++ b/Tests/MumpsCoverage/.gitattributes @@ -1 +1,2 @@ *.cmcov eol=crlf +*.m tab-indent diff --git a/Tests/RunCMake/ParseImplicitData/.gitattributes b/Tests/RunCMake/ParseImplicitData/.gitattributes new file mode 100644 index 0000000..2f3ef8c --- /dev/null +++ b/Tests/RunCMake/ParseImplicitData/.gitattributes @@ -0,0 +1 @@ +*.input tab-indent diff --git a/Tests/RunCMake/RunCPack/AppWiX/patch.xml b/Tests/RunCMake/RunCPack/AppWiX/patch.xml index 13c392d..e23c33c 100644 --- a/Tests/RunCMake/RunCPack/AppWiX/patch.xml +++ b/Tests/RunCMake/RunCPack/AppWiX/patch.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/Tests/RunCMake/VS10Project/my.props b/Tests/RunCMake/VS10Project/my.props index 7c98cde..43b9ff1 100644 --- a/Tests/RunCMake/VS10Project/my.props +++ b/Tests/RunCMake/VS10Project/my.props @@ -1,5 +1,5 @@ - - + + diff --git a/Tests/iOSNavApp/Classes/NavApp3AppDelegate.m b/Tests/iOSNavApp/Classes/NavApp3AppDelegate.m index c82204c..4cfd1cc 100644 --- a/Tests/iOSNavApp/Classes/NavApp3AppDelegate.m +++ b/Tests/iOSNavApp/Classes/NavApp3AppDelegate.m @@ -79,9 +79,9 @@ - (void)dealloc { - [navigationController release]; - [window release]; - [super dealloc]; + [navigationController release]; + [window release]; + [super dealloc]; } diff --git a/Tests/iOSNavApp/Classes/RootViewController.m b/Tests/iOSNavApp/Classes/RootViewController.m index 8a20d89..ffa6dc9 100644 --- a/Tests/iOSNavApp/Classes/RootViewController.m +++ b/Tests/iOSNavApp/Classes/RootViewController.m @@ -38,20 +38,20 @@ */ /* - (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; + [super viewWillDisappear:animated]; } */ /* - (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; + [super viewDidDisappear:animated]; } */ /* // Override to allow orientations other than the default portrait orientation. - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations. - return (interfaceOrientation == UIInterfaceOrientationPortrait); + // Return YES for supported orientations. + return (interfaceOrientation == UIInterfaceOrientationPortrait); } */ @@ -82,7 +82,7 @@ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; } - // Configure the cell. + // Configure the cell. cell.textLabel.text = [NSString stringWithFormat:@"%d", [indexPath row]]; return cell; @@ -134,13 +134,13 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - /* - <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil]; + /* + <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil]; // ... // Pass the selected object to the new view controller. - [self.navigationController pushViewController:detailViewController animated:YES]; - [detailViewController release]; - */ + [self.navigationController pushViewController:detailViewController animated:YES]; + [detailViewController release]; + */ } diff --git a/Utilities/Release/WiX/CustomAction/.gitattributes b/Utilities/Release/WiX/CustomAction/.gitattributes new file mode 100644 index 0000000..f632c3f --- /dev/null +++ b/Utilities/Release/WiX/CustomAction/.gitattributes @@ -0,0 +1 @@ +exports.def tab-indent diff --git a/bootstrap b/bootstrap index e6d16f0..6173b31 100755 --- a/bootstrap +++ b/bootstrap @@ -1492,6 +1492,7 @@ else cmake_make_processors="${CMAKE_KNOWN_MAKE_PROCESSORS}" fi +tab="`printf '\t'`" TMPFILE="`cmake_tmp_file`_dir" rm -rf "${cmake_bootstrap_dir}/${TMPFILE}" mkdir "${cmake_bootstrap_dir}/${TMPFILE}" @@ -1505,7 +1506,7 @@ build test: cc test.c else echo ' test: test.c - '"${cmake_c_compiler}"' '"${cmake_ld_flags} ${cmake_c_flags}"' -o test test.c +'"${tab}${cmake_c_compiler}"' '"${cmake_ld_flags} ${cmake_c_flags}"' -o test test.c '>"Makefile" fi echo ' @@ -1890,7 +1891,7 @@ write_source_rule() { echo " srcflags = ${src_flags}" >> "${cmake_bootstrap_dir}/build.ninja" else echo "${obj} : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile" - echo " ${compiler} ${flags} ${src_flags} -c ${src} -o ${obj}" >> "${cmake_bootstrap_dir}/Makefile" + echo "${tab}${compiler} ${flags} ${src_flags} -c ${src} -o ${obj}" >> "${cmake_bootstrap_dir}/Makefile" fi } @@ -1937,7 +1938,7 @@ if test "${cmake_bootstrap_generator}" = "Ninja"; then echo " libs = ${libs}" >> "${cmake_bootstrap_dir}/build.ninja" else echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile" - echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} ${libs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile" + echo "${tab}${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} ${libs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile" fi for a in ${CMAKE_CXX_SOURCES}; do src=`cmake_escape_artifact "${cmake_source_dir}/Source/${a}.cxx"` @@ -2000,7 +2001,7 @@ build build.ninja : rebuild_cache else echo " rebuild_cache: - cd \"${cmake_binary_dir}\" && \"${cmake_source_dir}/bootstrap\" --generator=\"${cmake_bootstrap_generator}\" +${tab}cd \"${cmake_binary_dir}\" && \"${cmake_source_dir}/bootstrap\" --generator=\"${cmake_bootstrap_generator}\" " >> "${cmake_bootstrap_dir}/Makefile" fi -- cgit v0.12 From b33beb7af57dc3494a6bcb23d5d4ce416ed4df38 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Sat, 4 Jan 2025 22:53:12 +0400 Subject: Help: Fix some typos found by `sphinx-lint` Particularly, - Avoid TABs in RST docs. - Avoid words ending w/ hyphen at the right side of pharagraphs. --- Help/manual/cmake-presets.7.rst | 4 ++-- Help/release/3.0.rst | 4 ++-- Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK.rst | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index e52376f..9400a1b 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -1124,8 +1124,8 @@ fields: ``steps`` A required array of objects describing the steps of the workflow. The first - step must be a configure preset, and all subsequent steps must be non- - configure presets whose ``configurePreset`` field matches the starting + step must be a configure preset, and all subsequent steps must be + non-configure presets whose ``configurePreset`` field matches the starting configure preset. Each object may contain the following fields: ``type`` diff --git a/Help/release/3.0.rst b/Help/release/3.0.rst index e37c130..e6ac353 100644 --- a/Help/release/3.0.rst +++ b/Help/release/3.0.rst @@ -364,8 +364,8 @@ Deprecated and Removed Features * The builtin documentation formatters that supported command-line options such as ``--help-man`` and ``--help-html`` have been removed in favor of the above-mentioned new documentation system. These and - other command-line options that used to generate man- and html- - formatted pages no longer work. The :manual:`cmake(1)` + other command-line options that used to generate man- and + html- formatted pages no longer work. The :manual:`cmake(1)` ``--help-custom-modules`` option now produces a warning at runtime and generates a minimal document that reports the limitation. diff --git a/Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK.rst b/Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK.rst index 29249d6..f1dfb56 100644 --- a/Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK.rst +++ b/Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK.rst @@ -3,7 +3,7 @@ CMAKE_DOTNET_TARGET_FRAMEWORK .. versionadded:: 3.17 -Default value for :prop_tgt:`DOTNET_TARGET_FRAMEWORK` property of +Default value for :prop_tgt:`DOTNET_TARGET_FRAMEWORK` property of targets. This variable is used to initialize the -- cgit v0.12 From bc8621d999c416054f67f4aa88fce2b1b8a4181a Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Thu, 9 Jan 2025 06:21:42 +0400 Subject: Fix: A lot of typos in code found by `typos` Yet another great code spellchecker: https://github.com/crate-ci/typos/ (Will be added later as a `pre-commit` hook) --- .gitlab/artifacts.yml | 2 +- Auxiliary/cmake-mode.el | 4 +-- Help/dev/maint.rst | 2 +- Help/manual/ctest.1.rst | 2 +- Help/prop_tgt/AUTOMOC.rst | 4 +-- Help/release/3.17.rst | 2 +- Help/release/3.30.rst | 2 +- Help/release/3.5.rst | 2 +- Modules/CMakeASMInformation.cmake | 2 +- Modules/CTest.cmake | 2 +- Modules/Compiler/AppleClang-CXX-FeatureTests.cmake | 2 +- Modules/FindCUDA.cmake | 4 +-- Modules/FindCUDAToolkit.cmake | 6 ++-- Modules/FindDoxygen.cmake | 2 +- Modules/FindHg.cmake | 2 +- Modules/FindJNI.cmake | 2 +- Modules/FindLATEX.cmake | 8 ++--- Modules/FindMPI.cmake | 26 +++++++------- Modules/FindSquish.cmake | 6 ++-- Modules/GetPrerequisites.cmake | 4 +-- Modules/GoogleTest.cmake | 4 +-- Modules/Internal/CPack/CPackDeb.cmake | 2 +- Modules/Platform/Darwin.cmake | 8 ++--- Modules/Platform/Windows-LLVMFlang-Fortran.cmake | 2 +- Modules/TestBigEndian.cmake | 42 ++++++++++++---------- Modules/TestEndianess.c.in | 23 ------------ Modules/TestEndianness.c.in | 23 ++++++++++++ Modules/UseEcos.cmake | 2 +- Source/CPack/IFW/cmCPackIFWGenerator.cxx | 4 +-- Source/CPack/IFW/cmCPackIFWGenerator.h | 2 +- Source/CPack/IFW/cmCPackIFWRepository.cxx | 8 ++--- Source/CPack/cmCPackCygwinSourceGenerator.cxx | 2 +- Source/CPack/cmCPackNSISGenerator.cxx | 4 +-- Source/cmComputeLinkInformation.cxx | 8 ++--- Source/cmCreateTestSourceList.cxx | 2 +- Source/cmExportFileGenerator.cxx | 2 +- Source/cmFunctionCommand.cxx | 5 +-- Source/cmGeneratorTarget_Link.cxx | 9 ++--- Source/cmGhsMultiGpj.cxx | 2 +- Source/cmGhsMultiGpj.h | 2 +- Source/cmGhsMultiTargetGenerator.cxx | 4 +-- Source/cmGlobalVisualStudioGenerator.cxx | 2 +- Source/cmGlobalXCodeGenerator.cxx | 14 ++++---- Source/cmLocalUnixMakefileGenerator3.h | 2 +- Source/cmMacroCommand.cxx | 4 +-- Source/cmNinjaNormalTargetGenerator.cxx | 2 +- Source/cmNinjaTargetGenerator.cxx | 4 +-- Source/cmOrderDirectories.cxx | 4 +-- Source/cmOrderDirectories.h | 4 +-- Source/cmPolicies.h | 2 +- Source/cmQtAutoGen.cxx | 8 ++--- Source/cmQtAutoGen.h | 6 ++-- Source/cmQtAutoMocUic.cxx | 8 ++--- Source/cmStateDirectory.cxx | 6 ++-- Source/cmStatePrivate.h | 2 +- Source/cmStateSnapshot.cxx | 2 +- Source/cmSystemTools.cxx | 14 ++++---- Source/cmTarget.cxx | 14 ++++---- Source/cmTargetLinkLibrariesCommand.cxx | 2 +- Source/cmWindowsRegistry.h | 2 +- Source/cmWorkerPool.cxx | 14 ++++---- Source/cmXMLParser.h | 2 +- Tests/CTestUpdateCommon.cmake | 6 ++-- Tests/CudaOnly/WithDefs/CMakeLists.txt | 2 +- Tests/Preprocess/CMakeLists.txt | 2 +- Tests/RunCMake/Autogen_common/utils.cmake | 6 ++-- .../GetPrerequisites/ExecutableScripts-stdout.txt | 6 ++-- .../UnitTest-stdout.txt | 4 +-- .../UnitTest/etc/os-release | 4 +-- Tests/RunCMake/load_cache/NewForm_Project.cmake | 2 +- Tests/RunCMake/load_cache/NewForm_Script.cmake | 2 +- Tests/RunCMake/load_cache/OldForm_Script.cmake | 2 +- Tests/XCTest/FrameworkExample/FrameworkExample.c | 2 +- Tests/XCTest/FrameworkExample/FrameworkExample.h | 2 +- .../FrameworkExampleTests/FrameworkExampleTests.m | 4 +-- Tests/XCTest/StaticLibExample/StaticLibExample.c | 2 +- Tests/XCTest/StaticLibExample/StaticLibExample.h | 2 +- .../StaticLibExampleTests/StaticLibExampleTests.m | 4 +-- Utilities/Scripts/update-third-party.bash | 2 +- bootstrap | 4 +-- 80 files changed, 214 insertions(+), 208 deletions(-) delete mode 100644 Modules/TestEndianess.c.in create mode 100644 Modules/TestEndianness.c.in diff --git a/.gitlab/artifacts.yml b/.gitlab/artifacts.yml index b2315be..95a0a26 100644 --- a/.gitlab/artifacts.yml +++ b/.gitlab/artifacts.yml @@ -60,7 +60,7 @@ # CTest/CDash information. - ${CMAKE_CI_BUILD_DIR}/Testing/ - - ${CMAKE_CI_BUILD_DIR}/DartConfiguation.tcl + - ${CMAKE_CI_BUILD_DIR}/DartConfiguration.tcl - ${CMAKE_CI_BUILD_DIR}/CTestCustom.cmake - ${CMAKE_CI_BUILD_DIR}/cdash-build-id reports: diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el index 35af733..2b7da10 100644 --- a/Auxiliary/cmake-mode.el +++ b/Auxiliary/cmake-mode.el @@ -182,14 +182,14 @@ set the path with these commands: ) ) -(defun cmake-point-in-indendation () +(defun cmake-point-in-indentation () (string-match "^[ \\t]*$" (buffer-substring (line-beginning-position) (point)))) (defun cmake-indent-line-to (column) "Indent the current line to COLUMN. If point is within the existing indentation it is moved to the end of the indentation. Otherwise it retains the same position on the line" - (if (cmake-point-in-indendation) + (if (cmake-point-in-indentation) (indent-line-to column) (save-excursion (indent-line-to column)))) diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst index 8098bb0..4a6eea8 100644 --- a/Help/dev/maint.rst +++ b/Help/dev/maint.rst @@ -318,7 +318,7 @@ Add the following trailing lines in the merge request description:: Fast-forward: true Backport-ff: release:HEAD~1^2 -This configures the ``Do: merge`` action to fast-foward the ``master`` +This configures the ``Do: merge`` action to fast-forward the ``master`` and ``release`` branches to the respective commits created above. Further steps may proceed after this has been merged. diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 4d60ca4..b2b8bf5 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -1516,7 +1516,7 @@ Configuration settings include: * `CTest Script`_ variable: :variable:`CTEST_DROP_SITE_PASSWORD` * :module:`CTest` module variable: ``DROP_SITE_PASSWORD`` if set, - else ``CTEST_DROP_SITE_PASWORD`` + else ``CTEST_DROP_SITE_PASSWORD`` ``DropSiteUser`` Legacy option. When ``SubmitURL`` is not set, it is constructed from diff --git a/Help/prop_tgt/AUTOMOC.rst b/Help/prop_tgt/AUTOMOC.rst index d4f2b25..b376894 100644 --- a/Help/prop_tgt/AUTOMOC.rst +++ b/Help/prop_tgt/AUTOMOC.rst @@ -28,9 +28,9 @@ At configuration time, a list of header files that should be scanned by target's sources, CMake searches for - a regular header with the same base name - (``.``) and + (``.``) and - a private header with the same base name and a ``_p`` suffix - (``_p.``) + (``_p.``) and adds these to the scan list. diff --git a/Help/release/3.17.rst b/Help/release/3.17.rst index a27d638..63ec423 100644 --- a/Help/release/3.17.rst +++ b/Help/release/3.17.rst @@ -145,7 +145,7 @@ Properties * Target properties :prop_tgt:`MACHO_COMPATIBILITY_VERSION` and :prop_tgt:`MACHO_CURRENT_VERSION` were added to set the - ``compatibility_version`` and ``curent_version``, respectively, + ``compatibility_version`` and ``current_version``, respectively, for Mach-O binaries. For backwards compatibility, if these properties are not set, :prop_tgt:`SOVERSION` and :prop_tgt:`VERSION` are used respectively as fallbacks. diff --git a/Help/release/3.30.rst b/Help/release/3.30.rst index 971fe30..d8ad1ba 100644 --- a/Help/release/3.30.rst +++ b/Help/release/3.30.rst @@ -285,7 +285,7 @@ Changes made since CMake 3.30.0 include the following. This refines 3.30.3's behavior change to restore behavior of nested directories that call :command:`project` with the same project name, but the implementation in this release is flawed (this release note has - been retoractively updated). It can result in different behavior between + been retroactively updated). It can result in different behavior between the first and subsequent runs. Do not use CMake 3.30.4 if your project contains nested calls to :command:`project` with the same project name and you use these variables. diff --git a/Help/release/3.5.rst b/Help/release/3.5.rst index 58a5d4e..e877164 100644 --- a/Help/release/3.5.rst +++ b/Help/release/3.5.rst @@ -168,7 +168,7 @@ Deprecated and Removed Features * The :generator:`Xcode` generator was fixed to escape backslashes in strings consistently with other generators. Projects that previously - worked around the inconsistecy with an extra level of backslashes + worked around the inconsistency with an extra level of backslashes conditioned on the Xcode generator must be updated to remove the workaround for CMake 3.5 and greater. diff --git a/Modules/CMakeASMInformation.cmake b/Modules/CMakeASMInformation.cmake index 7030034..03256f8 100644 --- a/Modules/CMakeASMInformation.cmake +++ b/Modules/CMakeASMInformation.cmake @@ -98,4 +98,4 @@ endif() set(CMAKE_ASM${ASM_DIALECT}_USE_LINKER_INFORMATION TRUE) -set(CMAKE_ASM${ASM_DIALECT}_INFOMATION_LOADED 1) +set(CMAKE_ASM${ASM_DIALECT}_INFORMATION_LOADED 1) diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index 6829d66..c803d98 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -103,7 +103,7 @@ if(BUILD_TESTING) SET_IF_SET_AND_NOT_SET(DROP_METHOD "${CTEST_DROP_METHOD}") SET_IF_SET_AND_NOT_SET(DROP_SITE "${CTEST_DROP_SITE}") SET_IF_SET_AND_NOT_SET(DROP_SITE_USER "${CTEST_DROP_SITE_USER}") - SET_IF_SET_AND_NOT_SET(DROP_SITE_PASSWORD "${CTEST_DROP_SITE_PASWORD}") + SET_IF_SET_AND_NOT_SET(DROP_SITE_PASSWORD "${CTEST_DROP_SITE_PASSWORD}") SET_IF_SET_AND_NOT_SET(DROP_SITE_MODE "${CTEST_DROP_SITE_MODE}") SET_IF_SET_AND_NOT_SET(DROP_LOCATION "${CTEST_DROP_LOCATION}") SET_IF_SET_AND_NOT_SET(TRIGGER_SITE "${CTEST_TRIGGER_SITE}") diff --git a/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake b/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake index f67082c..6fa9a40 100644 --- a/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake +++ b/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake @@ -14,7 +14,7 @@ # Xcode_60 - Apple LLVM version 6.0 (clang-600.0.51) (based on LLVM 3.5svn) # Xcode_61 - Apple LLVM version 6.0 (clang-600.0.56) (based on LLVM 3.5svn) -# There is some non-correspondance. __has_feature(cxx_user_literals) is +# There is some non-correspondence. __has_feature(cxx_user_literals) is # false for AppleClang 4.0 and 4.1, although it is reported as # supported in the reference link for Clang 3.1. The compiler does not pass # the CompileFeatures/cxx_user_literals.cpp test. diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 73cac25..028e3c0 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -2007,7 +2007,7 @@ macro(CUDA_ADD_LIBRARY cuda_target) ${_cmake_options} ${_cuda_shared_flag} OPTIONS ${_options} ) - # Compute the file name of the intermedate link file used for separable + # Compute the file name of the intermediate link file used for separable # compilation. CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME(link_file ${cuda_target} "${${cuda_target}_SEPARABLE_COMPILATION_OBJECTS}") @@ -2057,7 +2057,7 @@ macro(CUDA_ADD_EXECUTABLE cuda_target) # Create custom commands and targets for each file. CUDA_WRAP_SRCS( ${cuda_target} OBJ _generated_files ${_sources} OPTIONS ${_options} ) - # Compute the file name of the intermedate link file used for separable + # Compute the file name of the intermediate link file used for separable # compilation. CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME(link_file ${cuda_target} "${${cuda_target}_SEPARABLE_COMPILATION_OBJECTS}") diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake index 1e54b3d..7a0d0df 100644 --- a/Modules/FindCUDAToolkit.cmake +++ b/Modules/FindCUDAToolkit.cmake @@ -770,13 +770,13 @@ else() function(_CUDAToolkit_parse_version_file version_file) if(version_file) - file(READ "${version_file}" file_conents) + file(READ "${version_file}" file_contents) cmake_path(GET version_file EXTENSION LAST_ONLY version_ext) if(version_ext STREQUAL ".json") - string(JSON cuda_version_info GET "${file_conents}" "cuda" "version") + string(JSON cuda_version_info GET "${file_contents}" "cuda" "version") set(cuda_version_match_regex [=[([0-9]+)\.([0-9]+)\.([0-9]+)]=]) elseif(version_ext STREQUAL ".txt") - set(cuda_version_info "${file_conents}") + set(cuda_version_info "${file_contents}") set(cuda_version_match_regex [=[CUDA Version ([0-9]+)\.([0-9]+)\.([0-9]+)]=]) endif() diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 9903e37..290516a 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -1026,7 +1026,7 @@ doxygen_add_docs() for target ${targetName}") "CMakeCache.txt" ) - # Now bring in Doxgen's defaults for those things the project has not + # Now bring in Doxygen's defaults for those things the project has not # already set and we have not provided above include("${CMAKE_BINARY_DIR}/CMakeDoxygenDefaults.cmake" OPTIONAL) diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake index e9f2c82..ad60f9a 100644 --- a/Modules/FindHg.cmake +++ b/Modules/FindHg.cmake @@ -84,7 +84,7 @@ if(HG_EXECUTABLE) OUTPUT_VARIABLE ${prefix}_WC_DATA OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT ${hg_id_result} EQUAL 0) - message(SEND_ERROR "Command \"${HG_EXECUTBALE} id -n\" in directory ${dir} failed with output:\n${hg_id_error}") + message(SEND_ERROR "Command \"${HG_EXECUTABLE} id -n\" in directory ${dir} failed with output:\n${hg_id_error}") endif() string(REGEX REPLACE "([0-9a-f]+)\\+? [0-9]+\\+?" "\\1" ${prefix}_WC_CHANGESET ${${prefix}_WC_DATA}) diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 82e3d88..e807750 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -91,7 +91,7 @@ The following cache variables are also available to set or use: ``JAVA_INCLUDE_PATH`` The include path to ``jni.h``. ``JAVA_INCLUDE_PATH2`` - The include path to machine-dependant headers ``jni_md.h`` and ``jniport.h``. + The include path to machine-dependent headers ``jni_md.h`` and ``jniport.h``. The variable is defined only if ``jni.h`` depends on one of these headers. In contrast, Android NDK ``jni.h`` can be typically used standalone. ``JAVA_AWT_INCLUDE_PATH`` diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake index 9d7168e..d407dcf 100644 --- a/Modules/FindLATEX.cmake +++ b/Modules/FindLATEX.cmake @@ -71,17 +71,17 @@ if (WIN32) mark_as_advanced(MIKTEX_BINARY_PATH) # Try to find the GhostScript binary path (look for gswin32). - get_filename_component(GHOSTSCRIPT_BINARY_PATH_FROM_REGISTERY_8_00 + get_filename_component(GHOSTSCRIPT_BINARY_PATH_FROM_REGISTRY_8_00 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\AFPL Ghostscript\\8.00;GS_DLL]" PATH ) - get_filename_component(GHOSTSCRIPT_BINARY_PATH_FROM_REGISTERY_7_04 + get_filename_component(GHOSTSCRIPT_BINARY_PATH_FROM_REGISTRY_7_04 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\AFPL Ghostscript\\7.04;GS_DLL]" PATH ) find_path(GHOSTSCRIPT_BINARY_PATH gswin32.exe - ${GHOSTSCRIPT_BINARY_PATH_FROM_REGISTERY_8_00} - ${GHOSTSCRIPT_BINARY_PATH_FROM_REGISTERY_7_04} + ${GHOSTSCRIPT_BINARY_PATH_FROM_REGISTRY_8_00} + ${GHOSTSCRIPT_BINARY_PATH_FROM_REGISTRY_7_04} DOC "Path to the GhostScript binary directory." ) mark_as_advanced(GHOSTSCRIPT_BINARY_PATH) diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 0f06c57..a3cdf89 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -439,25 +439,25 @@ function (_MPI_interrogate_compiler LANG) # It's possible to have a per-compiler configuration in these MPI implementations and # a particular MPICH derivate might check compiler interoperability. # Intel MPI in particular does this with I_MPI_CHECK_COMPILER. - file(TO_NATIVE_PATH "${CMAKE_${LANG}_COMPILER}" _MPI_UNDERLAYING_COMPILER) + file(TO_NATIVE_PATH "${CMAKE_${LANG}_COMPILER}" _MPI_UNDERLYING_COMPILER) # On Windows, the Intel MPI batch scripts can only work with filenames - Full paths will break them. # Due to the lack of other MPICH-based wrappers for Visual C++, we may treat this as default. if(MSVC) - get_filename_component(_MPI_UNDERLAYING_COMPILER "${_MPI_UNDERLAYING_COMPILER}" NAME) + get_filename_component(_MPI_UNDERLYING_COMPILER "${_MPI_UNDERLYING_COMPILER}" NAME) endif() if(LANG STREQUAL "C") - _MPI_env_set_ifnot(I_MPI_CC _MPI_UNDERLAYING_COMPILER) - _MPI_env_set_ifnot(MPICH_CC _MPI_UNDERLAYING_COMPILER) + _MPI_env_set_ifnot(I_MPI_CC _MPI_UNDERLYING_COMPILER) + _MPI_env_set_ifnot(MPICH_CC _MPI_UNDERLYING_COMPILER) elseif(LANG STREQUAL "CXX") - _MPI_env_set_ifnot(I_MPI_CXX _MPI_UNDERLAYING_COMPILER) - _MPI_env_set_ifnot(MPICH_CXX _MPI_UNDERLAYING_COMPILER) + _MPI_env_set_ifnot(I_MPI_CXX _MPI_UNDERLYING_COMPILER) + _MPI_env_set_ifnot(MPICH_CXX _MPI_UNDERLYING_COMPILER) elseif(LANG STREQUAL "Fortran") - _MPI_env_set_ifnot(I_MPI_FC _MPI_UNDERLAYING_COMPILER) - _MPI_env_set_ifnot(MPICH_FC _MPI_UNDERLAYING_COMPILER) - _MPI_env_set_ifnot(I_MPI_F77 _MPI_UNDERLAYING_COMPILER) - _MPI_env_set_ifnot(MPICH_F77 _MPI_UNDERLAYING_COMPILER) - _MPI_env_set_ifnot(I_MPI_F90 _MPI_UNDERLAYING_COMPILER) - _MPI_env_set_ifnot(MPICH_F90 _MPI_UNDERLAYING_COMPILER) + _MPI_env_set_ifnot(I_MPI_FC _MPI_UNDERLYING_COMPILER) + _MPI_env_set_ifnot(MPICH_FC _MPI_UNDERLYING_COMPILER) + _MPI_env_set_ifnot(I_MPI_F77 _MPI_UNDERLYING_COMPILER) + _MPI_env_set_ifnot(MPICH_F77 _MPI_UNDERLYING_COMPILER) + _MPI_env_set_ifnot(I_MPI_F90 _MPI_UNDERLYING_COMPILER) + _MPI_env_set_ifnot(MPICH_F90 _MPI_UNDERLYING_COMPILER) endif() # Set these two variables for Intel MPI: @@ -1313,7 +1313,7 @@ macro(_MPI_check_lang_works LANG SUPPRESS_ERRORS) set(MPI_${LANG}_HAVE_${mpimethod} FALSE) endif() endforeach() - # MPI-1 versions had no MPI_INTGER_KIND defined, so we need to try without it. + # MPI-1 versions had no MPI_INTEGER_KIND defined, so we need to try without it. # However, MPI-1 also did not define the Fortran 90 and 08 modules, so we only try the F77 header. unset(MPI_Fortran_INTEGER_LINE) if(NOT MPI_${LANG}_WORKS) diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake index bb4caa1..16ea4d3 100644 --- a/Modules/FindSquish.cmake +++ b/Modules/FindSquish.cmake @@ -195,7 +195,7 @@ find_package_handle_standard_args(Squish REQUIRED_VARS SQUISH_INSTALL_DIR SQUI set(_SQUISH_MODULE_DIR "${CMAKE_CURRENT_LIST_DIR}") -macro(squish_v3_add_test testName testAUT testCase envVars testWraper) +macro(squish_v3_add_test testName testAUT testCase envVars testWrapper) if("${SQUISH_VERSION_MAJOR}" STRGREATER "3") message(STATUS "Using squish_v3_add_test(), but SQUISH_VERSION_MAJOR is ${SQUISH_VERSION_MAJOR}.\nThis may not work.") endif() @@ -211,7 +211,7 @@ macro(squish_v3_add_test testName testAUT testCase envVars testWraper) "-Dsquish_libqtdir:STRING=${QT_LIBRARY_DIR}" "-Dsquish_test_case:STRING=${testCase}" "-Dsquish_env_vars:STRING=${envVars}" - "-Dsquish_wrapper:STRING=${testWraper}" + "-Dsquish_wrapper:STRING=${testWrapper}" "-Dsquish_module_dir:STRING=${_SQUISH_MODULE_DIR}" -P "${_SQUISH_MODULE_DIR}/SquishTestScript.cmake" ) @@ -273,7 +273,7 @@ function(squish_v4_add_test testName) "-Dsquish_test_suite:STRING=${absTestSuite}" "-Dsquish_test_case:STRING=${_SQUISH_TEST}" "-Dsquish_env_vars:STRING=${envVars}" - "-Dsquish_wrapper:STRING=${testWraper}" + "-Dsquish_wrapper:STRING=${testWrapper}" "-Dsquish_module_dir:STRING=${_SQUISH_MODULE_DIR}" "-Dsquish_pre_command:STRING=${_SQUISH_PRE_COMMAND}" "-Dsquish_post_command:STRING=${_SQUISH_POST_COMMAND}" diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index b77f650..8e43f33 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -662,7 +662,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa # Check for a script by extension (.bat,.sh,...) or if the file starts with "#!" (shebang) file(READ ${target} file_contents LIMIT 5) if(target MATCHES "\\.(bat|c?sh|bash|ksh|cmd)$" OR file_contents MATCHES "^#!") - message(STATUS "GetPrequisites(${target}) : ignoring script file") + message(STATUS "GetPrerequisites(${target}) : ignoring script file") # Clear var set(${prerequisites_var} "" PARENT_SCOPE) return() @@ -832,7 +832,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa string(SUBSTRING "${gp_cmd_ov}" 0 ${gp_delayload_pos} gp_cmd_ov_no_delayload_deps) string(SUBSTRING "${gp_cmd_ov}" ${gp_delayload_pos} -1 gp_cmd_ov_delayload_deps) if (verbose) - message(STATUS "GetPrequisites(${target}) : ignoring the following delay load dependencies :\n ${gp_cmd_ov_delayload_deps}") + message(STATUS "GetPrerequisites(${target}) : ignoring the following delay load dependencies :\n ${gp_cmd_ov_delayload_deps}") endif() set(gp_cmd_ov ${gp_cmd_ov_no_delayload_deps}) endif() diff --git a/Modules/GoogleTest.cmake b/Modules/GoogleTest.cmake index 63745fe..17800b1 100644 --- a/Modules/GoogleTest.cmake +++ b/Modules/GoogleTest.cmake @@ -435,8 +435,8 @@ function(gtest_add_tests) foreach(line_str IN LISTS content_lines) MATH(EXPR line "${line}+1") # Check if the current line is the start of a test definition - string(REGEX MATCH "[ \t]*${gtest_test_type_regex}[ \t]*[\\(]*" accumlate_start_hit "${line_str}") - if(accumlate_start_hit) + string(REGEX MATCH "[ \t]*${gtest_test_type_regex}[ \t]*[\\(]*" accumulate_start_hit "${line_str}") + if(accumulate_start_hit) set(accumulate_line "${line}") endif() # Append the current line to the accumulated string diff --git a/Modules/Internal/CPack/CPackDeb.cmake b/Modules/Internal/CPack/CPackDeb.cmake index 0169f61..e98ed17 100644 --- a/Modules/Internal/CPack/CPackDeb.cmake +++ b/Modules/Internal/CPack/CPackDeb.cmake @@ -88,7 +88,7 @@ function(get_sanitized_dirname dirname outvar) # defined in the C++ function `CPackGenerator::GetSanitizedDirOrFileName`! set(prohibited_chars_pattern "[<]|[>]|[\"]|[/]|[\\]|[|]|[?]|[*]|[`]") if("${dirname}" MATCHES "${prohibited_chars_pattern}") - string(MD5 santized_dirname "${dirname}") + string(MD5 sanitized_dirname "${dirname}") set(${outvar} "${sanitized_dirname}" PARENT_SCOPE) else() set(${outvar} "${dirname}" PARENT_SCOPE) diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index f334c5f..5cdd9ac 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -182,9 +182,9 @@ if(_CMAKE_OSX_SYSROOT_PATH) # Xcode 5 OSX ${_CMAKE_OSX_SYSROOT_PATH}/../../../../../Library/Frameworks ) - get_filename_component(_abolute_path "${_path}" ABSOLUTE) - if(EXISTS "${_abolute_path}") - list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH "${_abolute_path}") + get_filename_component(_absolute_path "${_path}" ABSOLUTE) + if(EXISTS "${_absolute_path}") + list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH "${_absolute_path}") break() endif() endforeach() @@ -205,7 +205,7 @@ list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH /Network/Library/Frameworks /System/Library/Frameworks) -# Warn about known system mis-configuration case. +# Warn about known system misconfiguration case. if(CMAKE_OSX_SYSROOT) get_property(_IN_TC GLOBAL PROPERTY IN_TRY_COMPILE) if(NOT _IN_TC AND diff --git a/Modules/Platform/Windows-LLVMFlang-Fortran.cmake b/Modules/Platform/Windows-LLVMFlang-Fortran.cmake index 10e3b2c..c2ccec6 100644 --- a/Modules/Platform/Windows-LLVMFlang-Fortran.cmake +++ b/Modules/Platform/Windows-LLVMFlang-Fortran.cmake @@ -13,7 +13,7 @@ elseif("x${CMAKE_Fortran_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL "-fms-runtime-lib=dll_dbg") else() # LLVMFlang < 18.0 does not have MSVC runtime library selection flags. - # The official distrubtion's `Fortran*.lib` runtime libraries hard-code + # The official distribution's `Fortran*.lib` runtime libraries hard-code # use of msvcrt (MultiThreadedDLL), so we link to it ourselves. set(_LLVMFlang_LINK_RUNTIME "-defaultlib:msvcrt") set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded "") diff --git a/Modules/TestBigEndian.cmake b/Modules/TestBigEndian.cmake index 03c8588..316969e 100644 --- a/Modules/TestBigEndian.cmake +++ b/Modules/TestBigEndian.cmake @@ -77,55 +77,59 @@ macro(__TEST_BIG_ENDIAN_LEGACY_IMPL VARIABLE) endif() if(_test_language STREQUAL "CXX") - set(_test_file TestEndianess.cpp) + set(_test_file TestEndianness.cpp) else() - set(_test_file TestEndianess.c) + set(_test_file TestEndianness.c) endif() - file(READ "${CMAKE_ROOT}/Modules/TestEndianess.c.in" TEST_ENDIANESS_FILE_CONTENT) - string(CONFIGURE "${TEST_ENDIANESS_FILE_CONTENT}" TEST_ENDIANESS_FILE_CONTENT @ONLY) + file(READ "${CMAKE_ROOT}/Modules/TestEndianness.c.in" TEST_ENDIANNESS_FILE_CONTENT) + string(CONFIGURE "${TEST_ENDIANNESS_FILE_CONTENT}" TEST_ENDIANNESS_FILE_CONTENT @ONLY) try_compile(HAVE_${VARIABLE} - SOURCE_FROM_VAR "${_test_file}" TEST_ENDIANESS_FILE_CONTENT - COPY_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestEndianess.bin" ) + SOURCE_FROM_VAR "${_test_file}" TEST_ENDIANNESS_FILE_CONTENT + COPY_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestEndianness.bin" ) if(HAVE_${VARIABLE}) cmake_policy(PUSH) cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_ - file(STRINGS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestEndianess.bin" - CMAKE_TEST_ENDIANESS_STRINGS_LE LIMIT_COUNT 1 REGEX "THIS IS LITTLE ENDIAN") + file(STRINGS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestEndianness.bin" + CMAKE_TEST_ENDIANNESS_STRINGS_LE LIMIT_COUNT 1 REGEX "THIS IS LITTLE ENDIAN") - file(STRINGS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestEndianess.bin" - CMAKE_TEST_ENDIANESS_STRINGS_BE LIMIT_COUNT 1 REGEX "THIS IS BIG ENDIAN") + file(STRINGS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestEndianness.bin" + CMAKE_TEST_ENDIANNESS_STRINGS_BE LIMIT_COUNT 1 REGEX "THIS IS BIG ENDIAN") cmake_policy(POP) # on mac, if there are universal binaries built both will be true # return the result depending on the machine on which cmake runs - if(CMAKE_TEST_ENDIANESS_STRINGS_BE AND CMAKE_TEST_ENDIANESS_STRINGS_LE) + if(CMAKE_TEST_ENDIANNESS_STRINGS_BE AND CMAKE_TEST_ENDIANNESS_STRINGS_LE) if(CMAKE_SYSTEM_PROCESSOR MATCHES powerpc) - set(CMAKE_TEST_ENDIANESS_STRINGS_BE TRUE) - set(CMAKE_TEST_ENDIANESS_STRINGS_LE FALSE) + set(CMAKE_TEST_ENDIANNESS_STRINGS_BE TRUE) + set(CMAKE_TEST_ENDIANNESS_STRINGS_LE FALSE) else() - set(CMAKE_TEST_ENDIANESS_STRINGS_BE FALSE) - set(CMAKE_TEST_ENDIANESS_STRINGS_LE TRUE) + set(CMAKE_TEST_ENDIANNESS_STRINGS_BE FALSE) + set(CMAKE_TEST_ENDIANNESS_STRINGS_LE TRUE) endif() - message(STATUS "TEST_BIG_ENDIAN found different results, consider setting CMAKE_OSX_ARCHITECTURES or CMAKE_TRY_COMPILE_OSX_ARCHITECTURES to one or no architecture !") + message( + STATUS + "TEST_BIG_ENDIAN found different results, consider setting CMAKE_OSX_ARCHITECTURES or " + "CMAKE_TRY_COMPILE_OSX_ARCHITECTURES to one or no architecture !" + ) endif() - if(CMAKE_TEST_ENDIANESS_STRINGS_LE) + if(CMAKE_TEST_ENDIANNESS_STRINGS_LE) set(${VARIABLE} 0 CACHE INTERNAL "Result of TEST_BIG_ENDIAN" FORCE) message(CHECK_PASS "little endian") endif() - if(CMAKE_TEST_ENDIANESS_STRINGS_BE) + if(CMAKE_TEST_ENDIANNESS_STRINGS_BE) set(${VARIABLE} 1 CACHE INTERNAL "Result of TEST_BIG_ENDIAN" FORCE) message(CHECK_PASS "big endian") endif() - if(NOT CMAKE_TEST_ENDIANESS_STRINGS_BE AND NOT CMAKE_TEST_ENDIANESS_STRINGS_LE) + if(NOT CMAKE_TEST_ENDIANNESS_STRINGS_BE AND NOT CMAKE_TEST_ENDIANNESS_STRINGS_LE) message(CHECK_FAIL "TEST_BIG_ENDIAN found no result!") message(SEND_ERROR "TEST_BIG_ENDIAN found no result!") endif() diff --git a/Modules/TestEndianess.c.in b/Modules/TestEndianess.c.in deleted file mode 100644 index c924f78..0000000 --- a/Modules/TestEndianess.c.in +++ /dev/null @@ -1,23 +0,0 @@ -/* A 16 bit integer is required. */ -typedef @CMAKE_16BIT_TYPE@ cmakeint16; - -/* On a little endian machine, these 16bit ints will give "THIS IS LITTLE ENDIAN." - On a big endian machine the characters will be exchanged pairwise. */ -const cmakeint16 info_little[] = {0x4854, 0x5349, 0x4920, 0x2053, 0x494c, 0x5454, 0x454c, 0x4520, 0x444e, 0x4149, 0x2e4e, 0x0000}; - -/* on a big endian machine, these 16bit ints will give "THIS IS BIG ENDIAN." - On a little endian machine the characters will be exchanged pairwise. */ -const cmakeint16 info_big[] = {0x5448, 0x4953, 0x2049, 0x5320, 0x4249, 0x4720, 0x454e, 0x4449, 0x414e, 0x2e2e, 0x0000}; - -#ifdef __CLASSIC_C__ -int main(argc, argv) int argc; char *argv[]; -#else -int main(int argc, char *argv[]) -#endif -{ - int require = 0; - require += info_little[argc]; - require += info_big[argc]; - (void)argv; - return require; -} diff --git a/Modules/TestEndianness.c.in b/Modules/TestEndianness.c.in new file mode 100644 index 0000000..c924f78 --- /dev/null +++ b/Modules/TestEndianness.c.in @@ -0,0 +1,23 @@ +/* A 16 bit integer is required. */ +typedef @CMAKE_16BIT_TYPE@ cmakeint16; + +/* On a little endian machine, these 16bit ints will give "THIS IS LITTLE ENDIAN." + On a big endian machine the characters will be exchanged pairwise. */ +const cmakeint16 info_little[] = {0x4854, 0x5349, 0x4920, 0x2053, 0x494c, 0x5454, 0x454c, 0x4520, 0x444e, 0x4149, 0x2e4e, 0x0000}; + +/* on a big endian machine, these 16bit ints will give "THIS IS BIG ENDIAN." + On a little endian machine the characters will be exchanged pairwise. */ +const cmakeint16 info_big[] = {0x5448, 0x4953, 0x2049, 0x5320, 0x4249, 0x4720, 0x454e, 0x4449, 0x414e, 0x2e2e, 0x0000}; + +#ifdef __CLASSIC_C__ +int main(argc, argv) int argc; char *argv[]; +#else +int main(int argc, char *argv[]) +#endif +{ + int require = 0; + require += info_little[argc]; + require += info_big[argc]; + (void)argv; + return require; +} diff --git a/Modules/UseEcos.cmake b/Modules/UseEcos.cmake index f263211..0b07723 100644 --- a/Modules/UseEcos.cmake +++ b/Modules/UseEcos.cmake @@ -62,7 +62,7 @@ else () message(STATUS "tlcsh found: ${TCL_TCLSH}") endif () -#add the globale include-diretories +#add the global include-directories #usage: ECOS_ADD_INCLUDE_DIRECTORIES() macro(ECOS_ADD_INCLUDE_DIRECTORIES) #check for ProjectSources.txt one level higher diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx index 7c82668..5824a24 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx +++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx @@ -161,7 +161,7 @@ int cmCPackIFWGenerator::RunRepogen(const std::string& ifwTmpFile) return 1; } -std::vector cmCPackIFWGenerator::BuildBinaryCreatorCommmand() +std::vector cmCPackIFWGenerator::BuildBinaryCreatorCommand() { std::vector ifwCmd; std::string ifwArg; @@ -276,7 +276,7 @@ std::vector cmCPackIFWGenerator::BuildBinaryCreatorCommmand() int cmCPackIFWGenerator::RunBinaryCreator(const std::string& ifwTmpFile) { - std::vector ifwCmd = this->BuildBinaryCreatorCommmand(); + std::vector ifwCmd = this->BuildBinaryCreatorCommand(); cmCPackIFWLogger(VERBOSE, "Execute: " << cmSystemTools::PrintSingleCommand(ifwCmd) << std::endl); diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.h b/Source/CPack/IFW/cmCPackIFWGenerator.h index e125be0..8a16d6a 100644 --- a/Source/CPack/IFW/cmCPackIFWGenerator.h +++ b/Source/CPack/IFW/cmCPackIFWGenerator.h @@ -145,7 +145,7 @@ private: std::vector BuildRepogenCommand(); int RunRepogen(const std::string& ifwTmpFile); - std::vector BuildBinaryCreatorCommmand(); + std::vector BuildBinaryCreatorCommand(); int RunBinaryCreator(const std::string& ifwTmpFile); std::string RepoGen; diff --git a/Source/CPack/IFW/cmCPackIFWRepository.cxx b/Source/CPack/IFW/cmCPackIFWRepository.cxx index 46fc57f..0f9490b 100644 --- a/Source/CPack/IFW/cmCPackIFWRepository.cxx +++ b/Source/CPack/IFW/cmCPackIFWRepository.cxx @@ -107,13 +107,13 @@ bool cmCPackIFWRepository::ConfigureFromOptions() return this->IsValid(); } -/** \class cmCPackeIFWUpdatesPatcher +/** \class cmCPackIFWUpdatesPatcher * \brief Helper class that parses and patch Updates.xml file (QtIFW) */ -class cmCPackeIFWUpdatesPatcher : public cmXMLParser +class cmCPackIFWUpdatesPatcher : public cmXMLParser { public: - cmCPackeIFWUpdatesPatcher(cmCPackIFWRepository* r, cmXMLWriter& x) + cmCPackIFWUpdatesPatcher(cmCPackIFWRepository* r, cmXMLWriter& x) : repository(r) , xout(x) { @@ -188,7 +188,7 @@ bool cmCPackIFWRepository::PatchUpdatesXml() // Patch { - cmCPackeIFWUpdatesPatcher patcher(this, xout); + cmCPackIFWUpdatesPatcher patcher(this, xout); patcher.ParseFile(updatesXml.data()); } diff --git a/Source/CPack/cmCPackCygwinSourceGenerator.cxx b/Source/CPack/cmCPackCygwinSourceGenerator.cxx index f025a6c..2844d90 100644 --- a/Source/CPack/cmCPackCygwinSourceGenerator.cxx +++ b/Source/CPack/cmCPackCygwinSourceGenerator.cxx @@ -120,7 +120,7 @@ int cmCPackCygwinSourceGenerator::PackageFiles() files.clear(); // a source release in cygwin should have the build script used // to build the package, the patch file that is different from the - // regular upstream version of the sources, and a bziped tar file + // regular upstream version of the sources, and a bzipped tar file // of the original sources files.push_back(buildScript); files.push_back(patchFile); diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 8d81183..225e86f 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -231,10 +231,10 @@ int cmCPackNSISGenerator::PackageFiles() } if (!this->IsSet("CPACK_NSIS_IGNORE_LICENSE_PAGE")) { - std::string licenceCode = + std::string licenseCode = cmStrCat("!insertmacro MUI_PAGE_LICENSE \"", this->GetOption("CPACK_RESOURCE_FILE_LICENSE"), "\"\n"); - this->SetOptionIfNotSet("CPACK_NSIS_LICENSE_PAGE", licenceCode); + this->SetOptionIfNotSet("CPACK_NSIS_LICENSE_PAGE", licenseCode); } std::string nsisPreArguments; diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index e28f491..da51644 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -480,14 +480,14 @@ cmComputeLinkInformation::GetDirectoriesWithBacktraces() { std::vector> directoriesWithBacktraces; - std::vector> targetLinkDirectores = + std::vector> targetLinkDirectories = this->Target->GetLinkDirectories(this->Config, this->LinkLanguage); const std::vector& orderedDirectories = this->GetDirectories(); for (const std::string& dir : orderedDirectories) { - auto result = - std::find(targetLinkDirectores.begin(), targetLinkDirectores.end(), dir); - if (result != targetLinkDirectores.end()) { + auto result = std::find(targetLinkDirectories.begin(), + targetLinkDirectories.end(), dir); + if (result != targetLinkDirectories.end()) { directoriesWithBacktraces.emplace_back(std::move(*result)); } else { directoriesWithBacktraces.emplace_back(dir); diff --git a/Source/cmCreateTestSourceList.cxx b/Source/cmCreateTestSourceList.cxx index 9edbafe..11e5f1b 100644 --- a/Source/cmCreateTestSourceList.cxx +++ b/Source/cmCreateTestSourceList.cxx @@ -22,7 +22,7 @@ bool cmCreateTestSourceList(std::vector const& args, std::string extraInclude; std::string function; std::vector tests; - // extract extra include and function ot + // extract extra include and function for (; i != args.end(); i++) { if (*i == "EXTRA_INCLUDE") { ++i; diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 5e9461d..7c1e290 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -318,7 +318,7 @@ void cmExportFileGenerator::PopulateCustomTransitiveInterfaceProperties( properties); this->PopulateInterfaceProperty("TRANSITIVE_LINK_PROPERTIES", target, properties); - cmGeneratorTarget::CheckLinkLibrariesSuppressionRAII cllSuppressRAII; + cmGeneratorTarget::CheckLinkLibrariesSuppressionRAII suppress; std::set ifaceProperties; for (std::string const& config : this->Configurations) { for (auto const& i : target->GetCustomTransitiveProperties( diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx index 33721fc..220323e 100644 --- a/Source/cmFunctionCommand.cxx +++ b/Source/cmFunctionCommand.cxx @@ -91,8 +91,9 @@ bool cmFunctionHelperCommand::operator()( // define ARGV and ARGN auto const argvDef = cmList::to_string(expandedArgs); - auto const eit = expandedArgs.begin() + (this->Args.size() - 1); - auto const argnDef = cmList::to_string(cmMakeRange(eit, expandedArgs.end())); + auto const expIt = expandedArgs.begin() + (this->Args.size() - 1); + auto const argnDef = + cmList::to_string(cmMakeRange(expIt, expandedArgs.end())); makefile.AddDefinition(ARGV, argvDef); makefile.MarkVariableAsUsed(ARGV); makefile.AddDefinition(ARGN, argnDef); diff --git a/Source/cmGeneratorTarget_Link.cxx b/Source/cmGeneratorTarget_Link.cxx index 87c41b4..92e5ddf 100644 --- a/Source/cmGeneratorTarget_Link.cxx +++ b/Source/cmGeneratorTarget_Link.cxx @@ -203,11 +203,12 @@ bool cmGeneratorTarget::ComputeLinkClosure(const std::string& config, languages.insert(impl->Languages.cbegin(), impl->Languages.cend()); // Add interface languages from linked targets. - // cmTargetCollectLinkLanguages cll(this, config, languages, this, + // cmTargetCollectLinkLanguages linkLangs(this, config, languages, this, // secondPass); - cmTargetCollectLinkLanguages cll(this, config, languages, this, secondPass); + cmTargetCollectLinkLanguages linkLangs(this, config, languages, this, + secondPass); for (cmLinkImplItem const& lib : impl->Libraries) { - cll.Visit(lib); + linkLangs.Visit(lib); } // Store the transitive closure of languages. @@ -236,7 +237,7 @@ bool cmGeneratorTarget::ComputeLinkClosure(const std::string& config, } return impl->HadLinkLanguageSensitiveCondition || - cll.GetHadLinkLanguageSensitiveCondition(); + linkLangs.GetHadLinkLanguageSensitiveCondition(); } void cmGeneratorTarget::ComputeLinkClosure(const std::string& config, diff --git a/Source/cmGhsMultiGpj.cxx b/Source/cmGhsMultiGpj.cxx index da27971..dd91418 100644 --- a/Source/cmGhsMultiGpj.cxx +++ b/Source/cmGhsMultiGpj.cxx @@ -16,7 +16,7 @@ const char* GhsMultiGpj::GetGpjTag(Types gpjType) { char const* tag; switch (gpjType) { - case INTERGRITY_APPLICATION: + case INTEGRITY_APPLICATION: case LIBRARY: case PROJECT: case PROGRAM: diff --git a/Source/cmGhsMultiGpj.h b/Source/cmGhsMultiGpj.h index 1cae660..f605f95 100644 --- a/Source/cmGhsMultiGpj.h +++ b/Source/cmGhsMultiGpj.h @@ -11,7 +11,7 @@ class GhsMultiGpj public: enum Types { - INTERGRITY_APPLICATION, + INTEGRITY_APPLICATION, LIBRARY, PROJECT, PROGRAM, diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 888dfd3..60679ba 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -63,7 +63,7 @@ void cmGhsMultiTargetGenerator::Generate() this->TargetNameReal = this->GeneratorTarget->GetExecutableNames(this->ConfigName).Real; if (this->cmGhsMultiTargetGenerator::DetermineIfIntegrityApp()) { - this->TagType = GhsMultiGpj::INTERGRITY_APPLICATION; + this->TagType = GhsMultiGpj::INTEGRITY_APPLICATION; } else { this->TagType = GhsMultiGpj::PROGRAM; } @@ -287,7 +287,7 @@ void cmGhsMultiTargetGenerator::WriteIncludes(std::ostream& fout, void cmGhsMultiTargetGenerator::WriteTargetLinkLine(std::ostream& fout, std::string const& config) { - if (this->TagType == GhsMultiGpj::INTERGRITY_APPLICATION) { + if (this->TagType == GhsMultiGpj::INTEGRITY_APPLICATION) { return; } diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 784d6cd..b720ce9 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -412,7 +412,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends( // VS <= 7.1 has two behaviors that affect solution dependencies. // // (1) Solution-level dependencies between a linkable target and a - // library cause that library to be linked. We use an intermedite + // library cause that library to be linked. We use an intermediate // empty utility target to express the dependency. (VS 8 and above // provide a project file "LinkLibraryDependencies" setting to // choose whether to activate this behavior. We disable it except diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 3f7f462..daef821 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2125,12 +2125,12 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag, std::string& flags) { std::string retFlag; - std::string::size_type lastOccurancePos = flags.rfind(flag); + std::string::size_type lastOccurrencePos = flags.rfind(flag); bool saved = false; - while (lastOccurancePos != std::string::npos) { - // increment pos, we use lastOccurancePos to reduce search space on next + while (lastOccurrencePos != std::string::npos) { + // increment pos, we use lastOccurrencePos to reduce search space on next // inc - std::string::size_type pos = lastOccurancePos; + std::string::size_type pos = lastOccurrencePos; if (pos == 0 || flags[pos - 1] == ' ') { while (pos < flags.size() && flags[pos] != ' ') { if (!saved) { @@ -2141,10 +2141,10 @@ std::string cmGlobalXCodeGenerator::ExtractFlag(const char* flag, } saved = true; } - // decrement lastOccurancePos while making sure we don't loop around + // decrement lastOccurrencePos while making sure we don't loop around // and become a very large positive number since size_type is unsigned - lastOccurancePos = lastOccurancePos == 0 ? 0 : lastOccurancePos - 1; - lastOccurancePos = flags.rfind(flag, lastOccurancePos); + lastOccurrencePos = lastOccurrencePos == 0 ? 0 : lastOccurrencePos - 1; + lastOccurrencePos = flags.rfind(flag, lastOccurrencePos); } return retFlag; } diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index 6db410b..8d1c46e 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -208,7 +208,7 @@ protected: void WriteDependLanguageInfo(std::ostream& cmakefileStream, cmGeneratorTarget* tgt); - // this converts a file name that is relative to the StartOuputDirectory + // this converts a file name that is relative to the StartOutputDirectory // into a full path std::string ConvertToFullPath(const std::string& localPath); diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index b57c3dd..3c89e0c 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -66,9 +66,9 @@ bool cmMacroHelperCommand::operator()( // set the value of argc std::string argcDef = std::to_string(expandedArgs.size()); - auto eit = expandedArgs.begin() + (this->Args.size() - 1); + auto expIt = expandedArgs.begin() + (this->Args.size() - 1); std::string expandedArgn = - cmList::to_string(cmMakeRange(eit, expandedArgs.end())); + cmList::to_string(cmMakeRange(expIt, expandedArgs.end())); std::string expandedArgv = cmList::to_string(expandedArgs); std::vector variables; variables.reserve(this->Args.size() - 1); diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 0e5a7f6..8b34045 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -779,7 +779,7 @@ std::vector cmNinjaNormalTargetGenerator::ComputeLinkCmd( // file modification time. If the archive and at least one contained // object file were created within the same second this will make look // the archive older than the object file. On subsequent ninja runs this - // leads to re-achiving and updating dependent targets. + // leads to re-archiving and updating dependent targets. // As a work-around we touch the archive after ranlib (see #19222). { std::string cmakeCommand = diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index f3bb9cb..d2fb5b5 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -754,9 +754,9 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang, } else { scanRuleName = this->LanguagePreprocessAndScanRule(lang, config); ppFileName = "$out"; - std::string const& ppCommmand = mf->GetRequiredDefinition( + std::string const& ppCommand = mf->GetRequiredDefinition( cmStrCat("CMAKE_", lang, "_PREPROCESS_SOURCE")); - scanCommands.assign(ppCommmand); + scanCommands.assign(ppCommand); for (auto& i : scanCommands) { i = cmStrCat(launcher, i); } diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx index a46c87b..c8a15c7 100644 --- a/Source/cmOrderDirectories.cxx +++ b/Source/cmOrderDirectories.cxx @@ -268,7 +268,7 @@ void cmOrderDirectories::AddRuntimeLibrary(std::string const& fullPath, const char* soname) { // Add the runtime library at most once. - if (this->EmmittedConstraintSOName.insert(fullPath).second) { + if (this->EmittedConstraintSOName.insert(fullPath).second) { // Implicit link directories need special handling. if (!this->ImplicitDirectories.empty()) { std::string dir = cmSystemTools::GetFilenamePath(fullPath); @@ -309,7 +309,7 @@ void cmOrderDirectories::AddLinkLibrary(std::string const& fullPath) assert(!this->LinkExtensions.empty()); // Add the link library at most once. - if (this->EmmittedConstraintLibrary.insert(fullPath).second) { + if (this->EmittedConstraintLibrary.insert(fullPath).second) { // Implicit link directories need special handling. if (!this->ImplicitDirectories.empty()) { std::string dir = cmSystemTools::GetFilenamePath(fullPath); diff --git a/Source/cmOrderDirectories.h b/Source/cmOrderDirectories.h index 7788ea8..e6f6ead 100644 --- a/Source/cmOrderDirectories.h +++ b/Source/cmOrderDirectories.h @@ -54,8 +54,8 @@ private: cmsys::RegularExpression RemoveLibraryExtension; std::vector LinkExtensions; std::set ImplicitDirectories; - std::set EmmittedConstraintSOName; - std::set EmmittedConstraintLibrary; + std::set EmittedConstraintSOName; + std::set EmittedConstraintLibrary; std::vector OriginalDirectories; std::map DirectoryIndex; std::vector DirectoryVisited; diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index e70e159..cb0b7a0 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -272,7 +272,7 @@ class cmMakefile; SELECT(POLICY, CMP0093, "FindBoost reports Boost_VERSION in x.y.z format.", \ 3, 15, 0, WARN) \ SELECT(POLICY, CMP0094, \ - "FindPython3, FindPython2 and FindPyton use " \ + "FindPython3, FindPython2 and FindPython use " \ "LOCATION for lookup strategy.", \ 3, 15, 0, WARN) \ SELECT(POLICY, CMP0095, \ diff --git a/Source/cmQtAutoGen.cxx b/Source/cmQtAutoGen.cxx index 0a394b5..aed3dbf 100644 --- a/Source/cmQtAutoGen.cxx +++ b/Source/cmQtAutoGen.cxx @@ -296,7 +296,7 @@ cmQtAutoGen::RccLister::RccLister() = default; cmQtAutoGen::RccLister::RccLister(std::string rccExecutable, std::vector listOptions) - : RccExcutable_(std::move(rccExecutable)) + : RccExecutable_(std::move(rccExecutable)) , ListOptions_(std::move(listOptions)) { } @@ -319,8 +319,8 @@ bool cmQtAutoGen::RccLister::list(std::string const& qrcFile, // contains non-ASCII characters. std::string const fileDir = cmSystemTools::GetFilenamePath(qrcFile); - if (!this->RccExcutable_.empty() && - cmSystemTools::FileExists(this->RccExcutable_, true) && + if (!this->RccExecutable_.empty() && + cmSystemTools::FileExists(this->RccExecutable_, true) && !this->ListOptions_.empty()) { bool result = false; @@ -329,7 +329,7 @@ bool cmQtAutoGen::RccLister::list(std::string const& qrcFile, std::string rccStdErr; { std::vector cmd; - cmd.emplace_back(this->RccExcutable_); + cmd.emplace_back(this->RccExecutable_); cm::append(cmd, this->ListOptions_); cmd.emplace_back(cmSystemTools::GetFilenameName(qrcFile)); diff --git a/Source/cmQtAutoGen.h b/Source/cmQtAutoGen.h index b302403..44d30ef 100644 --- a/Source/cmQtAutoGen.h +++ b/Source/cmQtAutoGen.h @@ -127,10 +127,10 @@ public: RccLister(std::string rccExecutable, std::vector listOptions); //! The rcc executable - std::string const& RccExcutable() const { return this->RccExcutable_; } + std::string const& RccExecutable() const { return this->RccExecutable_; } void SetRccExecutable(std::string const& rccExecutable) { - this->RccExcutable_ = rccExecutable; + this->RccExecutable_ = rccExecutable; } //! The rcc executable list options @@ -152,7 +152,7 @@ public: std::string& error, bool verbose = false) const; private: - std::string RccExcutable_; + std::string RccExecutable_; std::vector ListOptions_; }; }; diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 8bedc11..91828e4 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -385,7 +385,7 @@ public: std::set const& source, std::size_t basePrefixLength); void MocMacro(); - void MocDependecies(); + void MocDependencies(); void MocIncludes(); void UicIncludes(); @@ -1083,7 +1083,7 @@ void cmQtAutoMocUicT::JobParseT::MocMacro() } } -void cmQtAutoMocUicT::JobParseT::MocDependecies() +void cmQtAutoMocUicT::JobParseT::MocDependencies() { if (this->MocConst().DependFilters.empty() || this->MocConst().CanOutputDependencies) { @@ -1187,7 +1187,7 @@ void cmQtAutoMocUicT::JobParseHeaderT::Process() // Moc parsing if (this->FileHandle->Moc) { this->MocMacro(); - this->MocDependecies(); + this->MocDependencies(); } // Uic parsing if (this->FileHandle->Uic) { @@ -1203,7 +1203,7 @@ void cmQtAutoMocUicT::JobParseSourceT::Process() // Moc parsing if (this->FileHandle->Moc) { this->MocMacro(); - this->MocDependecies(); + this->MocDependencies(); this->MocIncludes(); } // Uic parsing diff --git a/Source/cmStateDirectory.cxx b/Source/cmStateDirectory.cxx index 104e707..2858600 100644 --- a/Source/cmStateDirectory.cxx +++ b/Source/cmStateDirectory.cxx @@ -66,7 +66,7 @@ cmBTStringRange GetPropertyContent(T const& content, U contentEndPosition) auto end = content.begin() + contentEndPosition; auto rbegin = cm::make_reverse_iterator(end); - rbegin = std::find(rbegin, content.rend(), cmPropertySentinal); + rbegin = std::find(rbegin, content.rend(), cmPropertySentinel); return cmMakeRange(rbegin.base(), end); } @@ -130,7 +130,7 @@ void cmStateDirectory::PrependIncludeDirectoriesEntry( auto rend = this->DirectoryState->IncludeDirectories.rend(); auto rbegin = cm::make_reverse_iterator(entryEnd); - rbegin = std::find(rbegin, rend, cmPropertySentinal); + rbegin = std::find(rbegin, rend, cmPropertySentinel); auto entryIt = rbegin.base(); @@ -244,7 +244,7 @@ void cmStateDirectory::PrependLinkDirectoriesEntry(const BT& vec) auto rend = this->DirectoryState->LinkDirectories.rend(); auto rbegin = cm::make_reverse_iterator(entryEnd); - rbegin = std::find(rbegin, rend, cmPropertySentinal); + rbegin = std::find(rbegin, rend, cmPropertySentinel); auto entryIt = rbegin.base(); diff --git a/Source/cmStatePrivate.h b/Source/cmStatePrivate.h index ec14834..c4edb26 100644 --- a/Source/cmStatePrivate.h +++ b/Source/cmStatePrivate.h @@ -21,7 +21,7 @@ struct BuildsystemDirectoryStateType; struct PolicyStackEntry; } // namespace cmStateDetail -static const std::string cmPropertySentinal = std::string(); +static const std::string cmPropertySentinel = std::string(); struct cmStateDetail::SnapshotDataType { diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx index 1485992..0e48ab2 100644 --- a/Source/cmStateSnapshot.cxx +++ b/Source/cmStateSnapshot.cxx @@ -271,7 +271,7 @@ void InitializeContentFromParent(T& parentContent, T& thisContent, auto parentRbegin = cm::make_reverse_iterator(parentEnd); auto parentRend = parentContent.rend(); - parentRbegin = std::find(parentRbegin, parentRend, cmPropertySentinal); + parentRbegin = std::find(parentRbegin, parentRend, cmPropertySentinel); auto parentIt = parentRbegin.base(); thisContent = std::vector>(parentIt, parentEnd); diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index cac7605..da3d35e 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1957,15 +1957,15 @@ std::vector cmSystemTools::GetEnvironmentVariables() void cmSystemTools::AppendEnv(std::vector const& env) { - for (std::string const& eit : env) { - cmSystemTools::PutEnv(eit); + for (std::string const& var : env) { + cmSystemTools::PutEnv(var); } } void cmSystemTools::EnvDiff::AppendEnv(std::vector const& env) { - for (std::string const& eit : env) { - this->PutEnv(eit); + for (std::string const& var : env) { + this->PutEnv(var); } } @@ -2500,7 +2500,7 @@ bool extract_tar(const std::string& outFileName, } } - bool error_occured = false; + bool error_occurred = false; if (matching) { const char* p; int ar; @@ -2509,9 +2509,9 @@ bool extract_tar(const std::string& outFileName, ARCHIVE_OK) { cmSystemTools::Error("tar: " + std::string(p) + ": Not found in archive"); - error_occured = true; + error_occurred = true; } - if (error_occured) { + if (error_occurred) { return false; } if (ar == ARCHIVE_FATAL) { diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index c2860d6..de5081f 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2137,8 +2137,8 @@ struct ReadOnlyProperty } }; -bool IsSetableProperty(cmMakefile* context, cmTarget* target, - const std::string& prop) +bool IsSettableProperty(cmMakefile* context, cmTarget* target, + const std::string& prop) { using ROC = ReadOnlyCondition; static std::unordered_map const readOnlyProps{ @@ -2171,7 +2171,7 @@ bool IsSetableProperty(cmMakefile* context, cmTarget* target, void cmTarget::SetProperty(const std::string& prop, cmValue value) { - if (!IsSetableProperty(this->impl->Makefile, this, prop)) { + if (!IsSettableProperty(this->impl->Makefile, this, prop)) { return; } @@ -2316,7 +2316,7 @@ void cmTarget::AppendProperty(const std::string& prop, cm::optional const& bt, bool asString) { - if (!IsSetableProperty(this->impl->Makefile, this, prop)) { + if (!IsSettableProperty(this->impl->Makefile, this, prop)) { return; } if (prop == "IMPORTED_GLOBAL") { @@ -3474,9 +3474,9 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config, cmValue& loc, if (cmValue iconfigs = this->GetProperty("IMPORTED_CONFIGURATIONS")) { availableConfigs.assign(*iconfigs); } - for (auto aci = availableConfigs.begin(); - !loc && !imp && aci != availableConfigs.end(); ++aci) { - suffix = cmStrCat('_', cmSystemTools::UpperCase(*aci)); + for (auto it = availableConfigs.begin(); + !loc && !imp && it != availableConfigs.end(); ++it) { + suffix = cmStrCat('_', cmSystemTools::UpperCase(*it)); std::string locProp = cmStrCat(locPropBase, suffix); loc = this->GetProperty(locProp); if (allowImp) { diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index b5d8ebc..48f4d4f 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -176,7 +176,7 @@ bool cmTargetLinkLibrariesCommand(std::vector const& args, // specification if the keyword is encountered as the first argument. ProcessingState currentProcessingState = ProcessingLinkLibraries; - // Accumulate consectuive non-keyword arguments into one entry in + // Accumulate consecutive non-keyword arguments into one entry in // order to handle unquoted generator expressions containing ';'. std::size_t genexNesting = 0; cm::optional currentEntry; diff --git a/Source/cmWindowsRegistry.h b/Source/cmWindowsRegistry.h index 42179ed..9c89a7b 100644 --- a/Source/cmWindowsRegistry.h +++ b/Source/cmWindowsRegistry.h @@ -43,7 +43,7 @@ public: // All types as defined by enum ValueType static const ValueTypeSet AllTypes; - // same as AllTYpes but without type REG_MULTI_SZ + // same as AllTypes but without type REG_MULTI_SZ static const ValueTypeSet SimpleTypes; cmWindowsRegistry(cmMakefile&, diff --git a/Source/cmWorkerPool.cxx b/Source/cmWorkerPool.cxx index 69ebdab..dc7c944 100644 --- a/Source/cmWorkerPool.cxx +++ b/Source/cmWorkerPool.cxx @@ -455,19 +455,19 @@ bool cmWorkerPoolWorker::RunProcess(cmWorkerPool::ProcessResultT& result, void cmWorkerPoolWorker::UVProcessStart(uv_async_t* handle) { - auto* wrk = reinterpret_cast(handle->data); + auto* worker = reinterpret_cast(handle->data); bool startFailed = false; { - auto& Proc = wrk->Proc_; + auto& Proc = worker->Proc_; std::lock_guard lock(Proc.Mutex); if (Proc.ROP && !Proc.ROP->IsStarted()) { - startFailed = - !Proc.ROP->start(handle->loop, [wrk] { wrk->UVProcessFinished(); }); + startFailed = !Proc.ROP->start( + handle->loop, [worker] { worker->UVProcessFinished(); }); } } // Clean up if starting of the process failed if (startFailed) { - wrk->UVProcessFinished(); + worker->UVProcessFinished(); } } @@ -735,8 +735,8 @@ bool cmWorkerPool::JobT::RunProcess(ProcessResultT& result, std::string const& workingDirectory) { // Get worker by index - auto* wrk = this->Pool_->Int_->Workers.at(this->WorkerIndex_).get(); - return wrk->RunProcess(result, command, workingDirectory); + auto* worker = this->Pool_->Int_->Workers.at(this->WorkerIndex_).get(); + return worker->RunProcess(result, command, workingDirectory); } cmWorkerPool::cmWorkerPool() diff --git a/Source/cmXMLParser.h b/Source/cmXMLParser.h index d35e44f..c4a4c93 100644 --- a/Source/cmXMLParser.h +++ b/Source/cmXMLParser.h @@ -33,7 +33,7 @@ public: /** * When parsing fragments of XML or streaming XML, use the following * three methods. InitializeParser method initialize parser but does - * not perform any actual parsing. ParseChunk parses framgent of + * not perform any actual parsing. ParseChunk parses fragment of * XML. This has to match to what was already parsed. CleanupParser * finishes parsing. If there were errors, CleanupParser will report * them. diff --git a/Tests/CTestUpdateCommon.cmake b/Tests/CTestUpdateCommon.cmake index 467b41a..2ecc088 100644 --- a/Tests/CTestUpdateCommon.cmake +++ b/Tests/CTestUpdateCommon.cmake @@ -241,16 +241,16 @@ function(check_no_update bin_dir) file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_REVISIONS REGEX "^\t<(${rev_regex})>[^<\n]+$" ) - set(found_revisons FALSE) + set(found_revisions FALSE) foreach(r IN LISTS UPDATE_XML_REVISIONS) if("${r}" MATCHES "PriorRevision") message(FATAL_ERROR "Found PriorRevision in no update test") endif() if("${r}" MATCHES "") - set(found_revisons TRUE) + set(found_revisions TRUE) endif() endforeach() - if(found_revisons) + if(found_revisions) message(" found in no update test") else() message(FATAL_ERROR " missing in no update test") diff --git a/Tests/CudaOnly/WithDefs/CMakeLists.txt b/Tests/CudaOnly/WithDefs/CMakeLists.txt index 39bcd91..def6e86 100644 --- a/Tests/CudaOnly/WithDefs/CMakeLists.txt +++ b/Tests/CudaOnly/WithDefs/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(release_compile_defs DEFREL) #Goal for this example: -#build a executable that needs to be passed a complex define through add_defintions +#build a executable that needs to be passed a complex define through add_definitions #this verifies we can pass things such as '_','(' to nvcc add_definitions("-DPACKED_DEFINE=__attribute__((packed))") diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt index 78ba293..3fd2100 100644 --- a/Tests/Preprocess/CMakeLists.txt +++ b/Tests/Preprocess/CMakeLists.txt @@ -232,7 +232,7 @@ set(TARGET_PATH "${Preprocess_SOURCE_DIR}/target_def.h") foreach(c "" "_DEBUG" "_RELEASE" "_RELWITHDEBINFO" "_MINSIZEREL") set(FLAVOR "${c}") # Treat RelWithDebInfo and MinSizeRel as Release to avoid having - # an exponentional matrix of inclusions and exclusions of defines + # an exponential matrix of inclusions and exclusions of defines if("${c}" STREQUAL "_RELWITHDEBINFO" OR "${c}" STREQUAL "_MINSIZEREL") set(FLAVOR "_RELEASE") endif() diff --git a/Tests/RunCMake/Autogen_common/utils.cmake b/Tests/RunCMake/Autogen_common/utils.cmake index 0692ca5..c7b4f07 100644 --- a/Tests/RunCMake/Autogen_common/utils.cmake +++ b/Tests/RunCMake/Autogen_common/utils.cmake @@ -210,12 +210,12 @@ function(autogen_executable_test exe) block() if (exe STREQUAL "Moc" OR exe STREQUAL "Uic") set(RunCMake_TEST_NOT_EXPECT_stdout "Auto${exe}") - set(not_expect_descripton "Auto${exe}") + set(not_expect_description "Auto${exe}") else () set(RunCMake_TEST_NOT_EXPECT_stdout "Auto${exe}") - set(not_expect_descripton "Auto${exe}") + set(not_expect_description "Auto${exe}") endif() - set(RunCMake_TEST_VARIANT_DESCRIPTION "-second-build-${config}_expect_no_${not_expect_descripton}") + set(RunCMake_TEST_VARIANT_DESCRIPTION "-second-build-${config}_expect_no_${not_expect_description}") run_cmake_command(${exe}Example-build ${CMAKE_COMMAND} --build . --config ${config}) endblock() endforeach() diff --git a/Tests/RunCMake/GetPrerequisites/ExecutableScripts-stdout.txt b/Tests/RunCMake/GetPrerequisites/ExecutableScripts-stdout.txt index 5a353d8..6f9f97b 100644 --- a/Tests/RunCMake/GetPrerequisites/ExecutableScripts-stdout.txt +++ b/Tests/RunCMake/GetPrerequisites/ExecutableScripts-stdout.txt @@ -1,3 +1,3 @@ --- GetPrequisites\(.*script.sh\) : ignoring script file --- GetPrequisites\(.*script.bat\) : ignoring script file --- GetPrequisites\(.*script\) : ignoring script file +-- GetPrerequisites\(.*script.sh\) : ignoring script file +-- GetPrerequisites\(.*script.bat\) : ignoring script file +-- GetPrerequisites\(.*script\) : ignoring script file diff --git a/Tests/RunCMake/cmake_host_system_information/UnitTest-stdout.txt b/Tests/RunCMake/cmake_host_system_information/UnitTest-stdout.txt index db6f487..f760506 100644 --- a/Tests/RunCMake/cmake_host_system_information/UnitTest-stdout.txt +++ b/Tests/RunCMake/cmake_host_system_information/UnitTest-stdout.txt @@ -1,7 +1,7 @@ -- UNIT_TEST_A_LIST_LIKE_VARIABLE=`satu;dua;tiga` -- UNIT_TEST_DBL_QUOTED_VALUE=`"The" value in double "quotes"` --- UNIT_TEST_DBL_QUOTED_VALUE_STIPPED_COMMENT=`Blah blah blah` +-- UNIT_TEST_DBL_QUOTED_VALUE_STRIPPED_COMMENT=`Blah blah blah` -- UNIT_TEST_NON_SPACE_VALUE=`Blah-blah-blah` -- UNIT_TEST_QUOTED_VALUE=`'The' value in single 'quotes'` --- UNIT_TEST_QUOTED_VALUE_STIPPED_COMMENT=`The value in single quotes` +-- UNIT_TEST_QUOTED_VALUE_STRIPPED_COMMENT=`The value in single quotes` -- UNIT_TEST_THE_URL_WITH_ANCHOR_TEST=`https://blah.blah/resource#anchor` diff --git a/Tests/RunCMake/cmake_host_system_information/UnitTest/etc/os-release b/Tests/RunCMake/cmake_host_system_information/UnitTest/etc/os-release index 66c33b5..6d5a308 100644 --- a/Tests/RunCMake/cmake_host_system_information/UnitTest/etc/os-release +++ b/Tests/RunCMake/cmake_host_system_information/UnitTest/etc/os-release @@ -1,9 +1,9 @@ # Comment string gonna be ignored NON_SPACE_VALUE=Blah-blah-blah QUOTED_VALUE='\'The\' value in single \'quotes\'' -QUOTED_VALUE_STIPPED_COMMENT='The value in single quotes'# The comment right after `'` +QUOTED_VALUE_STRIPPED_COMMENT='The value in single quotes'# The comment right after `'` DBL_QUOTED_VALUE="\"The\" value in double \"quotes\"" -DBL_QUOTED_VALUE_STIPPED_COMMENT="Blah blah blah"# The comment right after `'` +DBL_QUOTED_VALUE_STRIPPED_COMMENT="Blah blah blah"# The comment right after `'` THE_URL_WITH_ANCHOR_TEST="https://blah.blah/resource#anchor" # And a comment after A_LIST_LIKE_VARIABLE='satu;dua;tiga' INCORRECT_ESCAPE_IGNORED=\'This line gonna be ignored' diff --git a/Tests/RunCMake/load_cache/NewForm_Project.cmake b/Tests/RunCMake/load_cache/NewForm_Project.cmake index 13a450b..0a4d4be 100644 --- a/Tests/RunCMake/load_cache/NewForm_Project.cmake +++ b/Tests/RunCMake/load_cache/NewForm_Project.cmake @@ -12,5 +12,5 @@ if(NOT LOAD_CACHE_TEST_CACHE_BOOL) endif() if(NOT LOAD_CACHE_TEST_CACHE_INTERNAL STREQUAL "cache internal") - message(FATAL_ERROR "CACHE_INTERNAL: was ${CACHE_INTENRAL}, expected \"cache internal\"") + message(FATAL_ERROR "CACHE_INTERNAL: was ${CACHE_INTERNAL}, expected \"cache internal\"") endif() diff --git a/Tests/RunCMake/load_cache/NewForm_Script.cmake b/Tests/RunCMake/load_cache/NewForm_Script.cmake index f3cee92..373ff67 100644 --- a/Tests/RunCMake/load_cache/NewForm_Script.cmake +++ b/Tests/RunCMake/load_cache/NewForm_Script.cmake @@ -12,5 +12,5 @@ if(NOT LOAD_CACHE_TEST_CACHE_BOOL) endif() if(NOT LOAD_CACHE_TEST_CACHE_INTERNAL STREQUAL "cache internal") - message(FATAL_ERROR "CACHE_INTERNAL: was ${CACHE_INTENRAL}, expected \"cache internal\"") + message(FATAL_ERROR "CACHE_INTERNAL: was ${CACHE_INTERNAL}, expected \"cache internal\"") endif() diff --git a/Tests/RunCMake/load_cache/OldForm_Script.cmake b/Tests/RunCMake/load_cache/OldForm_Script.cmake index 9560f61..e232e2a 100644 --- a/Tests/RunCMake/load_cache/OldForm_Script.cmake +++ b/Tests/RunCMake/load_cache/OldForm_Script.cmake @@ -9,5 +9,5 @@ if(NOT CACHE_BOOL) endif() if(NOT CACHE_INTERNAL STREQUAL "cache internal") - message(FATAL_ERROR "CACHE_INTERNAL: was ${CACHE_INTENRAL}, expected \"cache internal\"") + message(FATAL_ERROR "CACHE_INTERNAL: was ${CACHE_INTERNAL}, expected \"cache internal\"") endif() diff --git a/Tests/XCTest/FrameworkExample/FrameworkExample.c b/Tests/XCTest/FrameworkExample/FrameworkExample.c index 9da1bf2..07d24f0 100644 --- a/Tests/XCTest/FrameworkExample/FrameworkExample.c +++ b/Tests/XCTest/FrameworkExample/FrameworkExample.c @@ -1,6 +1,6 @@ #include "FrameworkExample.h" -int FourtyTwo(void) +int FortyTwo(void) { return 42; } diff --git a/Tests/XCTest/FrameworkExample/FrameworkExample.h b/Tests/XCTest/FrameworkExample/FrameworkExample.h index 2e0b499..cb4cb78 100644 --- a/Tests/XCTest/FrameworkExample/FrameworkExample.h +++ b/Tests/XCTest/FrameworkExample/FrameworkExample.h @@ -1 +1 @@ -int FourtyTwo(); +int FortyTwo(); diff --git a/Tests/XCTest/FrameworkExampleTests/FrameworkExampleTests.m b/Tests/XCTest/FrameworkExampleTests/FrameworkExampleTests.m index 7cba23e..ba0feb2 100644 --- a/Tests/XCTest/FrameworkExampleTests/FrameworkExampleTests.m +++ b/Tests/XCTest/FrameworkExampleTests/FrameworkExampleTests.m @@ -8,9 +8,9 @@ @implementation FrameworkExampleTests -- (void)testFourtyTwo { +- (void)testFortyTwo { // This is an example of a functional test case. - XCTAssertEqual(42, FourtyTwo()); + XCTAssertEqual(42, FortyTwo()); } @end diff --git a/Tests/XCTest/StaticLibExample/StaticLibExample.c b/Tests/XCTest/StaticLibExample/StaticLibExample.c index 8d16eb5..99e8b19 100644 --- a/Tests/XCTest/StaticLibExample/StaticLibExample.c +++ b/Tests/XCTest/StaticLibExample/StaticLibExample.c @@ -1,6 +1,6 @@ #include "StaticLibExample.h" -int FourtyFour(void) +int FortyFour(void) { return 44; } diff --git a/Tests/XCTest/StaticLibExample/StaticLibExample.h b/Tests/XCTest/StaticLibExample/StaticLibExample.h index 88695b1..15aa6bd 100644 --- a/Tests/XCTest/StaticLibExample/StaticLibExample.h +++ b/Tests/XCTest/StaticLibExample/StaticLibExample.h @@ -1 +1 @@ -int FourtyFour(void); +int FortyFour(void); diff --git a/Tests/XCTest/StaticLibExampleTests/StaticLibExampleTests.m b/Tests/XCTest/StaticLibExampleTests/StaticLibExampleTests.m index 5f8a769..7d3b272 100644 --- a/Tests/XCTest/StaticLibExampleTests/StaticLibExampleTests.m +++ b/Tests/XCTest/StaticLibExampleTests/StaticLibExampleTests.m @@ -8,9 +8,9 @@ @implementation StaticLibExampleTests -- (void)testFourtyFour { +- (void)testFortyFour { // This is an example of a functional test case. - XCTAssertEqual(44, FourtyFour()); + XCTAssertEqual(44, FortyFour()); } @end diff --git a/Utilities/Scripts/update-third-party.bash b/Utilities/Scripts/update-third-party.bash index cf76b17..98fc5a5 100644 --- a/Utilities/Scripts/update-third-party.bash +++ b/Utilities/Scripts/update-third-party.bash @@ -119,7 +119,7 @@ cd "$toplevel_dir" die "'tag' is empty" # Check for an empty destination directory on disk. By checking on disk and -# not in the repo it allows a library to be freshly re-inialized in a single +# not in the repo it allows a library to be freshly re-initialized in a single # commit rather than first deleting the old copy in one commit and adding the # new copy in a separate commit. if [ ! -d "$(git rev-parse --show-toplevel)/$subtree" ]; then diff --git a/bootstrap b/bootstrap index 6173b31..c9ebf93 100755 --- a/bootstrap +++ b/bootstrap @@ -1671,8 +1671,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\ cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\"" cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\"" cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400" -cmake_report cmConfigure.h${_tmp} "#define CMAKE_BIN_DIR \"/bootstrap-not-insalled\"" -cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-insalled\"" +cmake_report cmConfigure.h${_tmp} "#define CMAKE_BIN_DIR \"/bootstrap-not-installed\"" +cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"/bootstrap-not-installed\"" cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH" if test "${cmake_bootstrap_generator}" = "Ninja"; then -- cgit v0.12 From e7ff3cccea5d1a48734e17bf903e89aa4850f410 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Thu, 9 Jan 2025 06:23:30 +0400 Subject: PushToAndroidDevice.cmake: Rename `cmake_parse_arguments` prefix The upcoming `typos` spell checker don't like the old prefix, so to avoid further false-positive, let's rename it to a more generic and a bit more readable `_arg`. --- .../AndroidTestUtilities/PushToAndroidDevice.cmake | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake index fccff67..4c6e9fd 100644 --- a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake +++ b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake @@ -109,38 +109,38 @@ function(android_push_test_files_to_device) #---------------------------------------------------------------------------- set(oneValueArgs FILES_DEST LIBS_DEST DEV_TEST_DIR DEV_OBJ_STORE) set(multiValueArgs FILES LIBS) - cmake_parse_arguments(_ptd "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(_arg "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) # Setup of object store and test dir. - check_device_file_exists(${_ptd_DEV_OBJ_STORE} dev_obj_store_exists) + check_device_file_exists(${_arg_DEV_OBJ_STORE} dev_obj_store_exists) if(NOT dev_obj_store_exists) - execute_adb_command(shell mkdir -p ${_ptd_DEV_OBJ_STORE}) + execute_adb_command(shell mkdir -p ${_arg_DEV_OBJ_STORE}) endif() - check_device_file_exists(${_ptd_DEV_TEST_DIR} test_dir_exists) + check_device_file_exists(${_arg_DEV_TEST_DIR} test_dir_exists) if(test_dir_exists) # This is protected in the SetupProjectTests module. - execute_adb_command(shell rm -r ${_ptd_DEV_TEST_DIR}) + execute_adb_command(shell rm -r ${_arg_DEV_TEST_DIR}) endif() - execute_adb_command(shell mkdir -p ${_ptd_DEV_TEST_DIR}) + execute_adb_command(shell mkdir -p ${_arg_DEV_TEST_DIR}) # Looping over the various types of test data possible. foreach(TYPE ${multiValueArgs}) - if(_ptd_${TYPE}) + if(_arg_${TYPE}) # determine if the data type destination has been explicitly specified. - if(_ptd_${TYPE}_DEST) - set(dest ${_ptd_${TYPE}_DEST}) + if(_arg_${TYPE}_DEST) + set(dest ${_arg_${TYPE}_DEST}) else() if(${TYPE} STREQUAL LIBS) - set(dest ${_ptd_DEV_TEST_DIR}/lib) + set(dest ${_arg_DEV_TEST_DIR}/lib) else() - set(dest ${_ptd_DEV_TEST_DIR}) + set(dest ${_arg_DEV_TEST_DIR}) endif() endif() execute_adb_command(shell mkdir -p ${dest}) # Loop over the files passed in - foreach(relative_path ${_ptd_${TYPE}}) + foreach(relative_path ${_arg_${TYPE}}) # The absolute path can be through the source directory or the build directory. # If the file/dir exists in the build directory that version is chosen. set_absolute_path(${relative_path} absolute_path) @@ -154,9 +154,9 @@ function(android_push_test_files_to_device) execute_adb_command(shell mkdir -p ${on_dev_dir}) if(IS_SYMLINK ${absolute_path}) get_filename_component(real_data_origin ${absolute_path} REALPATH) - push_and_link(${real_data_origin} ${_ptd_DEV_OBJ_STORE} ${cur_dest}) + push_and_link(${real_data_origin} ${_arg_DEV_OBJ_STORE} ${cur_dest}) else() - push_and_link(${absolute_path} ${_ptd_DEV_OBJ_STORE} ${cur_dest}) + push_and_link(${absolute_path} ${_arg_DEV_OBJ_STORE} ${cur_dest}) endif() else() # LIBS execute_adb_command(push ${absolute_path} ${dest}) -- cgit v0.12 From d620d77d26cd01e7ad63348f82216d1eed6fe2c1 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Thu, 9 Jan 2025 06:27:53 +0400 Subject: FindDoxygen: Rename `_Doxygen_dne_header` -> `_Doxygen_do_not_edit_header` --- Modules/FindDoxygen.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 290516a..737faf4 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -743,7 +743,7 @@ if(TARGET Doxygen::doxygen) endif() # Write a do-not-edit header to files we are going to generate... - set(_Doxygen_dne_header + set(_Doxygen_do_not_edit_header [[ # # DO NOT EDIT! THIS FILE WAS GENERATED BY CMAKE! @@ -813,9 +813,9 @@ endif() "Unexpected line format! Code review required!\nFault line: ${_Doxygen_param}") endif() endforeach() - file(WRITE "${_doxyfile_defaults}" "${_Doxygen_dne_header}" + file(WRITE "${_doxyfile_defaults}" "${_Doxygen_do_not_edit_header}" "${_doxyfile_defaults_contents}") - file(WRITE "${_doxyfile_in}" "${_Doxygen_dne_header}" + file(WRITE "${_doxyfile_in}" "${_Doxygen_do_not_edit_header}" "${_doxyfile_in_contents}") # Ok, dumped defaults are not needed anymore... @@ -823,7 +823,7 @@ endif() unset(_Doxygen_param) unset(_Doxygen_tpl_params) - unset(_Doxygen_dne_header) + unset(_Doxygen_do_not_edit_header) unset(_Doxygen_tpl) endif() -- cgit v0.12