Merge pull request #188 from SylvainCorlay/gtest-install

Prevent installation of gtest artifacts

Author: JohanMabille

.appveyor.yml

@@ -22,7 +22,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install pytest numpy pybind11==2.2.1 xtensor==0.19.0 -c conda-forge
+  - conda install pytest numpy pybind11==2.2.1 xtensor==0.19.2 -c conda-forge
   - "set PYTHONHOME=%MINICONDA%"
   - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
   - nmake test_xtensor_python

.travis.yml

@@ -128,7 +128,7 @@ install:
     # Useful for debugging any issues with conda
     - conda info -a
     - conda install pytest numpy -c conda-forge
-    - conda install cmake gtest -c conda-forge
+    - conda install cmake -c conda-forge
     - |
       if [[ "$PYBIND11_VERSION" == "master" ]]; then
         conda_root=$(cd $(dirname $(which conda))/.. && pwd)
@@ -147,10 +147,11 @@ install:
       else
         conda install pybind11==${PYBIND11_VERSION} -c conda-forge
       fi
-    - conda install xtensor==0.19.0 -c conda-forge
-    - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE .
+    - conda install xtensor==0.19.2 -c conda-forge
+    - cmake -D DOWNLOAD_GTEST=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE .
     - make -j2 test_xtensor_python
     - make install
+    - rm -rf test/googletest-src
 
 script:
     - py.test -s

test/CMakeLists.txt

@@ -68,7 +68,7 @@ if (DOWNLOAD_GTEST OR GTEST_SRC_DIR)
     # Add googletest directly to our build. This defines
     # the gtest and gtest_main targets.
     add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
-                     ${CMAKE_CURRENT_BINARY_DIR}/googletest-build)
+                     ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL)
 
     set(GTEST_INCLUDE_DIRS "${gtest_SOURCE_DIR}/include")
     set(GTEST_BOTH_LIBRARIES gtest_main gtest)
@@ -87,13 +87,12 @@ set(XTENSOR_PYTHON_TESTS
     test_pyvectorize.cpp
 )
 
-set(XTENSOR_PYTHON_TARGET test_xtensor_python)
-add_executable(${XTENSOR_PYTHON_TARGET} ${XTENSOR_PYTHON_TESTS} ${XTENSOR_PYTHON_HEADERS})
-target_link_libraries(${XTENSOR_PYTHON_TARGET} xtensor-python ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARIES})
+add_executable(test_xtensor_python ${XTENSOR_PYTHON_TESTS} ${XTENSOR_PYTHON_HEADERS})
+target_link_libraries(test_xtensor_python xtensor-python ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARIES})
 
 if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
-    add_dependencies(${XTENSOR_PYTHON_TARGET} gtest_main)
+    add_dependencies(test_xtensor_python gtest_main)
 endif()
 
-add_custom_target(xtest COMMAND ./test_xtensor_python DEPENDS ${XTENSOR_PYTHON_TARGET})
+add_custom_target(xtest COMMAND ./test_xtensor_python DEPENDS test_xtensor_python)