Fix CMake typos

No functional changes, just fixing whitespace errors and typos in
comments

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f22aa57..e202350 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,14 +15,14 @@ include(cmake/Summary.cmake)
 include(cmake/ConfigGen.cmake)
 
 # ---[ Options
-caffe_option(CPU_ONLY  "Build Caffe wihtout CUDA support" OFF) # TODO: rename to USE_CUDA
+caffe_option(CPU_ONLY  "Build Caffe without CUDA support" OFF) # TODO: rename to USE_CUDA
 caffe_option(USE_CUDNN "Build Caffe with cuDNN libary support" ON IF NOT CPU_ONLY)
 caffe_option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 caffe_option(BUILD_python "Build Python wrapper" ON)
 set(python_version "2" CACHE STRING "Specify which python version to use")
 caffe_option(BUILD_matlab "Build Matlab wrapper" OFF IF UNIX OR APPLE)
 caffe_option(BUILD_docs   "Build documentation" ON IF UNIX OR APPLE)
-caffe_option(BUILD_python_layer "Build the caffe python layer" ON)
+caffe_option(BUILD_python_layer "Build the Caffe python layer" ON)
 
 # ---[ Dependencies
 include(cmake/Dependencies.cmake)

diff --git a/cmake/ConfigGen.cmake b/cmake/ConfigGen.cmake
index a9101e3..566d6ca 100644 (file)
--- a/cmake/ConfigGen.cmake
+++ b/cmake/ConfigGen.cmake
@@ -88,7 +88,7 @@ function(caffe_generate_export_configs)
 
   configure_file("cmake/Templates/CaffeConfig.cmake.in" "${PROJECT_BINARY_DIR}/cmake/CaffeConfig.cmake" @ONLY)
 
-  # Install the CaffeConfig.cmake and export set to use wuth install-tree
+  # Install the CaffeConfig.cmake and export set to use with install-tree
   install(FILES "${PROJECT_BINARY_DIR}/cmake/CaffeConfig.cmake" DESTINATION ${install_cmake_suffix})
   install(EXPORT CaffeTargets DESTINATION ${install_cmake_suffix})
 

diff --git a/cmake/External/gflags.cmake b/cmake/External/gflags.cmake
index a50a092..e3dba04 100644 (file)
--- a/cmake/External/gflags.cmake
+++ b/cmake/External/gflags.cmake
@@ -43,10 +43,10 @@ if (NOT __GFLAGS_INCLUDED) # guard against multiple includes
       LOG_DOWNLOAD 1
       LOG_INSTALL 1
       )
-  
+
     set(GFLAGS_FOUND TRUE)
     set(GFLAGS_INCLUDE_DIRS ${gflags_INSTALL}/include)
-    set(GFLAGS_LIBRARIES ${gflags_INSTALL}/lib/libgflags.a ${CMAKE_THREAD_LIBS_INIT})    
+    set(GFLAGS_LIBRARIES ${gflags_INSTALL}/lib/libgflags.a ${CMAKE_THREAD_LIBS_INIT})
     set(GFLAGS_LIBRARY_DIRS ${gflags_INSTALL}/lib)
     set(GFLAGS_EXTERNAL TRUE)
 

diff --git a/cmake/External/glog.cmake b/cmake/External/glog.cmake
index 02b39dd..a44672f 100644 (file)
--- a/cmake/External/glog.cmake
+++ b/cmake/External/glog.cmake
@@ -29,7 +29,7 @@ if (NOT __GLOG_INCLUDED)
     if (GFLAGS_EXTERNAL)
       set(GLOG_DEPENDS gflags)
     endif()
-    
+
     ExternalProject_Add(glog
       DEPENDS ${GLOG_DEPENDS}
       PREFIX ${glog_PREFIX}

diff --git a/cmake/Misc.cmake b/cmake/Misc.cmake
index 39569ea..7676754 100644 (file)
--- a/cmake/Misc.cmake
+++ b/cmake/Misc.cmake
@@ -1,4 +1,4 @@
-# ---[ Configurations types
+# ---[ Configuration types
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Possible configurations" FORCE)
 mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
 

diff --git a/cmake/ProtoBuf.cmake b/cmake/ProtoBuf.cmake
index 8946d66..fc799bd 100644 (file)
--- a/cmake/ProtoBuf.cmake
+++ b/cmake/ProtoBuf.cmake
@@ -1,12 +1,12 @@
 # Finds Google Protocol Buffers library and compilers and extends
-# the standart cmake script with version and python generation support
+# the standard cmake script with version and python generation support
 
 find_package( Protobuf REQUIRED )
 include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR})
 list(APPEND Caffe_LINKER_LIBS ${PROTOBUF_LIBRARIES})
 
 # As of Ubuntu 14.04 protoc is no longer a part of libprotobuf-dev package
