mj2: Add missing variable to format string in fprintf() invocation in meta_out.c

[openjpeg.git] / tools / ctest_scripts / travis-ci.cmake

diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index f1e78952fb6edcc7927330cc344e0221fef5456d..75ed6f6bf0b3faaf418bb5a843c97561d4228e33 100644 (file)
--- a/tools/ctest_scripts/travis-ci.cmake
+++ b/tools/ctest_scripts/travis-ci.cmake
@@ -19,7 +19,7 @@ if("$ENV{TRAVIS_OS_NAME}" STREQUAL "windows")
        set( JPYLYZER_EXT          "exe"  )
 else()
        set( CTEST_CMAKE_GENERATOR "Unix Makefiles")   # Always makefile in travis-ci environment
-       set( CCFLAGS_WARNING "-Wall -Wextra -Wconversion -Wno-unused-parameter -Wdeclaration-after-statement")
+       set( CCFLAGS_WARNING "-Wall -Wextra -Wconversion -Wno-unused-parameter -Wdeclaration-after-statement -Werror=declaration-after-statement")
        set( JPYLYZER_EXT          "py"  )
 endif()
 
@@ -53,6 +53,11 @@ if (NOT "$ENV{OPJ_CI_ARCH}" STREQUAL "")
        endif()
 endif()
 
+if (NOT "$ENV{OPJ_CI_INSTRUCTION_SETS}" STREQUAL "")
+       set(CCFLAGS_ARCH "${CCFLAGS_ARCH} $ENV{OPJ_CI_INSTRUCTION_SETS}")
+endif()
+
+
 if ("$ENV{OPJ_CI_ASAN}" STREQUAL "1")
        set(OPJ_HAS_MEMCHECK TRUE)
        set(CTEST_MEMORYCHECK_TYPE "AddressSanitizer")