aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmake/README.md4
-rw-r--r--cmake/addons/README.md2
-rw-r--r--cmake/cpack/deb/packages/kodi-bin.txt.in2
-rw-r--r--cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in2
-rw-r--r--cmake/modules/FindFmt.cmake2
-rw-r--r--cmake/modules/FindSSE.cmake4
-rw-r--r--cmake/scripts/common/AddonHelpers.cmake16
-rw-r--r--cmake/scripts/common/ArchSetup.cmake2
-rw-r--r--cmake/scripts/common/CheckTargetPlatform.cmake4
-rw-r--r--cmake/scripts/common/Macros.cmake2
-rw-r--r--cmake/scripts/common/ProjectMacros.cmake2
-rw-r--r--cmake/scripts/freebsd/Macros.cmake2
-rw-r--r--cmake/scripts/linux/Macros.cmake2
-rw-r--r--cmake/scripts/windowsstore/ArchSetup.cmake4
-rw-r--r--cmake/scripts/windowsstore/Macros.cmake8
15 files changed, 29 insertions, 29 deletions
diff --git a/cmake/README.md b/cmake/README.md
index c1b953f2ed..b7d95874b2 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -295,10 +295,10 @@ for addon development and detailed documentation about the addon build system.
Clang and GCC support different kinds of Sanitizers. To enable a Sanitizer call CMake with the
option `-DECM_ENABLE_SANITIZERS=’san1;san2;...'`. For more information about enabling the
-Sanitizers read the documentation in
+Sanitizers read the documentation in
[modules/extra/ECMEnableSanitizers.cmake](https://github.com/xbmc/xbmc/tree/master/cmake/modules/extra/ECMEnableSanitizers.cmake).
-It is also recommended to read the sections about the Sanitizers in the [Clang
+It is also recommended to read the sections about the Sanitizers in the [Clang
documentation](http://clang.llvm.org/docs/).
## Debugging the build
diff --git a/cmake/addons/README.md b/cmake/addons/README.md
index 6470ee1686..e04c8345e8 100644
--- a/cmake/addons/README.md
+++ b/cmake/addons/README.md
@@ -5,7 +5,7 @@ This directory contains the cmake-based buildsystem for Kodi add-ons. It looks i
- `<addon-id> <git-url> <git-revision>`
- `<addon-id> <tarball-url>`
- `<addon-id> <file://path>`
-
+
where
- `<addon-id>` must be identical to the add-on's ID as defined in the add-on's addon.xml
- `<git-url>` must be the URL of the git repository containing the add-on
diff --git a/cmake/cpack/deb/packages/kodi-bin.txt.in b/cmake/cpack/deb/packages/kodi-bin.txt.in
index 2ece66fad1..0e31451821 100644
--- a/cmake/cpack/deb/packages/kodi-bin.txt.in
+++ b/cmake/cpack/deb/packages/kodi-bin.txt.in
@@ -15,7 +15,7 @@ PACKAGE_ARCHITECTURE
PACKAGE_SECTION video
PACKAGE_PRIORITY optional
PACKAGE_SHLIBDEPS ON
-PACKAGE_DEPENDS
+PACKAGE_DEPENDS
PACKAGE_RECOMMENDS
PACKAGE_SUGGESTS
PACKAGE_BREAKS xbmc-bin (<< 2:14.0~git20141019), xbmc-common
diff --git a/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in b/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in
index 36e8297121..79c1f0f8c8 100644
--- a/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in
+++ b/cmake/cpack/deb/packages/kodi-tools-texturepacker.txt.in
@@ -15,7 +15,7 @@ PACKAGE_ARCHITECTURE
PACKAGE_SECTION video
PACKAGE_PRIORITY optional
PACKAGE_SHLIBDEPS ON
-PACKAGE_DEPENDS
+PACKAGE_DEPENDS
PACKAGE_RECOMMENDS
PACKAGE_SUGGESTS
PACKAGE_BREAKS
diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake
index 5e475091cd..ec0a12cb9e 100644
--- a/cmake/modules/FindFmt.cmake
+++ b/cmake/modules/FindFmt.cmake
@@ -30,7 +30,7 @@ if(ENABLE_INTERNAL_FMT)
if(APPLE)
set(EXTRA_ARGS "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
- endif()
+ endif()
set(FMT_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libfmt.a)
set(FMT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
diff --git a/cmake/modules/FindSSE.cmake b/cmake/modules/FindSSE.cmake
index b860dca054..08e3630590 100644
--- a/cmake/modules/FindSSE.cmake
+++ b/cmake/modules/FindSSE.cmake
@@ -1,4 +1,4 @@
-# Check if SSE instructions are available on the machine where
+# Check if SSE instructions are available on the machine where
# the project is compiled.
include(TestCXXAcceptsFlag)
@@ -74,7 +74,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
string(REGEX REPLACE "^.*(AVX2).*$" "\\1" _SSE_THERE ${CPUINFO})
string(COMPARE EQUAL "AVX2" "${_SSE_THERE}" _AVX2_TRUE)
CHECK_CXX_ACCEPTS_FLAG("-mavx2" _AVX2_OK)
- endif()
+ endif()
elseif(CMAKE_SYSTEM_NAME MATCHES "Android")
if(CPU MATCHES "x86_64" OR CPU MATCHES "i.86")
set(_SSE_TRUE TRUE)
diff --git a/cmake/scripts/common/AddonHelpers.cmake b/cmake/scripts/common/AddonHelpers.cmake
index 05411c43d9..4bb4c98f59 100644
--- a/cmake/scripts/common/AddonHelpers.cmake
+++ b/cmake/scripts/common/AddonHelpers.cmake
@@ -1,9 +1,9 @@
# Workaround for the fact that cpack's filenames are not customizable.
# Each add-on is added as a separate component to facilitate zip/tgz packaging.
-# The filenames are always of the form basename-component, which is
+# The filenames are always of the form basename-component, which is
# incompatible with the addonid-version scheme we want. This hack renames
# the files from the file names generated by the 'package' target.
-# Sadly we cannot extend the 'package' target, as it is a builtin target, see
+# Sadly we cannot extend the 'package' target, as it is a builtin target, see
# http://public.kitware.com/Bug/view.php?id=8438
# Thus, we have to add an 'addon-package' target.
get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -32,7 +32,7 @@ macro (addon_version dir prefix)
file(READ ${dir}/addon.xml ADDONXML)
endif()
- string(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML})
+ string(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML})
string(REGEX REPLACE ".*version=.([0-9\\.]+).*" "\\1" ${prefix}_VERSION ${VERSION_STRING})
message(STATUS ${prefix}_VERSION=${${prefix}_VERSION})
endmacro()
@@ -62,7 +62,7 @@ macro (build_addon target prefix libs)
# include path name already complete
list(APPEND USED_SOURCES ${${prefix}_HEADERS})
else()
- # add the complete include path to begin
+ # add the complete include path to begin
foreach(hdr_file ${${prefix}_HEADERS})
list(APPEND USED_SOURCES ${PROJECT_SOURCE_DIR}/${hdr_file})
endforeach()
@@ -86,19 +86,19 @@ macro (build_addon target prefix libs)
# include path name already complete
list(APPEND USED_SOURCES ${${prefix}_SOURCES})
else()
- # add the complete include path to begin
+ # add the complete include path to begin
foreach(src_file ${${prefix}_SOURCES})
list(APPEND USED_SOURCES ${PROJECT_SOURCE_DIR}/${src_file})
endforeach()
endif()
-
+
# Set defines used in addon.xml.in and read from versions.h to set add-on
# version parts automatically
file(STRINGS ${KODI_INCLUDE_DIR}/versions.h BIN_ADDON_PARTS)
foreach(loop_var ${BIN_ADDON_PARTS})
# Only pass strings with "#define ADDON_" from versions.h
if(loop_var MATCHES "#define ADDON_")
- string(REGEX REPLACE "\\\n" " " loop_var ${loop_var}) # remove header line breaks
+ string(REGEX REPLACE "\\\n" " " loop_var ${loop_var}) # remove header line breaks
string(REGEX REPLACE "#define " "" loop_var ${loop_var}) # remove the #define name from string
string(REGEX MATCHALL "[//a-zA-Z0-9._-]+" loop_var "${loop_var}") # separate the define values to a list
@@ -385,7 +385,7 @@ if(HAVE_LTO)
if(USE_LTO)
add_options(ALL_LANGUAGES ALL_BUILDS "-flto")
endif()
-endif()
+endif()
# set this to try linking dependencies as static as possible
if(ADDONS_PREFER_STATIC_LIBS)
diff --git a/cmake/scripts/common/ArchSetup.cmake b/cmake/scripts/common/ArchSetup.cmake
index c97929e58c..157cf9a108 100644
--- a/cmake/scripts/common/ArchSetup.cmake
+++ b/cmake/scripts/common/ArchSetup.cmake
@@ -55,7 +55,7 @@ macro(check_builtin func var)
endmacro()
-# -------- Main script ---------
+# -------- Main script ---------
message(STATUS "System type: ${CMAKE_SYSTEM_NAME}")
if(WITH_CPU)
diff --git a/cmake/scripts/common/CheckTargetPlatform.cmake b/cmake/scripts/common/CheckTargetPlatform.cmake
index 82ee668c03..526e4bd1f1 100644
--- a/cmake/scripts/common/CheckTargetPlatform.cmake
+++ b/cmake/scripts/common/CheckTargetPlatform.cmake
@@ -9,9 +9,9 @@ function(check_target_platform dir target_platform build)
if(EXISTS ${dir} AND EXISTS ${dir}/platforms.txt)
# get all the specified platforms
file(STRINGS ${dir}/platforms.txt platforms)
-
+
list( LENGTH platforms listlen )
- if(${listlen} EQUAL 1)
+ if(${listlen} EQUAL 1)
string(REPLACE " " ";" platforms ${platforms})
endif()
diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake
index d90621db21..fa06870115 100644
--- a/cmake/scripts/common/Macros.cmake
+++ b/cmake/scripts/common/Macros.cmake
@@ -468,7 +468,7 @@ function(core_optional_dyload_dep)
foreach(depspec ${ARGN})
set(_required False)
split_dependency_specification(${depspec} dep version)
- setup_enable_switch()
+ setup_enable_switch()
if(${enable_switch} STREQUAL AUTO)
find_package_with_ver(${dep} ${version})
elseif(${${enable_switch}})
diff --git a/cmake/scripts/common/ProjectMacros.cmake b/cmake/scripts/common/ProjectMacros.cmake
index 641e0474fb..fba5252a9b 100644
--- a/cmake/scripts/common/ProjectMacros.cmake
+++ b/cmake/scripts/common/ProjectMacros.cmake
@@ -46,7 +46,7 @@ function(copy_skin_to_buildtree skin)
endfunction()
# Get GTest tests as CMake tests.
-# Copied from FindGTest.cmake
+# Copied from FindGTest.cmake
# Thanks to Daniel Blezek <blezek@gmail.com> for the GTEST_ADD_TESTS code
function(GTEST_ADD_TESTS executable extra_args)
if(NOT ARGN)
diff --git a/cmake/scripts/freebsd/Macros.cmake b/cmake/scripts/freebsd/Macros.cmake
index 69edc9115d..ef5aed38d1 100644
--- a/cmake/scripts/freebsd/Macros.cmake
+++ b/cmake/scripts/freebsd/Macros.cmake
@@ -65,7 +65,7 @@ function(find_soname lib)
set(link_lib -l${${lib}_LIBRARIES})
endif()
endif()
- execute_process(COMMAND ${CMAKE_C_COMPILER} -nostdlib -o /dev/null -Wl,-M ${link_lib}
+ execute_process(COMMAND ${CMAKE_C_COMPILER} -nostdlib -o /dev/null -Wl,-M ${link_lib}
COMMAND grep LOAD.*${liblow}
ERROR_QUIET
OUTPUT_VARIABLE ${lib}_FILENAME)
diff --git a/cmake/scripts/linux/Macros.cmake b/cmake/scripts/linux/Macros.cmake
index 9e8ebe6357..37243a77cd 100644
--- a/cmake/scripts/linux/Macros.cmake
+++ b/cmake/scripts/linux/Macros.cmake
@@ -65,7 +65,7 @@ function(find_soname lib)
set(link_lib -l${${lib}_LIBRARIES})
endif()
endif()
- execute_process(COMMAND ${CMAKE_C_COMPILER} -nostdlib -o /dev/null -Wl,-M ${link_lib}
+ execute_process(COMMAND ${CMAKE_C_COMPILER} -nostdlib -o /dev/null -Wl,-M ${link_lib}
COMMAND grep LOAD.*${liblow}
ERROR_QUIET
OUTPUT_VARIABLE ${lib}_FILENAME)
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake
index 5b84424a8e..e3e46e7ff0 100644
--- a/cmake/scripts/windowsstore/ArchSetup.cmake
+++ b/cmake/scripts/windowsstore/ArchSetup.cmake
@@ -25,7 +25,7 @@ elseif(_ARM_)
else()
message(FATAL_ERROR "Unsupported architecture")
endif()
-
+
unset(_X86_)
unset(_AMD64_)
unset(_ARM_)
@@ -51,7 +51,7 @@ set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/win10-$
# mingw libs
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${MINGW_LIBS_DIR})
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
-# dependencies
+# dependencies
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${DEPENDENCIES_DIR})
# for python
set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python)
diff --git a/cmake/scripts/windowsstore/Macros.cmake b/cmake/scripts/windowsstore/Macros.cmake
index 724013877c..599f96b2b4 100644
--- a/cmake/scripts/windowsstore/Macros.cmake
+++ b/cmake/scripts/windowsstore/Macros.cmake
@@ -70,9 +70,9 @@ macro(winstore_set_assets target)
set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1)
set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_LOCATION "media")
source_group("media" FILES ${ASSET_FILES})
- set(RESOURCES ${RESOURCES} ${ASSET_FILES}
+ set(RESOURCES ${RESOURCES} ${ASSET_FILES}
"${CMAKE_SOURCE_DIR}/tools/windows/packaging/uwp/kodi_temp_key.pfx")
- set(LICENSE_FILES
+ set(LICENSE_FILES
${CMAKE_SOURCE_DIR}/LICENSE.GPL
${CMAKE_SOURCE_DIR}/copying.txt
${CMAKE_SOURCE_DIR}/privacy-policy.txt)
@@ -108,7 +108,7 @@ macro(add_deployment_content_group path link match exclude)
" <Link>${_link}%(RecursiveDir)%(FileName)%(Extension)</Link>\n"
" <DeploymentContent>true</DeploymentContent>\n"
" </EmbedResources>\n")
-endmacro()
+endmacro()
macro(winstore_append_props target)
# exclude debug dlls from packaging
@@ -126,7 +126,7 @@ macro(winstore_append_props target)
" </None>\n"
" </ItemGroup>\n")
endforeach(_dll DEBUG_DLLS)
-
+
add_deployment_content_group($(BuildRootPath)/dlls "" *.dll "${DEBUG_DLLS_EXCLUDE}")
add_deployment_content_group($(BuildRootPath)/system system **/* "$(BuildRootPath)/**/shaders/**")
add_deployment_content_group($(BuildRootPath)/system/shaders system/shaders **/*.fx "")
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-05 18:31:47 +0000