Skip to content

Commit

Permalink
Only use newer recipe on Mac x86_64
Browse files Browse the repository at this point in the history
  • Loading branch information
macumber committed Jan 21, 2024
1 parent e5ae1dd commit 407b2d0
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion ConanInstall.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
endif()
endif()

if( APPLE AND ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
# use newer recipe which updated the mirror urls, for some reason this fails on other platforms
# https://github.com/conan-io/conan-center-index/pull/13435
# https://conan.io/center/recipes/openssl?version=1.1.1o
set(CONAN_OPENSSL "openssl/1.1.1o#4405b3b0a045933a2065e194965b38c1")
else()
# align on the same as our conan-openstudio-ruby
set(CONAN_OPENSSL "openssl/1.1.1o#213dbdeb846a4b40b4dec36cf2e673d7")
endif()

message(STATUS "Conan: conan_cmake_configure")
# This will create the conanfile.txt
Expand All @@ -144,7 +153,7 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
${CONAN_READLINE}
${CONAN_QT}
${CONAN_RUBY}
"openssl/1.1.1o#4405b3b0a045933a2065e194965b38c1" # force every package to align on the same as our conan-openstudio-ruby
${CONAN_OPENSSL}
"boost/1.79.0#f664bfe40e2245fa9baf1c742591d582"
"pugixml/1.12.1#5a39f82651eba3e7d6197903a3202e21"
"libxml2/2.9.14#fc433aeebfe525657d73334c61f96944"
Expand Down

0 comments on commit 407b2d0

Please # to comment.