diff --git a/.travis.yml b/.travis.yml index 9025a3e47fdd4332a09784e1593339ef6157e3eb..5e262d10f7bfabf3785494bae67cae656b7d0cc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: - MATRIX_EVAL="CXX=g++-7 && CC=gcc-7" - os: osx osx_image: xcode9.4 - env: + env: - MATRIX_EVAL="CXX=clang++ && CC=clang" before_install: @@ -39,7 +39,8 @@ install: fi - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - - conda install -y -c conda-forge cmake + - conda env create -f environment.yml -n eal + - source activate eal script: - mkdir build diff --git a/CMakeLists.txt b/CMakeLists.txt index 60154b7626bb2d862e0a56f6bf3c11d2b33384ff..3e904adc321d19cff6eac67bfe6ea2eeec7dfb54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,9 @@ include(CTest) set(CMAKE_CXX_STANDARD 11) +# Third Party Dependencies +find_package(GSL) + # Library setup add_library(usgsephem SHARED src/eal.cpp @@ -28,13 +31,18 @@ set_target_properties(usgsephem PROPERTIES set(EPHEM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include/" "${CMAKE_CURRENT_SOURCE_DIR}/include/json") target_include_directories(usgsephem + PRIVATE + ${GSL_INCLUDE_DIRS} PUBLIC - "${EPHEM_INCLUDE_DIRS}" + ${EPHEM_INCLUDE_DIRS} ) # Setup for GoogleTest find_package (Threads) -target_link_libraries(usgsephem PUBLIC +target_link_libraries(usgsephem + PRIVATE + ${GSL_LIBRARIES} + PUBLIC gtest ${CMAKE_THREAD_LIBS_INIT}) # Setup for ctest diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000000000000000000000000000000000000..6452d766257edc291b6c572c2cddc786016f5158 --- /dev/null +++ b/environment.yml @@ -0,0 +1,8 @@ +name: eal + +channels: + - conda-forge + +dependencies: + - cmake>=3.10 + - gsl diff --git a/src/eal.cpp b/src/eal.cpp index 8d5181083899ab38718dde75fb095a9a14c5ae40..364088c0317cb7ce876a8eb7cf7d35dbbbd587c9 100644 --- a/src/eal.cpp +++ b/src/eal.cpp @@ -1,12 +1,13 @@ - #include "eal.h" #include + +#include + #include using json = nlohmann::json; - using namespace eal;