Assorted fixes:

* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings

modules/core/include/opencv2/core/internal.hpp

@@ -153,7 +153,7 @@ CV_INLINE IppiSize ippiSize(const cv::Size & _size)
 # include "arm_neon.h"
 # define CV_NEON 1
 # define CPU_HAS_NEON_FEATURE (true)
-#elif defined(__ARM_NEON__)
+#elif defined(__ARM_NEON__) || defined(__ARM_NEON)
 #  include <arm_neon.h>
 #  define CV_NEON 1
 #  define CPU_HAS_NEON_FEATURE (true)

modules/core/src/cmdparser.cpp

@@ -7,6 +7,7 @@ using namespace std;
 using namespace cv;
 
 namespace {
+#if 0
 void helpParser()
 {
     printf("\nThe CommandLineParser class is designed for command line arguments parsing\n"
@@ -50,6 +51,7 @@ void helpParser()
            "                          It also works with 'unsigned int', 'double', and 'float' types \n"
            );
 }
+#endif
 
 vector<string> split_string(const string& str, const string& delimiters)
 {

modules/flann/include/opencv2/flann/dist.h

@@ -47,7 +47,7 @@ typedef unsigned __int64 uint64_t;
 # include <Intrin.h>
 #endif
 
-#ifdef __ARM_NEON__
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
 # include "arm_neon.h"
 #endif
 
@@ -460,7 +460,7 @@ struct Hamming
     ResultType operator()(Iterator1 a, Iterator2 b, size_t size, ResultType /*worst_dist*/ = -1) const
     {
         ResultType result = 0;
-#ifdef __ARM_NEON__
+#if defined(__ARM_NEON__) || defined(__ARM_NEON)
         {
             uint32x4_t bits = vmovq_n_u32(0);
             for (size_t i = 0; i < size; i += 16) {

modules/highgui/src/grfmt_tiff.cpp

@@ -50,6 +50,9 @@
 #include "precomp.hpp"
 #include "grfmt_tiff.hpp"
 
+#define int64 int64_tiff
+#define uint64 uint64_tiff
+
 #ifdef HAVE_TIFF
 # include "tiff.h"
 # include "tiffio.h"

modules/ts/misc/run.py

@@ -46,7 +46,7 @@ SIMD_DETECTION_PROGRAM="""
 #if __MMX__
 # error MMX
 #endif
-#if __ARM_NEON__
+#if __ARM_NEON__ || __ARM_NEON
 # error NEON
 #endif
 #error NOSIMD

modules/video/test/test_tvl1optflow.cpp

@@ -54,6 +54,7 @@ namespace
     const float FLO_TAG_FLOAT = 202021.25f;  // check for this when READING the file
     const char FLO_TAG_STRING[] = "PIEH";    // use this when WRITING the file
 
+#ifdef DUMP
     // binary file format for flow data specified here:
     // http://vision.middlebury.edu/flow/data/
     void writeOpticalFlowToFile(const Mat_<Point2f>& flow, const string& fileName)
@@ -76,6 +77,7 @@ namespace
             }
         }
     }
+#endif
 
     // binary file format for flow data specified here:
     // http://vision.middlebury.edu/flow/data/