BehaviorTree#2 Remove Windows support

Signed-off-by: Uilian Ries <uilianries@gmail.com>
uilianries · Dec 13, 2018 · b9c589f · b9c589f
1 parent 5877ba4
commit b9c589f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 43 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,16 +37,18 @@ conan-osx: &conan-osx
 
 matrix:
     include:
-      - bare_linux:
-        env: ROS_DISTRO="none"
-      - ros_indigo:
-        env: ROS_DISTRO="indigo"
-      - ros_kinetic:
-        env: ROS_DISTRO="kinetic"
-      - ros_melodic:
-        env: ROS_DISTRO="melodic"
-      - <<: *conan-linux
-        env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49
+      - <<: *conan-osx
+        osx_image: xcode8.3
+        env: CONAN_APPLE_CLANG_VERSIONS=8.1
+      - <<: *conan-osx
+        osx_image: xcode9
+        env: CONAN_APPLE_CLANG_VERSIONS=9.0
+      - <<: *conan-osx
+        osx_image: xcode9.4
+        env: CONAN_APPLE_CLANG_VERSIONS=9.1
+      - <<: *conan-osx
+        osx_image: xcode10.1
+        env: CONAN_APPLE_CLANG_VERSIONS=10.0
       - <<: *conan-linux
         env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5
       - <<: *conan-linux
@@ -63,21 +65,14 @@ matrix:
         env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50
       - <<: *conan-linux
         env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60
-      - <<: *conan-osx
-        osx_image: xcode7.3
-        env: CONAN_APPLE_CLANG_VERSIONS=7.3
-      - <<: *conan-osx
-        osx_image: xcode8.3
-        env: CONAN_APPLE_CLANG_VERSIONS=8.1
-      - <<: *conan-osx
-        osx_image: xcode9
-        env: CONAN_APPLE_CLANG_VERSIONS=9.0
-      - <<: *conan-osx
-        osx_image: xcode9.4
-        env: CONAN_APPLE_CLANG_VERSIONS=9.1
-      - <<: *conan-osx
-        osx_image: xcode10.1
-        env: CONAN_APPLE_CLANG_VERSIONS=10.0
+      - bare_linux:
+        env: ROS_DISTRO="none"
+      - ros_indigo:
+        env: ROS_DISTRO="indigo"
+      - ros_kinetic:
+        env: ROS_DISTRO="kinetic"
+      - ros_melodic:
+        env: ROS_DISTRO="melodic"
     fast_finish: false
 
 before_install:

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/conanfile.py b/conanfile.py
@@ -28,14 +28,14 @@ def configure(self):
            self.settings.compiler == "gcc" and \
            Version(self.settings.compiler.version.value) < "5":
             raise ConanInvalidConfiguration("BehaviorTree.CPP can not be built by GCC < 5")
-        if self.settings.os == "Windows" and \
-           self.settings.compiler == "Visual Studio":
-            raise ConanInvalidConfiguration("BehaviorTree.CPP is not supported on Visual Studio yet")
+        if self.settings.os == "Windows":
+            raise ConanInvalidConfiguration("BehaviorTree.CPP is not prepared to be built on Windows yet")
 
     def _configure_cmake(self):
         """Create CMake instance and execute configure step
         """
         cmake = CMake(self)
+        cmake.verbose = True
         cmake.definitions["BUILD_EXAMPLES"] = False
         cmake.definitions["BUILD_UNIT_TESTS"] = False
         cmake.configure()