Commit a6bb7eb3 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 2.5.1+dfsg

parent 85b32e4c

CMakeLists.txt

+4 −3
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ 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()
@@ -197,7 +198,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") 
            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)
@@ -290,7 +291,7 @@ if(NOT NODE) 
    message("Node not installed; API documentation will not be generated")

else(NOT NODE)

    add_custom_target(

        docs ALL

        docs

        rm -rf ./docs && npm install -g documentation@4 && documentation build --polyglot -f md ./res/TemplateBatchFiles/libv3/**/*.bf -o ./docs.md

    )

endif(NOT NODE)

src/core/global_things.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 




_String   compileDate = __DATE__,

          __HYPHY__VERSION__ = _String ("2.5.0");

          __HYPHY__VERSION__ = _String ("2.5.1");



using namespace hy_global;