-# and should be installed  separately as in: sudo apt-get install protobuf-compiler
+# and should be installed separately as in: sudo apt-get install protobuf-compiler
 if(EXISTS ${PROTOBUF_PROTOC_EXECUTABLE})
   message(STATUS "Found PROTOBUF Compiler: ${PROTOBUF_PROTOC_EXECUTABLE}")
 else()

diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake
index 3293194..e094ac0 100644 (file)
--- a/cmake/Summary.cmake
+++ b/cmake/Summary.cmake
@@ -87,7 +87,7 @@ endfunction()
 
 
 ################################################################################################
-# Prints accumulatd caffe configuration summary
+# Prints accumulated caffe configuration summary
 # Usage:
 #   caffe_print_configuration_summary()
 
@@ -119,7 +119,7 @@ function(caffe_print_configuration_summary)
   caffe_status("  BLAS              : " APPLE THEN "Yes (vecLib)" ELSE "Yes (${BLAS})")
   caffe_status("  Boost             :   Yes (ver. ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION})")
   caffe_status("  glog              :   Yes")
-  caffe_status("  gflags            :   Yes")  
+  caffe_status("  gflags            :   Yes")
   caffe_status("  protobuf          : " PROTOBUF_FOUND THEN "Yes (ver. ${PROTOBUF_VERSION})" ELSE "No" )
   caffe_status("  lmdb              : " LMDB_FOUND THEN "Yes (ver. ${LMDB_VERSION})" ELSE "No")
   caffe_status("  Snappy            : " SNAPPY_FOUND THEN "Yes (ver. ${Snappy_VERSION})" ELSE "No" )

diff --git a/cmake/Targets.cmake b/cmake/Targets.cmake
index ed0ff96..2401f25 100644 (file)
--- a/cmake/Targets.cmake
+++ b/cmake/Targets.cmake
@@ -31,7 +31,7 @@ endfunction()
 ################################################################################################
 # Collecting sources from globbing and appending to output list variable
 # Usage:
-#   caffe_source_group(<output_variable> GLOB[_RECURSE] <globbing_expression>)
+#   caffe_collect_sources(<output_variable> GLOB[_RECURSE] <globbing_expression>)
 function(caffe_collect_sources variable)
   cmake_parse_arguments(CAFFE_COLLECT_SOURCES "" "" "GLOB;GLOB_RECURSE" ${ARGN})
   if(CAFFE_COLLECT_SOURCES_GLOB)
@@ -144,12 +144,12 @@ function(caffe_configure_testdatafile file)
   set(result "")
   foreach(line ${__lines})
     set(result "${result}${PROJECT_SOURCE_DIR}/${line}\n")
-  endforeach()  
+  endforeach()
   file(WRITE ${file}.gen.cmake ${result})
 endfunction()
 
 ################################################################################################
-# Filter outs all files that are not inlcuded in selected list
+# Filter out all files that are not included in selected list
 # Usage:
 #   caffe_leave_only_selected_tests(<filelist_variable> <selected_list>)
 function(caffe_leave_only_selected_tests file_list)

diff --git a/cmake/Templates/CaffeConfig.cmake.in b/cmake/Templates/CaffeConfig.cmake.in
index a4b03d9..8f23742 100644 (file)
--- a/cmake/Templates/CaffeConfig.cmake.in
+++ b/cmake/Templates/CaffeConfig.cmake.in
@@ -4,7 +4,7 @@
 #   Caffe and this config file depends on opencv,
 #   so put `find_package(OpenCV)` before searching Caffe
 #   via `find_package(Caffe)`. All other lib/includes
-#   dependencies are hard coded int the file
+#   dependencies are hard coded in the file
 #
 # After successful configuration the following variables
 # will be defined:
