Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Commit

Permalink
Replaced conanfile_directory variable with source_folder.
Browse files Browse the repository at this point in the history
  • Loading branch information
bilke committed Feb 16, 2018
1 parent e626abe commit f2439bd
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class QtConan(ConanFile):
default_options = ("shared=True", "opengl=desktop", "canvas3d=False", "gamepad=False",
"graphicaleffects=False", "imageformats=False", "location=False",
"serialport=False", "svg=False", "tools=False", "webengine=False",
"websockets=False", "xmlpatterns=False", "x11extras=True" "openssl=no")
"websockets=False", "xmlpatterns=False", "x11extras=True", "openssl=no")
url = "http://github.com/osechet/conan-qt"
license = "http://doc.qt.io/qt-5/lgpl.html"
short_paths = True
Expand Down Expand Up @@ -174,9 +174,9 @@ def _build_msvc(self, args):
self.output.info("Using '%s %s' to build" % (build_command, " ".join(build_args)))

env = {}
env.update({'PATH': ['%s/qtbase/bin' % self.conanfile_directory,
'%s/gnuwin32/bin' % self.conanfile_directory,
'%s/qtrepotools/bin' % self.conanfile_directory]})
env.update({'PATH': ['%s/qtbase/bin' % self.source_folder,
'%s/gnuwin32/bin' % self.source_folder,
'%s/qtrepotools/bin' % self.source_folder]})
# it seems not enough to set the vcvars for older versions
if self.settings.compiler == "Visual Studio":
if self.settings.compiler.version == "14":
Expand Down Expand Up @@ -213,10 +213,10 @@ def _build_msvc(self, args):

def _build_mingw(self, args):
env_build = AutoToolsBuildEnvironment(self)
env = {'PATH': ['%s/bin' % self.conanfile_directory,
'%s/qtbase/bin' % self.conanfile_directory,
'%s/gnuwin32/bin' % self.conanfile_directory,
'%s/qtrepotools/bin' % self.conanfile_directory],
env = {'PATH': ['%s/bin' % self.source_folder,
'%s/qtbase/bin' % self.source_folder,
'%s/gnuwin32/bin' % self.source_folder,
'%s/qtrepotools/bin' % self.source_folder],
'QMAKESPEC': 'win32-g++'}
env.update(env_build.vars)
with tools.environment_append(env):
Expand Down

0 comments on commit f2439bd

Please sign in to comment.