diff --git a/.gitignore b/.gitignore index de16fea..ccbdf5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build/ tmp/ -upload.* \ No newline at end of file +upload.* +.idea/ diff --git a/freeimage/all/conanfile.py b/freeimage/all/conanfile.py index ed09527..31f7d9c 100644 --- a/freeimage/all/conanfile.py +++ b/freeimage/all/conanfile.py @@ -1,6 +1,6 @@ +import glob from conans import ConanFile, MSBuild, tools, AutoToolsBuildEnvironment from conans.tools import os_info -import glob class freeimageConan(ConanFile): @@ -24,8 +24,14 @@ class freeimageConan(ConanFile): for file in glob.glob("./**/*2017.vcxproj", recursive=True): print(f"Patching winsdk in file {file}") tools.replace_in_file(file, "10.0.16299.0", "10.0", strict=False) + + if self.settings.build_type == "Debug": + _build_type = "Debug" + else: + _build_type = "Release" + msbuild = MSBuild(self) - msbuild.build("FreeImage.2017.sln") + msbuild.build("FreeImage.2017.sln", build_type=_build_type) else: autotools = AutoToolsBuildEnvironment(self) autotools.make() @@ -43,4 +49,4 @@ class freeimageConan(ConanFile): def package_info(self): self.cpp_info.name = "FreeImage" - self.cpp_info.libs = tools.collect_libs(self) + self.cpp_info.libs = tools.collect_libs(self) \ No newline at end of file