diff --git a/.travis.yml b/.travis.yml index b0269cf23f93b2ea058ea2605843eaa464c88b1b..0a6166a29e1ed93acc7376428c242eee5d33326e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,9 +41,9 @@ script: - cmake -DCOVERAGE=ON .. - cmake --build . - ctest + - cd .. after_success: - - cd .. && source activate base - conda install -y -q conda-build anaconda-client # Pull the libcsm for the build from our anaconda channel - conda config --add channels usgs-astrogeology diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e09399cf87881bdc2e7ad577278c988195d1b25..195f865f9510b138c14b1533a80d58399c8fd6e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,9 +64,10 @@ else() endif() - -include(CTest) - -enable_testing() - -add_subdirectory(tests) +# Optional build or link against CSM +option (BUILD_TESTS "Build tests" ON) +if(BUILD_TESTS) + include(CTest) + enable_testing() + add_subdirectory(tests) +endif() diff --git a/recipe/build.sh b/recipe/build.sh index 3f5c025491106d1d321640485cd2bab0eb0113a8..257773c8ffd5c4e663c6a0e257b8be08771ea4e1 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,5 +1,4 @@ #!/bin/sh -source activate base mkdir build && cd build -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DBUILD_CSM=OFF .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -DBUILD_CSM=OFF -DBUILD_TESTS=OFF .. make install