From a30e00892a1d1046e4005fffa40a541f3d75ea4d Mon Sep 17 00:00:00 2001 From: dimitri Date: Sat, 28 Oct 2017 09:59:32 +0200 Subject: [PATCH 1/2] No longer need conanfile string replacement for win gcc. --- build/conan/conanfile.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build/conan/conanfile.py b/build/conan/conanfile.py index 27572df..a67d2a6 100644 --- a/build/conan/conanfile.py +++ b/build/conan/conanfile.py @@ -68,11 +68,6 @@ class GlewConan(ConanFile): vcvars = vcvars_command(self.settings) self.run("%s && %s && %s" % (vcvars, cd_build, build_command.replace("x86", "Win32"))) else: - if self.settings.os == "Windows": - replace_in_file("%s/build/cmake/CMakeLists.txt" % self.source_directory, \ - "if(WIN32 AND (NOT MSVC_VERSION LESS 1600)", \ - "if(WIN32 AND MSVC AND (NOT MSVC_VERSION LESS 1600)") - if self.version == "master": self.run("make extensions") From 157911971694ca2bb79b5ba9bb31c38210ec74bb Mon Sep 17 00:00:00 2001 From: dimitri Date: Wed, 1 Nov 2017 05:08:27 +0100 Subject: [PATCH 2/2] Removed replace_in_file from imports. --- build/conan/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/conan/conanfile.py b/build/conan/conanfile.py index a67d2a6..6c8826c 100644 --- a/build/conan/conanfile.py +++ b/build/conan/conanfile.py @@ -2,7 +2,7 @@ import os from conans import ConanFile, CMake from conans.tools import os_info, SystemPackageTool, ConanException from conans import tools, VisualStudioBuildEnvironment -from conans.tools import build_sln_command, vcvars_command, replace_in_file, download, unzip +from conans.tools import build_sln_command, vcvars_command, download, unzip class GlewConan(ConanFile): name = "glew"