summaryrefslogtreecommitdiff
path: root/tools/ctest_scripts
diff options
context:
space:
mode:
authormayeut <mayeut@users.noreply.github.com>2015-10-10 18:24:57 +0200
committermayeut <mayeut@users.noreply.github.com>2015-10-10 18:24:57 +0200
commitd60937922f8dc00ea511ff33c2e3076181b98078 (patch)
treee5f6554ea4fe9799b2db65b6e1d4cd6926e0a964 /tools/ctest_scripts
parent229d9cdb9c31ca5662dea0085c8ce67eb28f9030 (diff)
correct warnings
Diffstat (limited to 'tools/ctest_scripts')
-rw-r--r--tools/ctest_scripts/travis-ci.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index 065b783c..53bfbf48 100644
--- a/tools/ctest_scripts/travis-ci.cmake
+++ b/tools/ctest_scripts/travis-ci.cmake
@@ -18,6 +18,7 @@ if("$ENV{TRAVIS_OS_NAME}" STREQUAL "windows")
set( CTEST_BUILD_COMMAND "nmake" )
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")
endif()
if ("$ENV{OPJ_BUILD_CONFIGURATION}" STREQUAL "")
@@ -91,7 +92,7 @@ set( CACHE_CONTENTS "
CMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}
# Warning level
-CMAKE_C_FLAGS:STRING= ${CCFLAGS_ARCH} -Wall -Wextra -Wconversion -Wno-unused-parameter -Wdeclaration-after-statement
+CMAKE_C_FLAGS:STRING= ${CCFLAGS_ARCH} ${CCFLAGS_WARNING}
# Use to activate the test suite
BUILD_TESTING:BOOL=${BUILD_TESTING}