Added i686 Travis build
This commit is contained in:
		
							parent
							
								
									543e4fb57d
								
							
						
					
					
						commit
						57c9525e5c
					
				@ -71,6 +71,10 @@ matrix:
 | 
			
		||||
          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
 | 
			
		||||
      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release'
 | 
			
		||||
 | 
			
		||||
    - os: linux
 | 
			
		||||
      compiler: "gcc-5-release-i686"
 | 
			
		||||
      env: TARGET_ARCH='i686' CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release'
 | 
			
		||||
 | 
			
		||||
      # Disabled because of CI slowness
 | 
			
		||||
      #- os: linux
 | 
			
		||||
      #- compiler: gcc
 | 
			
		||||
@ -114,6 +118,7 @@ matrix:
 | 
			
		||||
      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
 | 
			
		||||
 | 
			
		||||
before_install:
 | 
			
		||||
  - if [[ ! -z $TARGET_ARCH ]] ; then source ./scripts/travis/before_install.$TARGET_ARCH.sh ; fi
 | 
			
		||||
  - if [[ $(uname -s) == 'Darwin' ]]; then sudo mdutil -i off /; fi;
 | 
			
		||||
  - source ./scripts/install_node.sh 4
 | 
			
		||||
  - npm install
 | 
			
		||||
 | 
			
		||||
@ -39,7 +39,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 | 
			
		||||
  set(bitness 64)
 | 
			
		||||
  message(STATUS "Building on a 64 bit system")
 | 
			
		||||
else()
 | 
			
		||||
  message(WARNING "Building on a 32 bit system is unsupported")
 | 
			
		||||
  message(STATUS "Building on a 32 bit system")
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
if(WIN32 AND MSVC_VERSION LESS 1900)
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										10
									
								
								scripts/travis/before_install.i686.sh
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								scripts/travis/before_install.i686.sh
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,10 @@
 | 
			
		||||
#!/bin/sh -ex
 | 
			
		||||
 | 
			
		||||
## Generate code for 32-bit ABI with default for x86_84 fpmath
 | 
			
		||||
export CFLAGS='-m32 -msse2 -mfpmath=sse'
 | 
			
		||||
export CXXFLAGS='-m32 -msse2 -mfpmath=sse'
 | 
			
		||||
 | 
			
		||||
sudo dpkg --add-architecture i386
 | 
			
		||||
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test && ( sudo apt-get update -qq --yes || true )
 | 
			
		||||
 | 
			
		||||
sudo apt-get install -qq --yes --force-yes g++-5-multilib libxml2-dev:i386 libexpat1-dev:i386 libzip-dev:i386 libbz2-dev:i386 libstxxl-dev:i386 libtbb-dev:i386 lua5.2:i386 liblua5.2-dev:i386 libluabind-dev:i386 libboost-date-time-dev:i386 libboost-filesystem-dev:i386 libboost-iostreams-dev:i386 libboost-program-options-dev:i386 libboost-regex-dev:i386 libboost-system-dev:i386 libboost-thread-dev:i386 libboost-test-dev:i386
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user