Track the MeasureManager PR NREL/OpenStudio#4920

ConanInstall.cmake

@@ -159,7 +159,7 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
     "cpprestsdk/2.10.18#df2f6ac88e47cadd9c9e8e0971e00d89"
     "websocketpp/0.8.2#3fd704c4c5388d9c08b11af86f79f616"
     "geographiclib/1.52#76536a9315a003ef3511919310b2fe37"
-    "swig/4.0.2#9fcccb1e39eed9acd53a4363d8129be5"
+    "swig/4.1.0#f4419c5ab88f877272cbaa36dd0237ff"
     "tinygltf/2.5.0#c8b2aca9505e86312bb42aa0e1c639ec"
     ${CONAN_GTEST}
     ${CONAN_BENCHMARK}

FindOpenStudioSDK.cmake

@@ -1,12 +1,12 @@
 set(OPENSTUDIO_VERSION_MAJOR 3)
-set(OPENSTUDIO_VERSION_MINOR 6)
-set(OPENSTUDIO_VERSION_PATCH 1)
+set(OPENSTUDIO_VERSION_MINOR 7)
+set(OPENSTUDIO_VERSION_PATCH 0)
 set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
 
 #If this is an official release, leave this "", otherwise put for eg '-rc1'
-set(OPENSTUDIO_VERSION_PRERELEASE "")
+set(OPENSTUDIO_VERSION_PRERELEASE "-alpha")
 # Enter SHA, always, eg "+79857912c4"
-set(OPENSTUDIO_VERSION_SHA "+bb9481519e")
+set(OPENSTUDIO_VERSION_SHA "+3e228f9743")
 
 # Paths where the cmake-downloaded archives will be put
 set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}")
@@ -17,27 +17,27 @@ set(OPENSTUDIO_EXT "tar.gz")
 if(APPLE)
   set(OPENSTUDIO_PLATFORM "Darwin-${ARCH}")
   if(ARCH MATCHES "arm64")
-    set(OPENSTUDIO_EXPECTED_HASH b7401ca882ba6a162a41ba884555171b)
+    set(OPENSTUDIO_EXPECTED_HASH 2f1da36d7371227183526d173c2d6367)
   else()
-    set(OPENSTUDIO_EXPECTED_HASH ba881908f683ec695c209399f261b299)
+    set(OPENSTUDIO_EXPECTED_HASH 39c0f649eca477f1c3902315b9988612)
   endif()
 
 elseif(UNIX)
   set(OPENSTUDIO_PLATFORM "${LSB_RELEASE_ID_SHORT}-${LSB_RELEASE_VERSION_SHORT}-${ARCH}")
   if(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
     if (ARCH MATCHES "arm64")
-      set(OPENSTUDIO_EXPECTED_HASH 0124e7176d4577bf2152321d1b2770a5)
+      set(OPENSTUDIO_EXPECTED_HASH TODO)
     else()
       set(OPENSTUDIO_EXPECTED_HASH 5c45d729f3cadc04a93368e43947dc2d)
     endif()
   elseif(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
-    set(OPENSTUDIO_EXPECTED_HASH 5e67958249d99f96149b4d5576c3d0ef)
+    set(OPENSTUDIO_EXPECTED_HASH e1d864c5089ede17beb81791c94361fa)
   else()
     message(FATAL_ERROR "OpenStudio SDK no longer provides packages for Ubuntu 18.04")
   endif()
 
 elseif(WIN32)
-  set(OPENSTUDIO_EXPECTED_HASH 802f8cffeac24f011e636baf1e6ffd40)
+  set(OPENSTUDIO_EXPECTED_HASH ff830e8f2e5a00ab2ee3157dd967804f)
   set(OPENSTUDIO_PLATFORM "Windows")
 endif()
 
@@ -73,9 +73,9 @@ else()
   # Note: this should be set to ""http://openstudio-ci-builds.s3-website-us-west-2.amazonaws.com/develop" for nightly builds
   # Occasionally we can point to a specific PR by using something like ""http://openstudio-ci-builds.s3-website-us-west-2.amazonaws.com/PR-4080"
   set(OPENSTUDIO_BASELINK_CI
-    "http://openstudio-ci-builds.s3-website-us-west-2.amazonaws.com/develop"
+    # "http://openstudio-ci-builds.s3-website-us-west-2.amazonaws.com/develop"
     # TODO: TEMPORARY point to a specific subfolder / PR
-    # "http://openstudio-ci-builds.s3-website-us-west-2.amazonaws.com/PR-4712"
+    "http://openstudio-ci-builds.s3-website-us-west-2.amazonaws.com/PR-4920"
     # "http://openstudio-ci-builds.s3-website-us-west-2.amazonaws.com/${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_PRERELEASE}${WIN_SUBFOLDER}"
 
     CACHE STRING "Base link to where the openstudio develop archives are hosted" FORCE)