@@ -15,7 +15,7 @@
 #
 #   Caffe_HAVE_CUDA    - signals about CUDA support
 #   Caffe_HAVE_CUDNN   - signals about cuDNN support
- 
+
 
 # OpenCV dependency
 
@@ -40,7 +40,7 @@ get_filename_component(Caffe_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(Caffe_INCLUDE_DIRS "@Caffe_INCLUDE_DIRS@")
 
 @Caffe_INSTALL_INCLUDE_DIR_APPEND_COMMAND@
- 
+
 # Our library dependencies
 if(NOT TARGET caffe AND NOT caffe_BINARY_DIR)
   include("${Caffe_CMAKE_DIR}/CaffeTargets.cmake")

diff --git a/cmake/Templates/CaffeConfigVersion.cmake.in b/cmake/Templates/CaffeConfigVersion.cmake.in
index cbfa514..19f8530 100644 (file)
--- a/cmake/Templates/CaffeConfigVersion.cmake.in
+++ b/cmake/Templates/CaffeConfigVersion.cmake.in
@@ -1,5 +1,5 @@
 set(PACKAGE_VERSION "@Caffe_VERSION@")
- 
+
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
   set(PACKAGE_VERSION_COMPATIBLE FALSE)

diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
index a56c7c3..a1bde1a 100644 (file)
--- a/cmake/Utils.cmake
+++ b/cmake/Utils.cmake
@@ -1,7 +1,7 @@
 ################################################################################################
 # Command alias for debugging messages
 # Usage:
-#   dmgs(<message>)
+#   dmsg(<message>)
 function(dmsg)
   message(STATUS ${ARGN})
 endfunction()
@@ -19,9 +19,9 @@ macro(caffe_list_unique)
 endmacro()
 
 ################################################################################################
-# Clears variables from lsit
+# Clears variables from list
 # Usage:
-#   caffe_list_unique(<variables_list>)
+#   caffe_clear_vars(<variables_list>)
 macro(caffe_clear_vars)
   foreach(_var ${ARGN})
     unset(${_var})
@@ -118,7 +118,7 @@ macro(caffe_parse_header FILENAME FILE_VAR)
         if(__add_cache)
           set(${name} ${${name}} CACHE INTERNAL "${name} parsed from ${FILENAME}" FORCE)
         elseif(__parnet_scope)
-          set(${name} "${${name}}" PARENT_SCOPE)          
+          set(${name} "${${name}}" PARENT_SCOPE)
         endif()
       else()
         unset(${name} CACHE)
@@ -303,7 +303,7 @@ function(caffe_get_current_cflags cflags_var)
 endfunction()
 
 ################################################################################################
-# Helper function to parse current linker libs into link directoris, libflags and osx frameworks
+# Helper function to parse current linker libs into link directories, libflags and osx frameworks
 # Usage:
 #   caffe_parse_linker_libs(<Caffe_LINKER_LIBS_var> <directories_var> <libflags_var> <frameworks_var>)
 function(caffe_parse_linker_libs Caffe_LINKER_LIBS_variable folders_var flags_var frameworks_var)

diff --git a/cmake/lint.cmake b/cmake/lint.cmake
index 585babb..70a0065 100644 (file)
--- a/cmake/lint.cmake
+++ b/cmake/lint.cmake
@@ -5,7 +5,7 @@ set(SRC_FILE_EXTENSIONS h hpp hu c cpp cu cc)
 set(EXCLUDE_FILE_EXTENSTIONS pb.h pb.cc)
 set(LINT_DIRS include src/caffe examples tools python matlab)
 
-cmake_policy(SET CMP0009 NEW)  # supress cmake warning
+cmake_policy(SET CMP0009 NEW)  # suppress cmake warning
 
 # find all files of interest
 foreach(ext ${SRC_FILE_EXTENSIONS})
@@ -26,7 +26,7 @@ list(REMOVE_ITEM LINT_SOURCES ${EXCLUDED_FILES})
 
 execute_process(
     COMMAND ${LINT_COMMAND} ${LINT_SOURCES}
-    ERROR_VARIABLE LINT_OUTPUT 
+    ERROR_VARIABLE LINT_OUTPUT
     ERROR_STRIP_TRAILING_WHITESPACE
 )