From 35d3289862e4c3606396a8f7d57563f43c08b998 Mon Sep 17 00:00:00 2001
From: memsharded <james@conan.io>
Date: Mon, 6 May 2019 00:41:17 +0200
Subject: [PATCH] ci

---
 .travis/install.sh |  2 --
 .travis/run.sh     |  2 ++
 tests.py           | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index a16be2e6..3b0168e3 100644
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -21,6 +21,4 @@ fi
 
 pip install conan
 conan user
-conan install cmake_installer/3.7.2@conan/stable -g=virtualrunenv
-source activate_run.sh
 pip install nose
diff --git a/.travis/run.sh b/.travis/run.sh
index 6c4cae9e..7d01f47a 100644
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -8,4 +8,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     pyenv activate conan
 fi
 
+conan install cmake_installer/3.7.2@conan/stable -g=virtualrunenv
+source activate_run.sh
 nosetests .
\ No newline at end of file
diff --git a/tests.py b/tests.py
index e18eed23..888c850c 100644
--- a/tests.py
+++ b/tests.py
@@ -180,6 +180,7 @@ def test_existing_conanfile(self):
 set(CMAKE_CXX_ABI_COMPILED 1)
 cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 include(conan.cmake)
 conan_cmake_run(CONANFILE conanfile.txt
@@ -205,6 +206,7 @@ def test_existing_conanfile_py(self):
 set(CMAKE_CXX_ABI_COMPILED 1)
 cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 include(conan.cmake)
 conan_cmake_run(CONANFILE conan/conanfile.py
@@ -242,6 +244,7 @@ def test_exported_package(self):
 set(CMAKE_CXX_ABI_COMPILED 1)
 cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 set(CONAN_EXPORTED ON)
 include(conan.cmake)
@@ -283,6 +286,7 @@ def test_vs_toolset(self):
         content = """message(STATUS "COMPILING-------")
 cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 include(conan.cmake)
 conan_cmake_run(REQUIRES Hello/0.1@memsharded/testing
@@ -307,6 +311,7 @@ def test_vs_toolset_host_x64(self):
         content = """message(STATUS "COMPILING-------")
 cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 include(conan.cmake)
 conan_cmake_run(REQUIRES Hello/0.1@memsharded/testing
@@ -331,6 +336,7 @@ def test_arch(self):
 message(STATUS "COMPILING-------")
 cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 include(conan.cmake)
 conan_cmake_run(BASIC_SETUP
@@ -354,6 +360,7 @@ def test_no_output_dir(self):
 message(STATUS "COMPILING-------")
 cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 include(conan.cmake)
 conan_cmake_run(BASIC_SETUP
@@ -377,6 +384,7 @@ def test_build_type(self):
 message(STATUS "COMPILING-------")
 cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 include(conan.cmake)
 conan_cmake_run(BASIC_SETUP
@@ -398,6 +406,7 @@ def test_settings(self):
 message(STATUS "COMPILING-------")
 cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 include(conan.cmake)
 conan_cmake_run(BASIC_SETUP
@@ -420,6 +429,7 @@ def test_settings(self):
     def test_profile_auto(self):
         content = """cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 set(CONAN_DISABLE_CHECK_COMPILER ON)
 include(conan.cmake)
@@ -466,6 +476,7 @@ def test_profile_auto(self):
     def test_profile_auto_all(self):
         content = """cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 set(CONAN_DISABLE_CHECK_COMPILER ON)
 include(conan.cmake)
@@ -510,6 +521,7 @@ def test_profile_auto_all(self):
     def test_multi_profile(self):
         content = """cmake_minimum_required(VERSION 2.8)
 project(conan_wrapper CXX)
+message(STATUS "CMAKE VERSION: ${CMAKE_VERSION}")
 
 set(CONAN_DISABLE_CHECK_COMPILER ON)
 include(conan.cmake)