Skip to content

Commit

Permalink
Forcing runtime type in conanfile doens't work. Do it in the pipeline.
Browse files Browse the repository at this point in the history
  • Loading branch information
kuroneko committed Jul 18, 2020
1 parent dbc3164 commit 7d1c44b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pipeline {
dir('saisgpl.w64') {
deleteDir()
bat '''
conan install ..\\saisgpl --build=outdated --build=cascade --update --profile=default
conan install ..\\saisgpl --build=outdated --build=cascade --update --profile=default -s compiler.runtime=MT
'''
}
cmakeBuild generator: 'Visual Studio 16 2019',
Expand Down
7 changes: 0 additions & 7 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,3 @@ def configure(self):
# SDL2 on macOS requires iconv
if self.settings.os == "Macos":
self.options["sdl2"].iconv = True
# on Windows, we always use the MT runtime type.
if self.settings.os == "Windows":
if self.settings.compiler == "Visual Studio":
if self.settings.build_type == 'Debug':
self.settings.compiler.runtime = 'MTd'
else:
self.settings.compiler.runtime = 'MT'

0 comments on commit 7d1c44b

Please sign in to comment.