File tree Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change 5
5
if (NOT CONAN_OPENSTUDIO_ALREADY_RUN )
6
6
7
7
set (CMAKE_CONAN_EXPECTED_HASH
8
- 5cdb3042632da3efff558924eecefd580a0e786863a857ca097c3d1d43df5dcd )
9
- set (CMAKE_CONAN_VERSION "0.18.1 " )
8
+ 6abed7382c98a76b447675b30baff6a0b2f5d263041f6eb2fb682b80adaa2555 )
9
+ set (CMAKE_CONAN_VERSION "b240c809b5ea097077fc8222cad71d2329288e48 " )
10
10
11
11
if (EXISTS "${CMAKE_BINARY_DIR} /conan.cmake" )
12
12
file (SHA256 "${CMAKE_BINARY_DIR} /conan.cmake" CMAKE_CONAN_HASH )
@@ -153,6 +153,14 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
153
153
set (CONAN_OPENSSL "openssl/1.1.1o#213dbdeb846a4b40b4dec36cf2e673d7" )
154
154
endif ()
155
155
156
+ if ( APPLE AND ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "arm64" )
157
+ # most recent version of xcode gives error on boost 1.79.0:
158
+ # " ./boost/unordered/detail/fwd.hpp:53:16: error: no member named 'piecewise_construct' in namespace 'std'; did you mean 'piecewise_construct_t'?"
159
+ set (CONAN_BOOST "boost/1.84.0#85fab16ba3b744074ca9733d2ed5fe5a" )
160
+ else ()
161
+ set (CONAN_BOOST "boost/1.79.0#f664bfe40e2245fa9baf1c742591d582" )
162
+ endif ()
163
+
156
164
message (STATUS "Conan: conan_cmake_configure" )
157
165
# This will create the conanfile.txt
158
166
conan_cmake_configure (
@@ -162,7 +170,7 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
162
170
${CONAN_GMP}
163
171
${CONAN_RUBY}
164
172
${CONAN_OPENSSL}
165
- "boost/1.79.0#f664bfe40e2245fa9baf1c742591d582"
173
+ ${CONAN_BOOST}
166
174
"pugixml/1.12.1#5a39f82651eba3e7d6197903a3202e21"
167
175
"libxml2/2.9.14#fc433aeebfe525657d73334c61f96944"
168
176
"libxslt/1.1.34#9085031f5b9b2bb328ad615cd1bf1282"
You can’t perform that action at this time.
0 commit comments