Skip to content

Instantly share code, notes, and snippets.

@theirix
Created March 9, 2018 07:39
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save theirix/e5635608103e6b7dad6b4bcf90cfed82 to your computer and use it in GitHub Desktop.
Save theirix/e5635608103e6b7dad6b4bcf90cfed82 to your computer and use it in GitHub Desktop.
From 168f9fa1a04f9929f08974276f8de2190bb24fcc Mon Sep 17 00:00:00 2001
From: theirix <theirix@gmail.com>
Date: Fri, 9 Mar 2018 10:33:21 +0300
Subject: [PATCH] Style improvements
---
conanfile.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/conanfile.py b/conanfile.py
index b1acbb2..80decdd 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -3,7 +3,6 @@
import os
import shutil
-from xml.dom import minidom
from conans import ConanFile, tools, AutoToolsBuildEnvironment, MSBuild
@@ -34,6 +33,7 @@ class LcmsConan(ConanFile):
""""This function should be removed in Conan 1.2 when
https://github.com/conan-io/conan/issues/2584 is released.
MSBuild() will take care of runtime and other needed flags of CL"""
+ from xml.dom import minidom
dom = minidom.parse(vcxproj_path)
elements = dom.getElementsByTagName("RuntimeLibrary")
runtime_library = {'MT': 'MultiThreaded',
@@ -58,10 +58,10 @@ class LcmsConan(ConanFile):
target = 'lcms2_DLL' if self.options.shared else 'lcms2_static'
vcxproj = os.path.join(target, '%s.vcxproj' % target)
self._patch_vcxproj_runtime(vcxproj)
- update_project = True if int(str(self.settings.compiler.version)) > 12 else False
+ upgrade_project = True if int(str(self.settings.compiler.version)) > 12 else False
# run build
msbuild = MSBuild(self)
- msbuild.build("lcms2.sln", targets=[target], platforms={"x86": "Win32"}, upgrade_project=update_project)
+ msbuild.build("lcms2.sln", targets=[target], platforms={"x86": "Win32"}, upgrade_project=upgrade_project)
def build_configure(self):
env_build = AutoToolsBuildEnvironment(self)
--
2.16.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment