mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-24 07:08:38 -05:00
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)
This commit is contained in:
Alex Turbov
@@ -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:
|
||||
|
||||
@@ -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))))
|
||||
|
||||
|
||||
+1
-1
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
(``<source_base>.<header_extention>``) and
|
||||
(``<source_base>.<header_extension>``) and
|
||||
- a private header with the same base name and a ``_p`` suffix
|
||||
(``<source_base>_p.<header_extention>``)
|
||||
(``<source_base>_p.<header_extension>``)
|
||||
|
||||
and adds these to the scan list.
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
+1
-1
@@ -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}")
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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}")
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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})
|
||||
|
||||
@@ -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``
|
||||
|
||||
@@ -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)
|
||||
|
||||
+13
-13
@@ -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)
|
||||
|
||||
@@ -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}"
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 "")
|
||||
|
||||
+23
-19
@@ -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_<n>
|
||||
|
||||
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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -161,7 +161,7 @@ int cmCPackIFWGenerator::RunRepogen(const std::string& ifwTmpFile)
|
||||
return 1;
|
||||
}
|
||||
|
||||
std::vector<std::string> cmCPackIFWGenerator::BuildBinaryCreatorCommmand()
|
||||
std::vector<std::string> cmCPackIFWGenerator::BuildBinaryCreatorCommand()
|
||||
{
|
||||
std::vector<std::string> ifwCmd;
|
||||
std::string ifwArg;
|
||||
@@ -276,7 +276,7 @@ std::vector<std::string> cmCPackIFWGenerator::BuildBinaryCreatorCommmand()
|
||||
|
||||
int cmCPackIFWGenerator::RunBinaryCreator(const std::string& ifwTmpFile)
|
||||
{
|
||||
std::vector<std::string> ifwCmd = this->BuildBinaryCreatorCommmand();
|
||||
std::vector<std::string> ifwCmd = this->BuildBinaryCreatorCommand();
|
||||
cmCPackIFWLogger(VERBOSE,
|
||||
"Execute: " << cmSystemTools::PrintSingleCommand(ifwCmd)
|
||||
<< std::endl);
|
||||
|
||||
@@ -145,7 +145,7 @@ private:
|
||||
std::vector<std::string> BuildRepogenCommand();
|
||||
int RunRepogen(const std::string& ifwTmpFile);
|
||||
|
||||
std::vector<std::string> BuildBinaryCreatorCommmand();
|
||||
std::vector<std::string> BuildBinaryCreatorCommand();
|
||||
int RunBinaryCreator(const std::string& ifwTmpFile);
|
||||
|
||||
std::string RepoGen;
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -480,14 +480,14 @@ cmComputeLinkInformation::GetDirectoriesWithBacktraces()
|
||||
{
|
||||
std::vector<BT<std::string>> directoriesWithBacktraces;
|
||||
|
||||
std::vector<BT<std::string>> targetLinkDirectores =
|
||||
std::vector<BT<std::string>> targetLinkDirectories =
|
||||
this->Target->GetLinkDirectories(this->Config, this->LinkLanguage);
|
||||
|
||||
const std::vector<std::string>& 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);
|
||||
|
||||
@@ -22,7 +22,7 @@ bool cmCreateTestSourceList(std::vector<std::string> const& args,
|
||||
std::string extraInclude;
|
||||
std::string function;
|
||||
std::vector<std::string> tests;
|
||||
// extract extra include and function ot
|
||||
// extract extra include and function
|
||||
for (; i != args.end(); i++) {
|
||||
if (*i == "EXTRA_INCLUDE") {
|
||||
++i;
|
||||
|
||||
@@ -318,7 +318,7 @@ void cmExportFileGenerator::PopulateCustomTransitiveInterfaceProperties(
|
||||
properties);
|
||||
this->PopulateInterfaceProperty("TRANSITIVE_LINK_PROPERTIES", target,
|
||||
properties);
|
||||
cmGeneratorTarget::CheckLinkLibrariesSuppressionRAII cllSuppressRAII;
|
||||
cmGeneratorTarget::CheckLinkLibrariesSuppressionRAII suppress;
|
||||
std::set<std::string> ifaceProperties;
|
||||
for (std::string const& config : this->Configurations) {
|
||||
for (auto const& i : target->GetCustomTransitiveProperties(
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -11,7 +11,7 @@ class GhsMultiGpj
|
||||
public:
|
||||
enum Types
|
||||
{
|
||||
INTERGRITY_APPLICATION,
|
||||
INTEGRITY_APPLICATION,
|
||||
LIBRARY,
|
||||
PROJECT,
|
||||
PROGRAM,
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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<std::string> variables;
|
||||
variables.reserve(this->Args.size() - 1);
|
||||
|
||||
@@ -779,7 +779,7 @@ std::vector<std::string> 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 =
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -54,8 +54,8 @@ private:
|
||||
cmsys::RegularExpression RemoveLibraryExtension;
|
||||
std::vector<std::string> LinkExtensions;
|
||||
std::set<std::string> ImplicitDirectories;
|
||||
std::set<std::string> EmmittedConstraintSOName;
|
||||
std::set<std::string> EmmittedConstraintLibrary;
|
||||
std::set<std::string> EmittedConstraintSOName;
|
||||
std::set<std::string> EmittedConstraintLibrary;
|
||||
std::vector<std::string> OriginalDirectories;
|
||||
std::map<std::string, int> DirectoryIndex;
|
||||
std::vector<int> DirectoryVisited;
|
||||
|
||||
+1
-1
@@ -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, \
|
||||
|
||||
@@ -296,7 +296,7 @@ cmQtAutoGen::RccLister::RccLister() = default;
|
||||
|
||||
cmQtAutoGen::RccLister::RccLister(std::string rccExecutable,
|
||||
std::vector<std::string> 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<std::string> cmd;
|
||||
cmd.emplace_back(this->RccExcutable_);
|
||||
cmd.emplace_back(this->RccExecutable_);
|
||||
cm::append(cmd, this->ListOptions_);
|
||||
cmd.emplace_back(cmSystemTools::GetFilenameName(qrcFile));
|
||||
|
||||
|
||||
@@ -127,10 +127,10 @@ public:
|
||||
RccLister(std::string rccExecutable, std::vector<std::string> 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<std::string> ListOptions_;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -385,7 +385,7 @@ public:
|
||||
std::set<std::string> 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
|
||||
|
||||
@@ -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<std::string>& 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();
|
||||
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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<BT<std::string>>(parentIt, parentEnd);
|
||||
|
||||
@@ -1957,15 +1957,15 @@ std::vector<std::string> cmSystemTools::GetEnvironmentVariables()
|
||||
|
||||
void cmSystemTools::AppendEnv(std::vector<std::string> 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<std::string> 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) {
|
||||
|
||||
+7
-7
@@ -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<std::string, ReadOnlyProperty> 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<cmListFileBacktrace> 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) {
|
||||
|
||||
@@ -176,7 +176,7 @@ bool cmTargetLinkLibrariesCommand(std::vector<std::string> 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<std::string> currentEntry;
|
||||
|
||||
@@ -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&,
|
||||
|
||||
@@ -455,19 +455,19 @@ bool cmWorkerPoolWorker::RunProcess(cmWorkerPool::ProcessResultT& result,
|
||||
|
||||
void cmWorkerPoolWorker::UVProcessStart(uv_async_t* handle)
|
||||
{
|
||||
auto* wrk = reinterpret_cast<cmWorkerPoolWorker*>(handle->data);
|
||||
auto* worker = reinterpret_cast<cmWorkerPoolWorker*>(handle->data);
|
||||
bool startFailed = false;
|
||||
{
|
||||
auto& Proc = wrk->Proc_;
|
||||
auto& Proc = worker->Proc_;
|
||||
std::lock_guard<std::mutex> 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()
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -241,16 +241,16 @@ function(check_no_update bin_dir)
|
||||
file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_REVISIONS
|
||||
REGEX "^\t<(${rev_regex})>[^<\n]+</(${rev_regex})>$"
|
||||
)
|
||||
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 "<Revision>")
|
||||
set(found_revisons TRUE)
|
||||
set(found_revisions TRUE)
|
||||
endif()
|
||||
endforeach()
|
||||
if(found_revisons)
|
||||
if(found_revisions)
|
||||
message(" found <Revision> in no update test")
|
||||
else()
|
||||
message(FATAL_ERROR " missing <Revision> in no update test")
|
||||
|
||||
@@ -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))")
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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`
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "FrameworkExample.h"
|
||||
|
||||
int FourtyTwo(void)
|
||||
int FortyTwo(void)
|
||||
{
|
||||
return 42;
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
int FourtyTwo();
|
||||
int FortyTwo();
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "StaticLibExample.h"
|
||||
|
||||
int FourtyFour(void)
|
||||
int FortyFour(void)
|
||||
{
|
||||
return 44;
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
int FourtyFour(void);
|
||||
int FortyFour(void);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user