merged

dlib/cmake_utils/check_if_neon_available.cmake

@@ -12,9 +12,9 @@ set(ARM_NEON_IS_AVAILABLE 0)
 
 # test if __ARM_NEON__ is defined
 try_compile(test_for_neon_worked ${PROJECT_BINARY_DIR}/neon_test_build ${CMAKE_CURRENT_LIST_DIR}/test_for_neon 
-	neon_test)
+   neon_test)
 
 if(test_for_neon_worked)
-	message (STATUS "__ARM_NEON__ defined.")
-	set(ARM_NEON_IS_AVAILABLE 1)
+   message (STATUS "__ARM_NEON__ defined.")
+   set(ARM_NEON_IS_AVAILABLE 1)
 endif()

dlib/cmake_utils/set_compiler_specific_options.cmake

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 if (POLICY CMP0054)
-    cmake_policy(SET CMP0054 NEW)
+   cmake_policy(SET CMP0054 NEW)
 endif()
 
 set(USING_OLD_VISUAL_STUDIO_COMPILER 0)

dlib/cmake_utils/tell_visual_studio_to_use_static_runtime.cmake

@@ -4,7 +4,7 @@
 
 cmake_minimum_required(VERSION 2.8.12)
 if (POLICY CMP0054)
-    cmake_policy(SET CMP0054 NEW)
+   cmake_policy(SET CMP0054 NEW)
 endif()
 
 if (MSVC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") 

dlib/cmake_utils/use_cpp_11.cmake

@@ -5,7 +5,7 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 if (POLICY CMP0054)
-    cmake_policy(SET CMP0054 NEW)
+   cmake_policy(SET CMP0054 NEW)
 endif()
 
 
@@ -60,14 +60,14 @@ else()
    # Set a flag if the compiler you are using is capable of providing C++11 features.
    get_property(cxx_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
    if (";${cxx_features};" MATCHES ";cxx_rvalue_references;" AND
-       ";${cxx_features};" MATCHES ";cxx_variadic_templates;" AND
-       ";${cxx_features};" MATCHES ";cxx_lambdas;" AND
-       ";${cxx_features};" MATCHES ";cxx_defaulted_move_initializers;" AND
-       ";${cxx_features};" MATCHES ";cxx_delegating_constructors;" AND
-       ";${cxx_features};" MATCHES ";cxx_thread_local;" AND
-       ";${cxx_features};" MATCHES ";cxx_constexpr;" AND
-       ";${cxx_features};" MATCHES ";cxx_decltype_incomplete_return_types;" AND
-       ";${cxx_features};" MATCHES ";cxx_auto_type;")
+         ";${cxx_features};" MATCHES ";cxx_variadic_templates;" AND
+         ";${cxx_features};" MATCHES ";cxx_lambdas;" AND
+         ";${cxx_features};" MATCHES ";cxx_defaulted_move_initializers;" AND
+         ";${cxx_features};" MATCHES ";cxx_delegating_constructors;" AND
+         ";${cxx_features};" MATCHES ";cxx_thread_local;" AND
+         ";${cxx_features};" MATCHES ";cxx_constexpr;" AND
+         ";${cxx_features};" MATCHES ";cxx_decltype_incomplete_return_types;" AND
+         ";${cxx_features};" MATCHES ";cxx_auto_type;")
 
       set(COMPILER_CAN_DO_CPP_11 1)
       # Tell cmake that we need C++11 for dlib