diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-09-12 15:48:23 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-09-12 15:48:23 +0200 |
| commit | 52c36b495597b8d07d39d070dd521ca4118113bd (patch) | |
| tree | bb0a86f7047430792333ace87dd0b6774a82095a /tools/ctest_scripts | |
| parent | b7069ce2b2ade8a1af44dade35db81d7a08cf0fc (diff) | |
Add 32 bit build
Diffstat (limited to 'tools/ctest_scripts')
| -rw-r--r-- | tools/ctest_scripts/travis-ci.cmake | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index 826b0aa3..7c1c25ff 100644 --- a/tools/ctest_scripts/travis-ci.cmake +++ b/tools/ctest_scripts/travis-ci.cmake @@ -28,6 +28,18 @@ else() set( CTEST_BUILD_NAME "$ENV{OPJ_BUILDNAME}") endif() +if (NOT "$ENV{OPJ_CI_ARCH}" STREQUAL "") + if (APPLE) + set(CCFLAGS_ARCH "-arch $ENV{OPJ_CI_ARCH}") + else() + if ("$ENV{OPJ_CI_ARCH}" MATCHES "^i[3-6]86$") + set(CCFLAGS_ARCH "-m32 -march=$ENV{OPJ_CI_ARCH}") + elseif ("$ENV{OPJ_CI_ARCH}" STREQUAL "x86_64") + set(CCFLAGS_ARCH "-m64") + endif() + endif() +endif() + # To execute part of the encoding test suite, kakadu binaries are needed to decode encoded image and compare # it to the baseline. Kakadu binaries are freely available for non-commercial purposes # at http://www.kakadusoftware.com. @@ -49,7 +61,7 @@ set( CACHE_CONTENTS " CMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} # Warning level -CMAKE_C_FLAGS:STRING= -Wall -Wextra -Wconversion -Wno-unused-parameter -Wdeclaration-after-statement +CMAKE_C_FLAGS:STRING= ${CCFLAGS_ARCH} -Wall -Wextra -Wconversion -Wno-unused-parameter -Wdeclaration-after-statement # Use to activate the test suite BUILD_TESTING:BOOL=TRUE |