Skip to content

Commit

Permalink
Include conan profiles.
Browse files Browse the repository at this point in the history
  • Loading branch information
kuroneko committed Oct 14, 2020
1 parent eaacbb5 commit 88c674c
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pipeline {
sh '''
export PATH=/usr/local/bin:$PATH
export MACOS_DEPLOYMENT_TARGET=10.11
conan install ../saisgpl --build --update --profile=default -s os.version=10.11
conan install ../saisgpl --build --update --profile=release-m64
'''
}
cmakeBuild buildDir: 'saisgpl.m64',
Expand Down Expand Up @@ -111,7 +111,7 @@ pipeline {
dir('saisgpl.w64') {
deleteDir()
bat '''
conan install ..\\saisgpl --build=outdated --build=cascade --update --profile=default -s compiler.runtime=MT
conan install ..\\saisgpl --build=outdated --build=cascade --update --profile=release-w64
'''
}
cmakeBuild generator: 'Visual Studio 16 2019',
Expand Down
13 changes: 13 additions & 0 deletions conan/profiles/release-m64
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[settings]
os=Macos
os.version=10.11
os_build=Macos
arch=x86_64
arch_build=x86_64
compiler=apple-clang
compiler.version=11.0
compiler.libcxx=libc++
build_type=Release
[options]
[build_requires]
[env]
12 changes: 12 additions & 0 deletions conan/profiles/release-w64
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[settings]
os=Windows
os_build=Windows
compiler=Visual Studio
compiler.version=16
compiler.runtime=MT
build_type=Release
arch=x86_64
arch_build=x86_64
[options]
[build_requires]
[env]

0 comments on commit 88c674c

Please sign in to comment.