Merge pull request #1006 from stevenweaver/master

 clang noavx fix

CMakeLists.txt

@@ -189,15 +189,16 @@ endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(DEFAULT_COMPILE_FLAGS "-fsigned-char -O3")
     PCL_CHECK_FOR_AVX()
-    if(${HAVE_AVX_EXTENSIONS})
+
+    if(${HAVE_AVX_EXTENSIONS} AND NOT ${NOAVX})
         set(DEFAULT_COMPILE_FLAGS "${DEFAULT_COMPILE_FLAGS} -march=native -mtune=native -mavx")
         add_definitions (-D_SLKP_USE_AVX_INTRINSICS)
         PCL_CHECK_FOR_FMA3()
         if (${HAVE_FMA3})
             set(DEFAULT_COMPILE_FLAGS "${DEFAULT_COMPILE_FLAGS} -mfma")
             add_definitions (-D_SLKP_USE_FMA3_INTRINSICS)
         endif (${HAVE_FMA3})
-    else(${HAVE_AVX_EXTENSIONS})
+    else(${HAVE_AVX_EXTENSIONS} AND NOT ${NOAVX})
         PCL_CHECK_FOR_SSE3()
         if(${HAVE_SSE3_EXTENSIONS})
             add_definitions (-D_SLKP_USE_SSE_INTRINSICS)

src/core/global_things.cpp

@@ -119,7 +119,7 @@ namespace hy_global {
                      kErrorStringDatasetRefIndexError ("Dataset index reference out of range"),
                      kErrorStringMatrixExportError    ("Export matrix called with a non-polynomial matrix argument"),
                      kErrorStringNullOperand          ("Attempting to operate on an undefined value; this is probably the result of an earlier 'soft' error condition"),
-                      kHyPhyVersion  = _String ("2.5.0"),
+                      kHyPhyVersion  = _String ("2.5.1"),
 
                     kNoneToken = "None",
                     kNullToken = "null",

src/core/strings.cpp

@@ -52,7 +52,7 @@
 
 
 _String   compileDate = __DATE__,
-          __HYPHY__VERSION__ = _String ("2.5.0");
+          __HYPHY__VERSION__ = _String ("2.5.1");
 
 using namespace hy_global;