Skip to content

Commit

Permalink
Bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
jmarrec committed Jan 17, 2022
1 parent ea7838a commit 2281ae9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if (INTEGRATED_CONAN)

message("RUNNING CONAN")

conan_check(VERSION 1.30.0 REQUIRED)
conan_check(VERSION 1.43.0 REQUIRED)

# Add NREL remote and place it first in line, since we vendored dependencies to NREL's repo, they will be picked first
conan_add_remote(NAME nrel INDEX 0
Expand Down Expand Up @@ -64,20 +64,20 @@ if (INTEGRATED_CONAN)
#list(APPEND CONAN_OPTIONS "libffi:shared=False")

if(NOT MSVC)
set(CONAN_FFI "libffi/3.3")
set(CONAN_FFI "libffi/3.4.2")
set(CONAN_LIBYAML "libyaml/0.2.5")
set(CONAN_READLINE "readline/8.0")
list(APPEND CONAN_OPTIONS "gdbm:with_readline=True")
set(CONAN_GDBM "gdbm/1.18.1")
set(CONAN_GMP "gmp/6.2.0")
set(CONAN_GDBM "gdbm/1.19")
set(CONAN_GMP "gmp/6.2.1")
endif()

conan_cmake_run(REQUIRES
openssl/${OPENSSL_VERSION}
ruby_installer/2.7.3@bincrafters/stable
# cant use bison/3.5.3 from CCI as it uses m4 which won't build with x86. So use bincrafters' still but explicitly add bin dir to PATH later
# bison_installer/3.3.2@bincrafters/stable
bison/3.7.1
bison/3.7.6
zlib/1.2.11
${CONAN_FFI}
${CONAN_LIBYAML}
Expand Down
9 changes: 4 additions & 5 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def requirements(self):
# self.options["libyaml"].fPIC = True

if self.options.with_libffi:
self.requires("libffi/3.3")
self.requires("libffi/3.4.2")
# self.options["libffi"].shared = False
# self.options["libffi"].fPIC = True

Expand All @@ -105,7 +105,7 @@ def requirements(self):
# So for now that'll only work if you have the NREL remote **before**
# the conan-center one...
# `conan remote update nrel https://api.bintray.com/conan/commercialbuilding/nrel --insert 0`
self.requires("gdbm/1.18.1")
self.requires("gdbm/1.19")
# self.options["gdbm"].shared = False
# self.options["gdbm"].fPIC = True
self.options["gdbm"].libgdbm_compat = True
Expand All @@ -120,7 +120,7 @@ def requirements(self):
# self.options["readline"].fPIC = True

if self.options.with_gmp:
self.requires("gmp/6.2.0")
self.requires("gmp/6.2.1")

def build_requirements(self):
"""
Expand Down Expand Up @@ -150,8 +150,7 @@ def build_requirements(self):
# redefinition errors in Ruby' parser.c
# Latest bison with m4/1.4.18
# self.build_requires("bison/3.7.1#dcffa3dd9204cb79ac7ca09a7f19bb8b")
# The one on NREL (older)
self.build_requires("bison/3.7.1#8bba3cd5416cf47dbc99130108ecb67e")
self.build_requires("bison/3.7.6")

def build(self):
"""
Expand Down

0 comments on commit 2281ae9

Please sign in to comment.