Functional OSX and Linux Builds on Travis (#65) (7cd9186e) · Commits · aflab / astrogeology / Usgscsm

.appveyor.yml

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		version: '0.1.{build}'

		image: Visual Studio 2017

		platform:
		- x64

		configuration:
		- Release
		- Debug

		environment:
		CSM_LIBRARY_PATH: C:\\Miniconda36-x64\lib
		CSM_INCLUDE_PATH: C:\\Miniconda36-x64\include

		install:
		- git submodule update --init --recursive
		# This pulls csm from conda
		- cmd: call C:\\Miniconda36-x64\Scripts\activate.bat
		- cmd: conda install -y -c usgs-astrogeology libcsm
		- cmake .
		build_script:
		- cmake --build . -- %MSBUILD_ARGS%

+4 −1

Original line number	Diff line number	Diff line
		[submodule "gtest"]
		path = gtest
		url = git@github.com:google/googletest.git
		url = https://github.com/google/googletest
		[submodule "csm"]
		path = csm
		url = https://github.com/USGS-Astrogeology/csm

+28 −15

Original line number	Diff line number	Diff line
		language: cpp

		os: linux

		env:
		- CSM_LIBRARY_PATH="$HOME/miniconda/lib"
		- CSM_INCLUDE_PATH="$HOME/miniconda/include"
		matrix:
		include:
		- os: linux
		addons:
		apt:
		sources:
		- ubuntu-toolchain-r-test
		packages:
		- g++-6
		env:
		- MATRIX_EVAL="CXX=g++-6 && CC=gcc-6"
		- os: osx
		osx_image: xcode9.4
		env:
		- MATRIX_EVAL="CXX=clang++ && CC=clang"

		before_install:
		- eval "${MATRIX_EVAL}"

		install:
		- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
		# Install a supported cmake version (>= 3.10)
		- \|
		if [ "$TRAVIS_OS_NAME" == "linux" ]; then
		wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
		else
		curl -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh;
		fi
		- conda install -c usgs-astrogeology libcsm
		- bash miniconda.sh -b -p $HOME/miniconda
		- export PATH="$HOME/miniconda/bin:$PATH"
		- conda install -y -c conda-forge cmake

		script:
		- CXX=/usr/bin/g++-6 CC=/usr/bin/gcc-6 cmake .
		- cmake --version
		- cmake .
		- cmake --build .
		- ./tests/runTests

+11 −6

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@ include(cmake/gtest.cmake)
		include(GNUInstallDirs)
		include(GoogleTest)

		add_subdirectory(csm)

		set(CMAKE_CXX_STANDARD 11)

		add_library(usgscsm SHARED
		@@ -25,14 +27,11 @@ set_target_properties(usgscsm PROPERTIES
		UsgsAstroLsStateData.h
		)

		find_library(CSM_LIBRARY csmapi REQUIRED HINTS $ENV{CSM_LIBRARY_PATH})
		find_path(CSM_INCLUDE_DIR PATH_SUFFIXES csm NAMES csm.h HINTS $ENV{CSM_INCLUDE_PATH})

		target_include_directories(usgscsm
		PUBLIC
		include/usgscsm
		include/
		${CSM_INCLUDE_DIR}
		csm/}
		)

		# Setup for GoogleTest
		@@ -40,12 +39,18 @@ target_include_directories(usgscsm
		find_package (Threads)

		target_link_libraries(usgscsm
		${CSM_LIBRARY}
		csmapi
		gtest ${CMAKE_THREAD_LIBS_INIT})

		if(WIN32)
		install(TARGETS usgscsm
		RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
		PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
		else()
		install(TARGETS usgscsm
		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
		PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
		endif()

Original line number	Diff line number	Diff line
		Subproject commit ea22180f46f86f4c95ade84ab81eb4477bdd8dd6