Skip to content

Commit 7bbaa42

Browse files
kwrobotbradking
authored andcommitted
Remove trailing whitespace from most CMake and C/C++ code
Our Git commit hooks disallow modification or addition of lines with trailing whitespace. Wipe out all remnants of trailing whitespace everywhere except third-party code. Run the following shell code: git ls-files -z -- \ bootstrap doxygen.config '*.readme' \ '*.c' '*.cmake' '*.cpp' '*.cxx' \ '*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \ '*.mm' '*.pike' '*.py' '*.txt' '*.vim' | egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' | egrep -z -v '^(Modules/CPack\..*\.in)' | xargs -0 sed -i 's/ \+$//'
1 parent be9db98 commit 7bbaa42

File tree

614 files changed

+3951
-3951
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

614 files changed

+3951
-3951
lines changed

CMakeCPack.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
7070

7171
IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
7272
# if the CPACK_PACKAGE_FILE_NAME is not defined by the cache
73-
# default to source package - system, on cygwin system is not
73+
# default to source package - system, on cygwin system is not
7474
# needed
7575
IF(CYGWIN)
7676
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
7777
ELSE(CYGWIN)
78-
SET(CPACK_PACKAGE_FILE_NAME
78+
SET(CPACK_PACKAGE_FILE_NAME
7979
"${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
8080
ENDIF(CYGWIN)
8181
ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
@@ -102,9 +102,9 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
102102
SET(CPACK_CYGWIN_PATCH_NUMBER 1)
103103
# These files are required by the cmCPackCygwinSourceGenerator and the files
104104
# put into the release tar files.
105-
SET(CPACK_CYGWIN_BUILD_SCRIPT
105+
SET(CPACK_CYGWIN_BUILD_SCRIPT
106106
"${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME@-@[email protected]")
107-
SET(CPACK_CYGWIN_PATCH_FILE
107+
SET(CPACK_CYGWIN_PATCH_FILE
108108
"${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME@-@[email protected]")
109109
# include the sub directory cmake file for cygwin that
110110
# configures some files and adds some install targets

CMakeCPackOptions.cmake.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is configured at cmake time, and loaded at cpack time.
22
# To pass variables to cpack from cmake, they must be configured
3-
# in this file.
3+
# in this file.
44

55
if(CPACK_GENERATOR MATCHES "NSIS")
66
SET(CPACK_NSIS_INSTALL_ROOT "@CPACK_NSIS_INSTALL_ROOT@")
@@ -45,9 +45,9 @@ if(CPACK_GENERATOR MATCHES "CygwinSource")
4545
endif(CPACK_GENERATOR MATCHES "CygwinSource")
4646

4747
if("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
48-
if(CMAKE_PACKAGE_QTGUI)
48+
if(CMAKE_PACKAGE_QTGUI)
4949
set(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications")
50-
else(CMAKE_PACKAGE_QTGUI)
50+
else(CMAKE_PACKAGE_QTGUI)
5151
set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr")
52-
endif(CMAKE_PACKAGE_QTGUI)
52+
endif(CMAKE_PACKAGE_QTGUI)
5353
endif("${CPACK_GENERATOR}" STREQUAL "PackageMaker")

CMakeLists.txt

+24-24
Original file line numberDiff line numberDiff line change
@@ -114,19 +114,19 @@ MACRO(CMAKE_SETUP_TESTING)
114114
IF (NOT DART_ROOT)
115115
SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
116116
ENDIF (NOT DART_ROOT)
117-
117+
118118
IF(BUILD_TESTING)
119-
SET(CMAKE_TEST_GENERATOR "" CACHE STRING
119+
SET(CMAKE_TEST_GENERATOR "" CACHE STRING
120120
"Generator used when running tests")
121-
SET(CMAKE_TEST_MAKEPROGRAM "" CACHE FILEPATH
121+
SET(CMAKE_TEST_MAKEPROGRAM "" CACHE FILEPATH
122122
"Generator used when running tests")
123123
IF(NOT CMAKE_TEST_GENERATOR)
124124
SET(CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR}")
125125
SET(CMAKE_TEST_MAKEPROGRAM "${MAKEPROGRAM}")
126126
ELSE(NOT CMAKE_TEST_GENERATOR)
127127
SET(CMAKE_TEST_DIFFERENT_GENERATOR TRUE)
128128
ENDIF(NOT CMAKE_TEST_GENERATOR)
129-
129+
130130
# Are we testing with the MSVC compiler?
131131
SET(CMAKE_TEST_MSVC 0)
132132
IF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
@@ -138,14 +138,14 @@ MACRO(CMAKE_SETUP_TESTING)
138138
ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES "NMake" OR
139139
"${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio")
140140
ENDIF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
141-
141+
142142
SET(CMAKE_TEST_SYSTEM_LIBRARIES 0)
143143
FOREACH(util CURL EXPAT XMLRPC ZLIB)
144144
IF(CMAKE_USE_SYSTEM_${util})
145145
SET(CMAKE_TEST_SYSTEM_LIBRARIES 1)
146146
ENDIF(CMAKE_USE_SYSTEM_${util})
147147
ENDFOREACH(util)
148-
148+
149149
# This variable is set by cmake, however to
150150
# test cmake we want to make sure that
151151
# the ctest from this cmake is used for testing
@@ -169,7 +169,7 @@ MACRO(CMAKE_SETUP_TESTING)
169169
CONFIGURE_FILE(${CMake_SOURCE_DIR}/CTestCustom.ctest.in
170170
${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY)
171171
IF(BUILD_TESTING AND DART_ROOT)
172-
CONFIGURE_FILE(${CMake_SOURCE_DIR}/CMakeLogo.gif
172+
CONFIGURE_FILE(${CMake_SOURCE_DIR}/CMakeLogo.gif
173173
${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY)
174174
ENDIF(BUILD_TESTING AND DART_ROOT)
175175
MARK_AS_ADVANCED(DART_ROOT)
@@ -253,18 +253,18 @@ MACRO (CMAKE_BUILD_UTILITIES)
253253
${CMake_BINARY_DIR}/Utilities
254254
${CMake_SOURCE_DIR}/Utilities
255255
)
256-
256+
257257
# check for the use of system libraries versus builtin ones
258258
# (a macro defined in this file)
259259
CMAKE_HANDLE_SYSTEM_LIBRARIES()
260-
260+
261261
#---------------------------------------------------------------------
262262
# Build zlib library for Curl, CMake, and CTest.
263263
SET(CMAKE_ZLIB_HEADER "cm_zlib.h")
264264
IF(CMAKE_USE_SYSTEM_ZLIB)
265265
FIND_PACKAGE(ZLIB)
266266
IF(NOT ZLIB_FOUND)
267-
MESSAGE(FATAL_ERROR
267+
MESSAGE(FATAL_ERROR
268268
"CMAKE_USE_SYSTEM_ZLIB is ON but a zlib is not found!")
269269
ENDIF(NOT ZLIB_FOUND)
270270
SET(CMAKE_ZLIB_INCLUDES ${ZLIB_INCLUDE_DIR})
@@ -275,13 +275,13 @@ MACRO (CMAKE_BUILD_UTILITIES)
275275
ADD_SUBDIRECTORY(Utilities/cmzlib)
276276
CMAKE_SET_TARGET_FOLDER(cmzlib "Utilities/3rdParty")
277277
ENDIF(CMAKE_USE_SYSTEM_ZLIB)
278-
278+
279279
#---------------------------------------------------------------------
280280
# Build Curl library for CTest.
281281
IF(CMAKE_USE_SYSTEM_CURL)
282282
FIND_PACKAGE(CURL)
283283
IF(NOT CURL_FOUND)
284-
MESSAGE(FATAL_ERROR
284+
MESSAGE(FATAL_ERROR
285285
"CMAKE_USE_SYSTEM_CURL is ON but a curl is not found!")
286286
ENDIF(NOT CURL_FOUND)
287287
SET(CMAKE_CURL_INCLUDES ${CURL_INCLUDE_DIRS})
@@ -306,15 +306,15 @@ MACRO (CMAKE_BUILD_UTILITIES)
306306

307307
#---------------------------------------------------------------------
308308
# Build Compress library for CTest.
309-
SET(CMAKE_COMPRESS_INCLUDES
309+
SET(CMAKE_COMPRESS_INCLUDES
310310
"${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmcompress")
311311
SET(CMAKE_COMPRESS_LIBRARIES "cmcompress")
312312
ADD_SUBDIRECTORY(Utilities/cmcompress)
313313
CMAKE_SET_TARGET_FOLDER(cmcompress "Utilities/3rdParty")
314314
IF(CMAKE_USE_SYSTEM_BZIP2)
315315
FIND_PACKAGE(BZip2)
316316
ELSE()
317-
SET(BZIP2_INCLUDE_DIR
317+
SET(BZIP2_INCLUDE_DIR
318318
"${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2")
319319
SET(BZIP2_LIBRARIES cmbzip2)
320320
ADD_SUBDIRECTORY(Utilities/cmbzip2)
@@ -364,7 +364,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
364364
ADD_SUBDIRECTORY(Utilities/cmexpat)
365365
CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty")
366366
ENDIF(CMAKE_USE_SYSTEM_EXPAT)
367-
367+
368368
#---------------------------------------------------------------------
369369
# Build XMLRPC library for CMake and CTest.
370370
IF(CTEST_USE_XMLRPC)
@@ -376,7 +376,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
376376
SET(CMAKE_XMLRPC_INCLUDES ${XMLRPC_INCLUDE_DIRS})
377377
SET(CMAKE_XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES})
378378
ENDIF(CTEST_USE_XMLRPC)
379-
379+
380380
#---------------------------------------------------------------------
381381
# Use curses?
382382
IF (UNIX)
@@ -454,7 +454,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES
454454
# where to write the resulting executables and libraries
455455
SET(BUILD_SHARED_LIBS OFF)
456456
SET(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.")
457-
SET(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL
457+
SET(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL
458458
"Where to put the libraries for CMake")
459459

460460
# The CMake executables usually do not need any rpath to run in the build or
@@ -511,12 +511,12 @@ IF("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x")
511511
SET(CMAKE_TESTS_CDASH_SERVER "http://www.cdash.org/CDash")
512512
ENDIF("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x")
513513

514-
# build the utilities (a macro defined in this file)
514+
# build the utilities (a macro defined in this file)
515515
CMAKE_BUILD_UTILITIES()
516516

517517
# On NetBSD ncurses is required, since curses doesn't have the wsyncup()
518518
# function. ncurses is installed via pkgsrc, so the library is in /usr/pkg/lib,
519-
# which isn't in the default linker search path. So without RPATH ccmake
519+
# which isn't in the default linker search path. So without RPATH ccmake
520520
# doesn't run and the build doesn't succeed since ccmake is executed for
521521
# generating the documentation.
522522
IF(BUILD_CursesDialog)
@@ -539,10 +539,10 @@ IF(BUILD_QtDialog)
539539
IF(NOT "${ENDCH}" STREQUAL "/")
540540
SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
541541
ENDIF(NOT "${ENDCH}" STREQUAL "/")
542-
SET(CMAKE_INSTALL_PREFIX
542+
SET(CMAKE_INSTALL_PREFIX
543543
"${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
544544
ENDIF(APPLE)
545-
545+
546546
SET(QT_NEED_RPATH FALSE)
547547
IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
548548
SET(QT_NEED_RPATH TRUE)
@@ -551,7 +551,7 @@ ENDIF(BUILD_QtDialog)
551551

552552

553553
# The same might be true on other systems for other libraries.
554-
# Then only enable RPATH if we have are building at least with cmake 2.4,
554+
# Then only enable RPATH if we have are building at least with cmake 2.4,
555555
# since this one has much better RPATH features than cmake 2.2.
556556
# The executables are then built with the RPATH for the libraries outside
557557
# the build tree, which is both the build and the install RPATH.
@@ -583,7 +583,7 @@ CONFIGURE_FILE(
583583
"${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf"
584584
COPYONLY)
585585

586-
OPTION(CMAKE_STRICT
586+
OPTION(CMAKE_STRICT
587587
"Perform strict testing to record property and variable access. Can be used to report any undefined properties or variables" OFF)
588588
MARK_AS_ADVANCED(CMAKE_STRICT)
589589

@@ -600,7 +600,7 @@ CMAKE_SET_TARGET_FOLDER(cmw9xcom "Utilities/Win9xCompat")
600600
CMAKE_SET_TARGET_FOLDER(documentation "Documentation")
601601

602602
# add a test
603-
ADD_TEST(SystemInformationNew "${CMAKE_CMAKE_COMMAND}"
603+
ADD_TEST(SystemInformationNew "${CMAKE_CMAKE_COMMAND}"
604604
--system-information -G "${CMAKE_TEST_GENERATOR}" )
605605

606606
# Install license file as it requires.

CTestConfig.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set(CTEST_DROP_SITE_CDASH TRUE)
1919
set(CTEST_CDASH_VERSION "1.6")
2020
set(CTEST_CDASH_QUERY_VERSION TRUE)
2121

22-
# use old trigger stuff so that cmake 2.4 and below will not
22+
# use old trigger stuff so that cmake 2.4 and below will not
2323
# get errors on trigger
24-
SET (TRIGGER_SITE
24+
SET (TRIGGER_SITE
2525
"http://public.kitware.com/cgi-bin/Submit-CMake-TestingResults.cgi")

CompileFlags.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ENDIF()
2727

2828
# Disable deprecation warnings for standard C functions.
2929
# really only needed for newer versions of VS, but should
30-
# not hurt other versions, and this will work into the
30+
# not hurt other versions, and this will work into the
3131
# future
3232
IF(MSVC OR _INTEL_WINDOWS)
3333
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
@@ -56,9 +56,9 @@ ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
5656

5757
# use the ansi CXX compile flag for building cmake
5858
IF (CMAKE_ANSI_CXXFLAGS)
59-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}")
59+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}")
6060
ENDIF (CMAKE_ANSI_CXXFLAGS)
6161

6262
IF (CMAKE_ANSI_CFLAGS)
63-
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}")
63+
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}")
6464
ENDIF (CMAKE_ANSI_CFLAGS)

Docs/cmake-indent.vim

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
" =============================================================================
2-
"
2+
"
33
" Program: CMake - Cross-Platform Makefile Generator
44
" Module: $RCSfile$
55
" Language: VIM
66
" Date: $Date$
77
" Version: $Revision$
8-
"
8+
"
99
" =============================================================================
1010

1111
" Vim indent file

Docs/cmake-mode.el

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
;; cmake executable variable used to run cmake --help-command
3535
;; on commands in cmake-mode
3636
;;
37-
;; cmake-command-help Written by James Bigler
37+
;; cmake-command-help Written by James Bigler
3838
;;
3939

4040
(defcustom cmake-mode-cmake-executable "cmake"
@@ -191,11 +191,11 @@ the indentation. Otherwise it retains the same position on the line"
191191
(setq save-point (point))
192192
(goto-char (point-min))
193193
(while (re-search-forward "^\\([ \t]*\\)\\(\\w+\\)\\([ \t]*(\\)" nil t)
194-
(replace-match
195-
(concat
196-
(match-string 1)
197-
(downcase (match-string 2))
198-
(match-string 3))
194+
(replace-match
195+
(concat
196+
(match-string 1)
197+
(downcase (match-string 2))
198+
(match-string 3))
199199
t))
200200
(goto-char save-point)
201201
)

Docs/cmake-syntax.vim

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ syn region cmakeVariableValue start=/\${/ end=/}/
3636
\ contained oneline contains=CONTAINED,cmakeTodo
3737
syn region cmakeEnvironment start=/\$ENV{/ end=/}/
3838
\ contained oneline contains=CONTAINED,cmakeTodo
39-
syn region cmakeString start=/"/ end=/"/
39+
syn region cmakeString start=/"/ end=/"/
4040
\ contains=CONTAINED,cmakeTodo,cmakeOperators
41-
syn region cmakeArguments start=/(/ end=/)/
41+
syn region cmakeArguments start=/(/ end=/)/
4242
\ contains=ALLBUT,cmakeArguments,cmakeTodo
4343
syn keyword cmakeSystemVariables
4444
\ WIN32 UNIX APPLE CYGWIN BORLAND MINGW MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80 MSVC90
@@ -49,11 +49,11 @@ syn keyword cmakeDeprecated ABSTRACT_FILES BUILD_NAME SOURCE_FILES SOURCE_FILES_
4949
\ nextgroup=cmakeArguments
5050

5151
" The keywords are generated as: cmake --help-command-list | tr "\n" " "
52-
syn keyword cmakeStatement
52+
syn keyword cmakeStatement
5353
\ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ELSEIF ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDFUNCTION ENDIF ENDMACRO ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH FUNCTION GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN UNSET USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE
5454
\ nextgroup=cmakeArguments
55-
syn keyword cmakeTodo
56-
\ TODO FIXME XXX
55+
syn keyword cmakeTodo
56+
\ TODO FIXME XXX
5757
\ contained
5858

5959
" Define the default highlighting.

Example/Demo/demo.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ extern Hello hello;
55
int main()
66
{
77
hello.Print();
8-
8+
99
return 0;
1010
}

Modules/CMakeAddNewLanguage.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CMakeDetermine(LANG)Compiler.cmake -> this should find the compiler for LANG and configure CMake(LANG)Compiler.cmake.in
22

33
CMake(LANG)Compiler.cmake.in -> used by CMakeDetermine(LANG)Compiler.cmake
4-
This file is used to store compiler information and is copied down into try
4+
This file is used to store compiler information and is copied down into try
55
compile directories so that try compiles do not need to re-determine and test the LANG
66

77
CMakeTest(LANG)Compiler.cmake -> test the compiler and set:

Modules/CMakeBackwardCompatibilityC.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
6767

6868
INCLUDE (FindThreads)
6969

70-
SET (CMAKE_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}" CACHE STRING
70+
SET (CMAKE_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}" CACHE STRING
7171
"Thread library used.")
7272

7373
SET (CMAKE_USE_PTHREADS "${CMAKE_USE_PTHREADS_INIT}" CACHE BOOL
@@ -79,7 +79,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
7979
SET (CMAKE_HP_PTHREADS ${CMAKE_HP_PTHREADS_INIT} CACHE BOOL
8080
"Use HP pthreads.")
8181

82-
SET (CMAKE_USE_SPROC ${CMAKE_USE_SPROC_INIT} CACHE BOOL
82+
SET (CMAKE_USE_SPROC ${CMAKE_USE_SPROC_INIT} CACHE BOOL
8383
"Use sproc libs.")
8484

8585
IF(__ERASE_CMAKE_TRY_COMPILE_OSX_ARCHITECTURES)

Modules/CMakeBackwardCompatibilityCXX.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# - define a bunch of backwards compatibility variables
2-
# CMAKE_ANSI_CXXFLAGS - flag for ansi c++
2+
# CMAKE_ANSI_CXXFLAGS - flag for ansi c++
33
# CMAKE_HAS_ANSI_STRING_STREAM - has <strstream>
44
# INCLUDE(TestForANSIStreamHeaders)
55
# INCLUDE(CheckIncludeFileCXX)
@@ -37,7 +37,7 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
3737
# if the compiler liked the flag then set CMAKE_ANSI_CXXFLAGS
3838
# to the flag
3939
IF(CMAKE_CXX_ACCEPTS_FLAGS)
40-
SET(CMAKE_ANSI_CXXFLAGS ${CMAKE_TRY_ANSI_CXX_FLAGS} CACHE INTERNAL
40+
SET(CMAKE_ANSI_CXXFLAGS ${CMAKE_TRY_ANSI_CXX_FLAGS} CACHE INTERNAL
4141
"What flags are required by the c++ compiler to make it ansi." )
4242
ENDIF(CMAKE_CXX_ACCEPTS_FLAGS)
4343
ENDIF( CMAKE_TRY_ANSI_CXX_FLAGS MATCHES ".+")

0 commit comments

Comments
 (0)