Updated build stuff and CI (#376) (7fd08abb) · Commits · aflab / astrogeology / Ale

.appveyor.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ install:
		- conda config --set always_yes yes --set changeps1 no
		- conda update -q conda
		- conda install conda-build anaconda-client
		- conda env create -n ale python=3.7.3
		- conda env create -n ale
		- conda env update -f environment.yml -n ale
		- conda activate ale

		@@ -24,7 +24,7 @@ before_build:

		build_script:
		- python ..\setup.py install
		- cmake -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G "Visual Studio 15 2017 Win64" -DALE_BUILD_TESTS=OFF ..
		- cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G "Visual Studio 15 2017 Win64" -DALE_BUILD_TESTS=OFF ..
		- cmake --build . --target ALL_BUILD --config Release

		artifacts:

.travis.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ install:
		- bash miniconda.sh -b -p $HOME/miniconda
		- export PATH="$HOME/miniconda/bin:$PATH"
		- conda config --set always_yes yes
		- conda env create -n ale python=3.7.3
		- conda env create -n ale
		- conda env update -f environment.yml -n ale
		- source activate ale
		- conda install pytest
		@@ -50,7 +50,7 @@ script:
		- python setup.py install # install to use python lib in c code
		- mkdir -p build
		- cd build
		- cmake -DCOVERAGE=ON ..
		- cmake -DCMAKE_BUILD_TYPE=RELEASE -DCOVERAGE=ON ..
		- cmake --build .
		- ctest -VV

CMakeLists.txt

+9 −7

Original line number	Diff line number	Diff line
		@@ -5,9 +5,9 @@
		# CMake initialization

		# Specify the required version of CMake.
		# cmake 3.10 required for ctest/gtest integration
		cmake_minimum_required(VERSION 3.10)
		project(ale VERSION 0.8.1 DESCRIPTION "Abstraction Library for Ephemerides ")
		# cmake 3.15 required for findPython virtualenv configuration
		cmake_minimum_required(VERSION 3.15)
		project(ale VERSION 0.8.2 DESCRIPTION "Abstraction Library for Ephemerides ")

		# include what we need
		include(GNUInstallDirs)
		@@ -15,8 +15,8 @@ include(GNUInstallDirs)
		set(CMAKE_CXX_STANDARD 11)

		option(ALE_BUILD_LOAD "If the C++ Python load interface should be built." ON)
		option(ALE_USE_EXTERNAL_JSON "If an external nlohmann JSON library should be used" OFF)
		option(ALE_USE_EXTERNAL_EIGEN "If an external EIGEN library should be used" OFF)
		option(ALE_USE_EXTERNAL_JSON "If an external nlohmann JSON library should be used" ON)
		option(ALE_USE_EXTERNAL_EIGEN "If an external EIGEN library should be used" ON)

		# Third Party Dependencies
		if(ALE_USE_EXTERNAL_JSON)
		@@ -38,8 +38,10 @@ endif()
		if(ALE_BUILD_LOAD)
		# If there is an Anaconda environment activated, search that for Python first
		if(EXISTS $ENV{CONDA_PREFIX})
		message("Searching $ENV{CONDA_PREFIX} for Python libraries")
		set(Python_ROOT_DIR $ENV{CONDA_PREFIX})
		message("Searching Anaconda environment at $ENV{CONDA_PREFIX} for Python libraries")
		set(Python_FIND_VIRTUALENV FIRST)
		set(Python_FIND_REGISTRY LAST)
		set(Python_FIND_FRAMEWORK LAST)
		set(Python_FIND_STRATEGY LOCATION)
		endif()
		find_package(Python REQUIRED COMPONENTS Development)

cmake/config.cmake.in

+0 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,5 @@ set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG ${CMAKE_CURRENT_LIST_FILE})
		find_package_handle_standard_args(@PROJECT_NAME@ CONFIG_MODE)

		if(NOT TARGET @PROJECT_NAME@::ale)
		find_package(nlohmann_json REQUIRED)
		include("${CMAKE_CURRENT_LIST_DIR}/aleTargets.cmake")
		endif()

environment.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ channels:
		- default

		dependencies:
		- cmake>=3.10
		- cmake>=3.15
		- pytest
		- eigen
		- jupyter