AnotherFoxGuy/ror-conan-recipes
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

🐛 Fixed build

Browse Source
This commit is contained in:
Edgar 2021-11-29 10:54:42 +01:00
parent 23b026d664
commit 8c58189817
No known key found for this signature in database
GPG Key ID: 17D930BB616061A5
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.conan-profiles/vs-2016-debug
View File

@ -4,5 +4,5 @@ os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 arch_build=x86_64
compiler=Visual Studio compiler=Visual Studio
compiler.version=16 compiler.version=15
build_type=Debug build_type=Debug

2
.conan-profiles/vs-2016-release
View File

@ -4,5 +4,5 @@ os_build=Windows
arch=x86_64 arch=x86_64
arch_build=x86_64 arch_build=x86_64
compiler=Visual Studio compiler=Visual Studio
compiler.version=16 compiler.version=15
build_type=Release build_type=Release

3
.github/workflows/conan-pkg.yml vendored
View File

@ -58,6 +58,9 @@ jobs:
file(DOWNLOAD https://cdn.anotherfoxguy.com/DirectX-SDK.zip "$ENV{TMP}/DirectX.zip" SHOW_PROGRESS) file(DOWNLOAD https://cdn.anotherfoxguy.com/DirectX-SDK.zip "$ENV{TMP}/DirectX.zip" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/DirectX.zip" WORKING_DIRECTORY "$ENV{DXSDK_DIR}") execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/DirectX.zip" WORKING_DIRECTORY "$ENV{DXSDK_DIR}")
- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1.10.0
- name: Run - name: Run
env: env:
CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }} CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_LOGIN_USERNAME }}

8
freeimage/all/conanfile.py
View File

@ -19,9 +19,11 @@ class freeimageConan(ConanFile):
def build(self): def build(self):
if os_info.is_windows: if os_info.is_windows:
for file in glob.glob("./**/*2017.vcxproj", recursive=True): version = tools.Version(self.settings.compiler.version)
print(f"Patching winsdk in file {file}") if version.major > "15":
tools.replace_in_file(file, "10.0.16299.0", "10.0", strict=False) 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)
msbuild = MSBuild(self) msbuild = MSBuild(self)
msbuild.build("FreeImage.2017.sln") msbuild.build("FreeImage.2017.sln")
else: else: