'[extra-cmake-modules] /: Fix minor EBN issues'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [extra-cmake-modules] /: Fix minor EBN issues
From:       Yuri Chornoivan <null () kde ! org>
Date:       2018-09-07 6:06:47
Message-ID: E1fy9up-0008HA-Un () code ! kde ! org
[Download RAW message or body]

Git commit a519c29e93de84e949ac308831160102cc733e59 by Yuri Chornoivan.
Committed on 07/09/2018 at 06:06.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M  +1    -1    attic/modules/CheckCXXSourceCompiles.cmake
M  +1    -1    attic/modules/CheckCXXSourceRuns.cmake
M  +1    -1    attic/modules/FindExiv2.cmake
M  +1    -1    attic/modules/FindKDEWIN_Packager.cmake
M  +1    -1    attic/modules/FindPyQt4.cmake
M  +1    -1    attic/modules/FindSIP.cmake
M  +1    -1    attic/modules/Qt4Macros.cmake
M  +1    -1    find-modules/FindPythonModuleGeneration.cmake
M  +2    -2    kde-modules/KDECMakeSettings.cmake
M  +1    -1    modules/ECMAddQch.cmake
M  +1    -1    modules/ECMWinResolveSymlinks.cmake
M  +6    -6    tests/GenerateSipBindings/cpplib.h

https://commits.kde.org/extra-cmake-modules/a519c29e93de84e949ac308831160102cc733e59

diff --git a/attic/modules/CheckCXXSourceCompiles.cmake b/attic/modules/CheckCXXSourceCompiles.cmake
index d2ba293..bdf5858 100644
--- a/attic/modules/CheckCXXSourceCompiles.cmake
+++ b/attic/modules/CheckCXXSourceCompiles.cmake
@@ -70,7 +70,7 @@ MACRO(CHECK_CXX_SOURCE_COMPILES SOURCE VAR)
       SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
       MESSAGE(STATUS "Performing Test ${VAR} - Success")
       FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n"
+        "Performing C++ SOURCE FILE Test ${VAR} succeeded with the following output:\n"
         "${OUTPUT}\n"
         "Source file was:\n${SOURCE}\n")
     ELSE(${VAR})
diff --git a/attic/modules/CheckCXXSourceRuns.cmake b/attic/modules/CheckCXXSourceRuns.cmake
index b8f2344..a06afc9 100644
--- a/attic/modules/CheckCXXSourceRuns.cmake
+++ b/attic/modules/CheckCXXSourceRuns.cmake
@@ -57,7 +57,7 @@ MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR)
       SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
       MESSAGE(STATUS "Performing Test ${VAR} - Success")
       FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 
-        "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n"
+        "Performing C++ SOURCE FILE Test ${VAR} succeeded with the following output:\n"
         "${OUTPUT}\n" 
         "Return value: ${${VAR}}\n"
         "Source file was:\n${SOURCE}\n")
diff --git a/attic/modules/FindExiv2.cmake b/attic/modules/FindExiv2.cmake
index 770b3c6..2c4cbb7 100644
--- a/attic/modules/FindExiv2.cmake
+++ b/attic/modules/FindExiv2.cmake
@@ -13,7 +13,7 @@
 # The minimum required version of Exiv2 can be specified using the
 # standard syntax, e.g. find_package(Exiv2 0.17)
 #
-# For compatiblity, also the variable EXIV2_MIN_VERSION can be set to the minimum version
+# For compatibility, also the variable EXIV2_MIN_VERSION can be set to the minimum version
 # you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.
 
 # Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
diff --git a/attic/modules/FindKDEWIN_Packager.cmake b/attic/modules/FindKDEWIN_Packager.cmake
index c587deb..6a8af57 100644
--- a/attic/modules/FindKDEWIN_Packager.cmake
+++ b/attic/modules/FindKDEWIN_Packager.cmake
@@ -38,7 +38,7 @@
 
 if (WIN32)
     if(NOT KDEWIN_PACKAGER_DIR)
-        # check for enviroment variable
+        # check for environment variable
     	file(TO_CMAKE_PATH "$ENV{KDEWIN_PACKAGER_DIR}" KDEWIN_PACKAGER_DIR)
     	if(NOT KDEWIN_PACKAGER_DIR)
     		# search in the default program install folder
diff --git a/attic/modules/FindPyQt4.cmake b/attic/modules/FindPyQt4.cmake
index 3c7d288..dab7a9f 100644
--- a/attic/modules/FindPyQt4.cmake
+++ b/attic/modules/FindPyQt4.cmake
@@ -9,7 +9,7 @@
 # Find the installed version of PyQt4. FindPyQt4 should only be called after
 # Python has been found.
 #
