Skip to content

Commit

Permalink
Use ConanFile from conans in attempt to fix Visual Studio builds
Browse files Browse the repository at this point in the history
  • Loading branch information
jwillikers committed Jul 21, 2022
1 parent 7fc72b6 commit 549ddbc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions recipes/dbus/1.x.x/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import os
import textwrap

from conan import ConanFile
from conan.tools.apple.apple import is_apple_os
from conan.tools.files import apply_conandata_patches, copy, get, mkdir, rename, rmdir, save
from conans import CMake

from conans import ConanFile, CMake
from conans.tools import remove_files_by_mask

required_conan_version = ">=1.43.0"
Expand Down Expand Up @@ -34,7 +34,7 @@ class DbusConan(ConanFile):
"with_selinux": False,
}

generators = "cmake", "cmake_find_package", "VirtualBuildEnv", "VirtualRunEnv"
generators = "cmake", "cmake_find_package"
_cmake = None

@property
Expand Down
6 changes: 3 additions & 3 deletions recipes/dbus/1.x.x/test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import os

from conan import ConanFile
from conan.tools.build import cross_building
from conans import CMake

from conans import ConanFile, CMake


class TestPackageConan(ConanFile):
settings = "os", "arch", "compiler", "build_type"
generators = "cmake", "cmake_find_package_multi", "VirtualBuildEnv", "VirtualRunEnv"
generators = "cmake", "cmake_find_package_multi"

def build(self):
cmake = CMake(self)
Expand Down

0 comments on commit 549ddbc

Please sign in to comment.