diff options
author | Mike Frysinger <vapier@gentoo.org> | 2018-06-21 22:47:42 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2018-06-21 22:47:42 -0400 |
commit | fd06f7f83c5e78bf5b7f5397746b4e5ee4366250 (patch) | |
tree | 7b49e7e14c1b3a3d71cec56edf591f7a4600ee3d /cmake | |
parent | aac77143ddeb561216d9fe63546d17a1d2156bae (diff) | |
download | libgd-fd06f7f83c5e78bf5b7f5397746b4e5ee4366250.tar.gz |
clean up trailing whitespace/newlines
This is preparation for adding some linting checks for new commits from
people. Shouldn't be any functional changes here (tests still pass!).
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/modules/CMakeParseArguments.cmake | 6 | ||||
-rw-r--r-- | cmake/modules/CheckDIRSymbolExists.cmake | 16 | ||||
-rw-r--r-- | cmake/modules/CheckPrototypeExists.cmake | 7 | ||||
-rw-r--r-- | cmake/modules/FindFontConfig.cmake | 8 | ||||
-rw-r--r-- | cmake/modules/FindFreetype.cmake | 6 | ||||
-rw-r--r-- | cmake/modules/FindICONV.cmake | 46 | ||||
-rw-r--r-- | cmake/modules/FindJPEG.cmake | 6 | ||||
-rw-r--r-- | cmake/modules/FindPNG.cmake | 6 | ||||
-rw-r--r-- | cmake/modules/FindPackageHandleStandardArgs.cmake | 6 | ||||
-rw-r--r-- | cmake/modules/FindWEBP.cmake | 6 | ||||
-rw-r--r-- | cmake/modules/FindXPM.cmake | 6 | ||||
-rw-r--r-- | cmake/modules/TestForHighBitCharacters.c | 2 | ||||
-rw-r--r-- | cmake/modules/TestForHighBitCharacters.cmake | 4 |
13 files changed, 62 insertions, 63 deletions
diff --git a/cmake/modules/CMakeParseArguments.cmake b/cmake/modules/CMakeParseArguments.cmake index b57b029..90f691a 100644 --- a/cmake/modules/CMakeParseArguments.cmake +++ b/cmake/modules/CMakeParseArguments.cmake @@ -69,16 +69,16 @@ # # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * The names of Kitware, Inc., the Insight Consortium, or the names of # any consortium members, or of any contributors, may not be used to # endorse or promote products derived from this software without # specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/cmake/modules/CheckDIRSymbolExists.cmake b/cmake/modules/CheckDIRSymbolExists.cmake index dde6c7f..fd71e7f 100644 --- a/cmake/modules/CheckDIRSymbolExists.cmake +++ b/cmake/modules/CheckDIRSymbolExists.cmake @@ -7,16 +7,16 @@ # # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * The names of Kitware, Inc., the Insight Consortium, or the names of # any consortium members, or of any contributors, may not be used to # endorse or promote products derived from this software without # specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -39,7 +39,7 @@ # the AC_HEADER_DIRENT test programme rather than the CheckSymbolExists.cmake # test programme which always fails since DIR tends to be typedef'd # rather than #define'd. -# +# # The following variables may be set before calling this macro to # modify the way the check is run: # @@ -53,7 +53,7 @@ MACRO(CHECK_DIRSYMBOL_EXISTS FILES VARIABLE) SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n") SET(MACRO_CHECK_DIRSYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS}) IF(CMAKE_REQUIRED_LIBRARIES) - SET(CHECK_DIRSYMBOL_EXISTS_LIBS + SET(CHECK_DIRSYMBOL_EXISTS_LIBS "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}") ELSE(CMAKE_REQUIRED_LIBRARIES) SET(CHECK_DIRSYMBOL_EXISTS_LIBS) @@ -79,7 +79,7 @@ MACRO(CHECK_DIRSYMBOL_EXISTS FILES VARIABLE) ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} - CMAKE_FLAGS + CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_DIRSYMBOL_EXISTS_FLAGS} "${CHECK_DIRSYMBOL_EXISTS_LIBS}" "${CMAKE_DIRSYMBOL_EXISTS_INCLUDES}" @@ -87,7 +87,7 @@ MACRO(CHECK_DIRSYMBOL_EXISTS FILES VARIABLE) IF(${VARIABLE}) MESSAGE(STATUS "Looking for DIR in ${FILES} - found") SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol DIR") - FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log "Determining if the DIR symbol is defined as in AC_HEADER_DIRENT " "passed with the following output:\n" "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c:\n" @@ -95,7 +95,7 @@ MACRO(CHECK_DIRSYMBOL_EXISTS FILES VARIABLE) ELSE(${VARIABLE}) MESSAGE(STATUS "Looking for DIR in ${FILES} - not found.") SET(${VARIABLE} "" CACHE INTERNAL "Have symbol DIR") - FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log + FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log "Determining if the DIR symbol is defined as in AC_HEADER_DIRENT " "failed with the following output:\n" "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c:\n" diff --git a/cmake/modules/CheckPrototypeExists.cmake b/cmake/modules/CheckPrototypeExists.cmake index 85a1717..191615c 100644 --- a/cmake/modules/CheckPrototypeExists.cmake +++ b/cmake/modules/CheckPrototypeExists.cmake @@ -7,16 +7,16 @@ # # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * The names of Kitware, Inc., the Insight Consortium, or the names of # any consortium members, or of any contributors, may not be used to # endorse or promote products derived from this software without # specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -66,4 +66,3 @@ int main() ") CHECK_CXX_SOURCE_COMPILES("${_CHECK_PROTO_EXISTS_SOURCE_CODE}" ${_RESULT}) ENDMACRO(CHECK_PROTOTYPE_EXISTS _SYMBOL _HEADER _RESULT) - diff --git a/cmake/modules/FindFontConfig.cmake b/cmake/modules/FindFontConfig.cmake index 23d0020..afe967e 100644 --- a/cmake/modules/FindFontConfig.cmake +++ b/cmake/modules/FindFontConfig.cmake @@ -1,17 +1,17 @@ # Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org> -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # 1. Redistributions of source code must retain the copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products +# 3. The name of the author may not be used to endorse or promote products # derived from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. diff --git a/cmake/modules/FindFreetype.cmake b/cmake/modules/FindFreetype.cmake index dd4db27..e8e3bc4 100644 --- a/cmake/modules/FindFreetype.cmake +++ b/cmake/modules/FindFreetype.cmake @@ -21,16 +21,16 @@ # # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * The names of Kitware, Inc., the Insight Consortium, or the names of # any consortium members, or of any contributors, may not be used to # endorse or promote products derived from this software without # specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/cmake/modules/FindICONV.cmake b/cmake/modules/FindICONV.cmake index 49d5f6b..6973a56 100644 --- a/cmake/modules/FindICONV.cmake +++ b/cmake/modules/FindICONV.cmake @@ -1,11 +1,11 @@ -# - Try to find Iconv -# Once done this will define -# -# ICONV_FOUND - system has Iconv -# ICONV_INCLUDE_DIR - the Iconv include directory -# ICONV_LIBRARIES - Link these to use Iconv +# - Try to find Iconv +# Once done this will define +# +# ICONV_FOUND - system has Iconv +# ICONV_INCLUDE_DIR - the Iconv include directory +# ICONV_LIBRARIES - Link these to use Iconv # ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const -# +# include(CheckCCompilerFlag) include(CheckCSourceCompiles) @@ -14,13 +14,13 @@ IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) SET(ICONV_FIND_QUIETLY TRUE) ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) -FIND_PATH(ICONV_INCLUDE_DIR iconv.h HINTS /sw/include/ PATHS /opt/local) - +FIND_PATH(ICONV_INCLUDE_DIR iconv.h HINTS /sw/include/ PATHS /opt/local) + FIND_LIBRARY(ICONV_LIBRARIES NAMES libiconv_a iconv libiconv c PATHS /opt/local) - -IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) - SET(ICONV_FOUND TRUE) -ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + +IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + SET(ICONV_FOUND TRUE) +ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) @@ -47,18 +47,18 @@ ENDIF(ICONV_FOUND) set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_LIBRARIES) -IF(ICONV_FOUND) - IF(NOT ICONV_FIND_QUIETLY) - MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") - ENDIF(NOT ICONV_FIND_QUIETLY) -ELSE(ICONV_FOUND) - IF(Iconv_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Iconv") - ENDIF(Iconv_FIND_REQUIRED) -ENDIF(ICONV_FOUND) +IF(ICONV_FOUND) + IF(NOT ICONV_FIND_QUIETLY) + MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") + ENDIF(NOT ICONV_FIND_QUIETLY) +ELSE(ICONV_FOUND) + IF(Iconv_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Iconv") + ENDIF(Iconv_FIND_REQUIRED) +ENDIF(ICONV_FOUND) MARK_AS_ADVANCED( ICONV_INCLUDE_DIR ICONV_LIBRARIES ICONV_SECOND_ARGUMENT_IS_CONST -)
\ No newline at end of file +) diff --git a/cmake/modules/FindJPEG.cmake b/cmake/modules/FindJPEG.cmake index bb310d6..297b25a 100644 --- a/cmake/modules/FindJPEG.cmake +++ b/cmake/modules/FindJPEG.cmake @@ -16,16 +16,16 @@ # # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * The names of Kitware, Inc., the Insight Consortium, or the names of # any consortium members, or of any contributors, may not be used to # endorse or promote products derived from this software without # specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/cmake/modules/FindPNG.cmake b/cmake/modules/FindPNG.cmake index a44affc..e04a6c8 100644 --- a/cmake/modules/FindPNG.cmake +++ b/cmake/modules/FindPNG.cmake @@ -25,16 +25,16 @@ # # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * The names of Kitware, Inc., the Insight Consortium, or the names of # any consortium members, or of any contributors, may not be used to # endorse or promote products derived from this software without # specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/cmake/modules/FindPackageHandleStandardArgs.cmake b/cmake/modules/FindPackageHandleStandardArgs.cmake index de124ac..33df485 100644 --- a/cmake/modules/FindPackageHandleStandardArgs.cmake +++ b/cmake/modules/FindPackageHandleStandardArgs.cmake @@ -85,16 +85,16 @@ # # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * The names of Kitware, Inc., the Insight Consortium, or the names of # any consortium members, or of any contributors, may not be used to # endorse or promote products derived from this software without # specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/cmake/modules/FindWEBP.cmake b/cmake/modules/FindWEBP.cmake index f7b89c3..40a53b4 100644 --- a/cmake/modules/FindWEBP.cmake +++ b/cmake/modules/FindWEBP.cmake @@ -17,16 +17,16 @@ # # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * The names of Kitware, Inc., the Insight Consortium, or the names of # any consortium members, or of any contributors, may not be used to # endorse or promote products derived from this software without # specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/cmake/modules/FindXPM.cmake b/cmake/modules/FindXPM.cmake index 9b59fea..bb5103e 100644 --- a/cmake/modules/FindXPM.cmake +++ b/cmake/modules/FindXPM.cmake @@ -17,16 +17,16 @@ # # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * The names of Kitware, Inc., the Insight Consortium, or the names of # any consortium members, or of any contributors, may not be used to # endorse or promote products derived from this software without # specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/cmake/modules/TestForHighBitCharacters.c b/cmake/modules/TestForHighBitCharacters.c index 2be5174..0bc34d9 100644 --- a/cmake/modules/TestForHighBitCharacters.c +++ b/cmake/modules/TestForHighBitCharacters.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2006 Alan W. Irwin * * This file is part of PLplot. diff --git a/cmake/modules/TestForHighBitCharacters.cmake b/cmake/modules/TestForHighBitCharacters.cmake index b1a1b90..dabf6b2 100644 --- a/cmake/modules/TestForHighBitCharacters.cmake +++ b/cmake/modules/TestForHighBitCharacters.cmake @@ -19,11 +19,11 @@ # Check if ctype.h macros work on characters with the high bit set. if(NOT DEFINED CMAKE_HIGH_BIT_CHARACTERS) - message(STATUS + message(STATUS "Check for whether ctype.h macros work on characters with the\n" " high bit set." ) - try_compile(CMAKE_HIGH_BIT_CHARACTERS + try_compile(CMAKE_HIGH_BIT_CHARACTERS ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/CMakeModules/TestForHighBitCharacters.c OUTPUT_VARIABLE OUTPUT) |