-# This file defines the following variables, which can also be overriden by
+# This file defines the following variables, which can also be overridden by
 # users:
 #
 # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
diff --git a/attic/modules/FindSIP.cmake b/attic/modules/FindSIP.cmake
index 61eaa65..58b95c8 100644
--- a/attic/modules/FindSIP.cmake
+++ b/attic/modules/FindSIP.cmake
@@ -9,7 +9,7 @@
 # This file defines the following variables:
 #
 # SIP_VERSION - The version of SIP found expressed as a 6 digit hex number
-#     suitable for comparision as a string.
+#     suitable for comparison as a string.
 #
 # SIP_VERSION_STR - The version of SIP found as a human readable string.
 #
diff --git a/attic/modules/Qt4Macros.cmake b/attic/modules/Qt4Macros.cmake
index 1422c59..24379a6 100644
--- a/attic/modules/Qt4Macros.cmake
+++ b/attic/modules/Qt4Macros.cmake
@@ -130,7 +130,7 @@ MACRO (QT4_GENERATE_MOC infile outfile )
    QT4_GET_MOC_FLAGS(moc_flags)
    GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
    QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_flags}" "")
-   SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
+   SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # don't run automoc on this file
 
    MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile})
 ENDMACRO (QT4_GENERATE_MOC)
diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake
index 0468f9d..c3a12ef 100644
--- a/find-modules/FindPythonModuleGeneration.cmake
+++ b/find-modules/FindPythonModuleGeneration.cmake
@@ -20,7 +20,7 @@
 #
 # The optional rules file specifies the rules for creating the bindings
 #
-# A simple invokation would be:
+# A simple invocation would be:
 #
 #   ecm_generate_python_binding(KMyTarget
 #     PYTHONNAMESPACE PyKF5
diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake
index 2d20c60..5e62c6f 100644
--- a/kde-modules/KDECMakeSettings.cmake
+++ b/kde-modules/KDECMakeSettings.cmake
@@ -217,7 +217,7 @@ if(NOT KDE_SKIP_BUILD_SETTINGS)
 
    # put the include dirs which are in the source or build tree
    # before all other include dirs, so the headers in the sources
-   # are prefered over the already installed ones
+   # are preferred over the already installed ones
    # since cmake 2.4.1
    set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 
@@ -231,7 +231,7 @@ if(NOT KDE_SKIP_BUILD_SETTINGS)
    # Since CMake 2.8.11
    set(CMAKE_LINK_DEPENDS_NO_SHARED ON)
 
-   # Default to shared libs for KDE, if no type is explicitely given to add_library():
+   # Default to shared libs for KDE, if no type is explicitly given to add_library():
    set(BUILD_SHARED_LIBS TRUE CACHE BOOL "If enabled, shared libs will be built by default, otherwise static libs")
 
    # Enable automoc in cmake
diff --git a/modules/ECMAddQch.cmake b/modules/ECMAddQch.cmake
index 69a3bb4..40b6026 100644
--- a/modules/ECMAddQch.cmake
+++ b/modules/ECMAddQch.cmake
@@ -222,7 +222,7 @@
 # installed. It usually is the same as the one where the CMake config files
 # for this software are installed.
 #
-# COMPONENT specifies the the installation component name with which the
+# COMPONENT specifies the installation component name with which the
 # install rule is associated.
 #
 # Example usage:
diff --git a/modules/ECMWinResolveSymlinks.cmake b/modules/ECMWinResolveSymlinks.cmake
index d944466..8036a4c 100644
--- a/modules/ECMWinResolveSymlinks.cmake
+++ b/modules/ECMWinResolveSymlinks.cmake
@@ -52,7 +52,7 @@ function(ECM_WIN_RESOLVE_SYMLINKS _dir)
   endforeach()
   message(STATUS "Resolving symlinks in ${dir}... Done.")
 
-  # touch cache every build to force CMake to re-run these functions everytime
+  # touch cache every build to force CMake to re-run these functions every time
   if(NOT TARGET wrs_touch_cache)
     add_custom_target(wrs_touch_cache ALL
       COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/CMakeCache.txt
diff --git a/tests/GenerateSipBindings/cpplib.h b/tests/GenerateSipBindings/cpplib.h
index 958b875..23d0072 100644
--- a/tests/GenerateSipBindings/cpplib.h
+++ b/tests/GenerateSipBindings/cpplib.h
@@ -1,12 +1,12 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QSharedData>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QMap>
+#include <QCoreApplication>
+#include <QSharedData>
 
 #include <functional>
 
[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic