Skip to content

Commit

Permalink
update conan dumps (boost, swig) after NREL/OpenStudio#4015 was merged
Browse files Browse the repository at this point in the history
  • Loading branch information
jmarrec authored Aug 15, 2020
1 parent 772f501 commit e51d196
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions ConanInstall.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)

include(${CMAKE_BINARY_DIR}/conan.cmake)

conan_check(VERSION 1.24.0 REQUIRED)
conan_check(VERSION 1.28.0 REQUIRED)

message(STATUS "openstudio: RUNNING CONAN")

# Add NREL remote and place it first in line, so that if we vendor dependencies to NREL's repo they will be picked first
# 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
URL https://api.bintray.com/conan/commercialbuilding/nrel)

Expand Down Expand Up @@ -57,8 +57,8 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
${CONAN_QT}
openssl/1.1.0l # ruby 2.5.5 won't work with 1.1.1x, so use 1.1.0l here to try to force every package to align on the same as ruby
# Track NREL/stable in general, on a feature branch this could be temporarily switched to NREL/testing
openstudio_ruby/2.5.5@nrel/testing # TODO: Temp #@nrel/stable
boost/1.72.0
openstudio_ruby/2.5.5@nrel/stable # TODO: Temp #@nrel/stable
boost/1.73.0
pugixml/1.10
jsoncpp/1.9.3
zlib/1.2.11
Expand All @@ -68,7 +68,7 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
cpprestsdk/2.10.16
websocketpp/0.8.2
geographiclib/1.50.1
swig/4.0.1
swig/4.0.2
${CONAN_GTEST}

# Override to avoid dependency mismatches
Expand Down

1 comment on commit e51d196

@jmarrec
Copy link
Collaborator Author

@jmarrec jmarrec commented on e51d196 Aug 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: bumping minimum conan version to 1.28.0 since some of recipes from CCI make use of self.cpp_info.filenames which was added in 1.28. Eg sqlite3. If you have conan lower than 1.28 it will fail cryptically

@macumber FYI

Please # to comment.