Merge pull request #376 from openstudiocoalition/v1_2_0_rc6

Merge for 1.2.0
openstudiocoalition · Jun 8, 2021 · 72d719f · 72d719f
2 parents b2611e5 + 347b40d
commit 72d719f
Show file tree

Hide file tree

Showing 229 changed files with 10,736 additions and 5,161 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -229,3 +229,28 @@ d2b2f4313ecd90adf7fc954bcb6e17d276d46ac9
 
 # [chore] Modify clang-format file for AccessModifierOffset (public/private) and rerun clang-format [Julien Marrec, 2020-07-23]
 a15f18dcc9f047c6b44fe13fa57a2fa8be4f4cd9
+
+# Clang format [chore] [Dan Macumber, 2020-09-05]
+e8a23dbe492a21d8619f67b42da7b0e6dd2c2caf
+
+# clang format pragma [chore] [Julien Marrec, 2020-09-07]
+13dbdd5b927c222a1206a6e412fadde3604cec96
+
+# clang format [chore] [Julien Marrec, 2020-09-08]
+b8d82f3a62acd0b0312a817162757e8d86aabb47
+
+# Add script to apply copyright [Dan Macumber, 2020-10-23]
+3269e69b8c2d657b9321d36b2ab2e11aa1f379be
+
+# Update copyrights in files [Dan Macumber, 2020-10-23]
+87b3610e9573bd31fbe3a3d067846a8395e6c552
+
+# Update Alliance copyright to 2020 [Dan Macumber, 2020-10-23]
+549a73e391e084e1cd68722a95e27affa10409a8
+
+# clang format [chore] [Julien Marrec, 2021-05-26]
+abcabd4cb0a2144b81e74212b19cc2dde1f04797
+
+# [chore] clang-format: BreakBeforeBinaryOperators: None to NonAssignment [Julien Marrec, 2021-05-31]
+1e066fcf865e22e0c23627ac7230024e244756a9
+
diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml
@@ -2,7 +2,7 @@ name: C++ CI for OpenStudioApplication
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, develop ]
     # Sequence of patterns matched against refs/tags
     tags:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
@@ -13,6 +13,7 @@ env:
   BUILD_TYPE: Release
   BUILD_DOCUMENTATION: OFF
   BUILD_TESTING: ON
+  BUILD_BENCHMARK: ON
   BUILD_PACKAGE: ON
   CPACK_BINARY_NSIS: OFF
   CPACK_BINARY_RPM: OFF
@@ -33,6 +34,8 @@ env:
 
 jobs:
   build:
+    # Note: as of 2021-01-29, this only works for push, not for pull request
+    # if: "!(contains(github.event.head_commit.message, 'skip') && contains(github.event.head_commit.message, 'ci'))"
     # runs-on: ubuntu-18.04
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.allow_failure }}
@@ -103,6 +106,10 @@ jobs:
       with:
         python-version: '3.8.x'
 
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+
     - name: Extract OSApp version from CMakeLists.txt
       shell: python
       run: |
@@ -235,19 +242,35 @@ jobs:
         if [ "$RUNNER_OS" == "Linux" ]; then
           echo "Install needed system dependencies for OPENGL (due to Qt) for Linux"
           sudo apt update
-          sudo apt install -y mesa-common-dev libglu1-mesa-dev patchelf
+          sudo apt install -y mesa-common-dev libglu1-mesa-dev patchelf ninja-build
+          # Weirdly enough, ninja makes ubuntu unresponsive...
+          echo CMAKE_GENERATOR='Ninja' >> $GITHUB_ENV
         elif [ "$RUNNER_OS" == "Windows" ]; then
-          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/3.2.2/QtInstallerFramework-win-x86.exe
+          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.0.1/QtInstallerFramework-win-x86.exe
           ./QtInstallerFramework-win-x86.exe --verbose --script ./ci/install_script_qtifw.qs
-          echo "C:/Qt/QtIFW-3.2.2/bin" >> $GITHUB_PATH
+          echo "C:/Qt/QtIFW-4.0.1/bin" >> $GITHUB_PATH
+
+          echo "Using chocolatey to install ninja"
+          choco install ninja
+          # C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise
+          MSVC_DIR=$(cmd.exe /c "vswhere -products * -requires Microsoft.Component.MSBuild -property installationPath -latest")
+          echo "Latest is: $MSVC_DIR"
+          echo "MSVC_DIR=$MSVC_DIR" >> $GITHUB_ENV
+          # add folder containing vcvarsall.bat
+          echo "$MSVC_DIR\VC\Auxiliary\Build" >> $GITHUB_PATH
         elif [ "$RUNNER_OS" == "macOS" ]; then
           echo MACOSX_DEPLOYMENT_TARGET=${{ matrix.MACOSX_DEPLOYMENT_TARGET }} >> $GITHUB_ENV
           echo SDKROOT=${{ matrix.SDKROOT }} >> $GITHUB_ENV
           echo CMAKE_MACOSX_DEPLOYMENT_TARGET='-DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET' >> $GITHUB_ENV
+           # The MACOSX_DEPLOYMENT_TARGET environment variable sets the default value for the CMAKE_OSX_DEPLOYMENT_TARGET variable.
+          # echo CMAKE_MACOSX_DEPLOYMENT_TARGET='-DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET' >> $GITHUB_ENV
+          echo "Using brew to install ninja"
+          brew install ninja
+          echo CMAKE_GENERATOR='Ninja' >> $GITHUB_ENV
 
           brew install md5sha1sum
 
-          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/3.2.2/QtInstallerFramework-mac-x64.dmg
+          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.0.1/QtInstallerFramework-mac-x64.dmg
           hdiutil attach -mountpoint ./qtfiw_installer QtInstallerFramework-mac-x64.dmg
           echo "ls ./qtfiw_installer"
           ls ./qtfiw_installer
@@ -258,11 +281,12 @@ jobs:
           echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/Frameworks"
 
           sudo ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/MacOS/QtInstallerFramework-mac-x64 --verbose --script ./ci/install_script_qtifw.qs
-          echo "~/Qt/QtIFW-3.2.2/bin/" >> $GITHUB_PATH
+          echo "~/Qt/QtIFW-4.0.1/bin/" >> $GITHUB_PATH
         fi;
 
         CONAN_INSTALL_MD5=$(md5sum ConanInstall.cmake | awk '{print $1}')
         echo CONAN_INSTALL_MD5=$CONAN_INSTALL_MD5 >> $GITHUB_ENV
+        cmake --version
 
     # TODO: cache the QtIFW folder too
 
@@ -271,7 +295,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: build/
-        key: ${{ matrix.os }}-build-cache
+        key: ${{ matrix.os }}-build-cache-${{ secrets.CACHE_KEY }}
 
     - name: Did restoring the build-cache work? No
       # If the build cache wasn't found in the cache
@@ -298,7 +322,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: OpenStudio-${{ env.OS_SDK_VERSION }}
-        key: OpenStudio-SDK-${{ matrix.os }}-${{ env.OS_SDK_VERSION }}
+        key: OpenStudio-SDK-${{ matrix.os }}-${{ env.OS_SDK_VERSION }}-${{ secrets.CACHE_KEY }}
 
     - name: Did restoring the build-cache or OpenStudioSDK cache work? Yes
       # If it wasn't found in the cache
@@ -360,7 +384,7 @@ jobs:
     #  with:
     #    path: |
     #      ~/.conan
-    #    key: ${{ matrix.os }}-conan-cache-${{ env.CONAN_INSTALL_MD5 }}
+    #    key: ${{ matrix.os }}-conan-cache-${{ env.CONAN_INSTALL_MD5 }}-${{ secrets.CACHE_KEY }}
 
     - name: Did restoring the conan-cache work? No
       # If the SDK wasn't found in the cache
@@ -391,7 +415,8 @@ jobs:
         # echo openstudio_DIR=$openstudio_DIR >> $GITHUB_ENV
 
         if [ "$RUNNER_OS" == "Windows" ]; then
-          QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/msvc2019_64"
+          # QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/msvc2019_64"
+          QT_INSTALL_DIR="$(cmd.exe /c 'cd')\build\Qt-install\${{ env.QT_VERSION }}\msvc2019_64"
         else
           QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/${{ matrix.QT_ARCH }}"
         fi
@@ -433,17 +458,35 @@ jobs:
           #echo "The more I think about it, the more I think we should cache the entire build/ directory to speed up builds"
           #echo "We can use a manual counter in the key so we can effectively wipe the build directory when we want to"
 
-    - name: Configure CMake
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
+    - name: Configure CMake & build (Windows)
+      if: runner.os == 'Windows'
+      shell: cmd
+      working-directory: ./build
+      # Note the current convention is to use the -S and -B options here to specify source
+      # and build directories, but this is only available with CMake 3.13 and higher.
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      # NOTE: If you re-enable 'Download the OpenStudio installer' step, then pass `openstudio_DIR=$openstudio_DIR cmake [etc]`
+      run: |
+        echo "Using vcvarsall to initialize the development environment"
+        call vcvarsall.bat x64
+        cmake -G Ninja -DQT_INSTALL_DIR=${{ env.QT_INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DBUILD_DOCUMENTATION=${{ env.BUILD_DOCUMENTATION }} -DBUILD_TESTING=${{ env.BUILD_TESTING }} -DBUILD_BENCHMARK=${{ env.BUILD_BENCHMARK}} -DBUILD_PACKAGE=${{ env.BUILD_PACKAGE }} -DCPACK_BINARY_DEB=${{ env.CPACK_BINARY_DEB }} -DCPACK_BINARY_IFW=${{ env.CPACK_BINARY_IFW }} -DCPACK_BINARY_NSIS=${{ env.CPACK_BINARY_NSIS }} -DCPACK_BINARY_RPM=${{ env.CPACK_BINARY_RPM }} -DCPACK_BINARY_STGZ=${{ env.CPACK_BINARY_STGZ }} -DCPACK_BINARY_TBZ2=${{ env.CPACK_BINARY_TBZ2 }} -DCPACK_BINARY_TGZ=${{ env.CPACK_BINARY_TGZ }} -DCPACK_BINARY_ZIP=${{ env.CPACK_BINARY_ZIP }} -DCPACK_BINARY_TXZ=${{ env.CPACK_BINARY_TXZ }} -DCPACK_BINARY_TZ=${{ env.CPACK_BINARY_TZ }} -DCPACK_SOURCE_RPM=${{ env.CPACK_SOURCE_RPM }} -DCPACK_SOURCE_TBZ2=${{ env.CPACK_SOURCE_TBZ2 }} -DCPACK_SOURCE_TGZ=${{ env.CPACK_SOURCE_TGZ }} -DCPACK_SOURCE_TXZ=${{ env.CPACK_SOURCE_TXZ }} -DCPACK_SOURCE_TZ=${{ env.CPACK_SOURCE_TZ }} -DCPACK_SOURCE_ZIP=${{ env.CPACK_SOURCE_ZIP }} ../
+        ninja
+        ninja package
+
+    # Debug CPack:
+    # "C:\Program Files\CMake\bin\cpack.exe" --debug --verbose --config CPackConfig.cmake
+
+    - name: Configure CMake (Unix)
+      if: runner.os != 'Windows'
       shell: bash
       working-directory: ./build
       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
       # NOTE: If you re-enable 'Download the OpenStudio installer' step, then pass `openstudio_DIR=$openstudio_DIR cmake [etc]`
       run: |
-        cmake $CMAKE_GENERATOR $GITHUB_WORKSPACE -DQT_INSTALL_DIR=$QT_INSTALL_DIR -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_DOCUMENTATION=$DBUILD_DOCUMENTATION -DBUILD_TESTING=$BUILD_TESTING -DBUILD_PACKAGE=$BUILD_PACKAGE -DCPACK_BINARY_DEB=$CPACK_BINARY_DEB -DCPACK_BINARY_IFW=$CPACK_BINARY_IFW -DCPACK_BINARY_NSIS=$CPACK_BINARY_NSIS -DCPACK_BINARY_RPM=$CPACK_BINARY_RPM -DCPACK_BINARY_STGZ=$CPACK_BINARY_STGZ -DCPACK_BINARY_TBZ2=$CPACK_BINARY_TBZ2 -DCPACK_BINARY_TGZ=$CPACK_BINARY_TGZ -DCPACK_BINARY_ZIP=$CPACK_BINARY_ZIP -DCPACK_BINARY_TXZ=$CPACK_BINARY_TXZ -DCPACK_BINARY_TZ=$CPACK_BINARY_TZ -DCPACK_SOURCE_RPM=$CPACK_SOURCE_RPM -DCPACK_SOURCE_TBZ2=$CPACK_SOURCE_TBZ2 -DCPACK_SOURCE_TGZ=$CPACK_SOURCE_TGZ -DCPACK_SOURCE_TXZ=$CPACK_SOURCE_TXZ -DCPACK_SOURCE_TZ=$CPACK_SOURCE_TZ -DCPACK_SOURCE_ZIP=$CPACK_SOURCE_ZIP ../
+        set -x
+        cmake -DQT_INSTALL_DIR=$QT_INSTALL_DIR -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_DOCUMENTATION=$DBUILD_DOCUMENTATION -DBUILD_TESTING=$BUILD_TESTING -DBUILD_BENCHMARK=$BUILD_BENCHMARK -DBUILD_PACKAGE=$BUILD_PACKAGE -DCPACK_BINARY_DEB=$CPACK_BINARY_DEB -DCPACK_BINARY_IFW=$CPACK_BINARY_IFW -DCPACK_BINARY_NSIS=$CPACK_BINARY_NSIS -DCPACK_BINARY_RPM=$CPACK_BINARY_RPM -DCPACK_BINARY_STGZ=$CPACK_BINARY_STGZ -DCPACK_BINARY_TBZ2=$CPACK_BINARY_TBZ2 -DCPACK_BINARY_TGZ=$CPACK_BINARY_TGZ -DCPACK_BINARY_ZIP=$CPACK_BINARY_ZIP -DCPACK_BINARY_TXZ=$CPACK_BINARY_TXZ -DCPACK_BINARY_TZ=$CPACK_BINARY_TZ -DCPACK_SOURCE_RPM=$CPACK_SOURCE_RPM -DCPACK_SOURCE_TBZ2=$CPACK_SOURCE_TBZ2 -DCPACK_SOURCE_TGZ=$CPACK_SOURCE_TGZ -DCPACK_SOURCE_TXZ=$CPACK_SOURCE_TXZ -DCPACK_SOURCE_TZ=$CPACK_SOURCE_TZ -DCPACK_SOURCE_ZIP=$CPACK_SOURCE_ZIP ../
 
     # Note: JM 2020-07-22 This is an example of how to get a config log for a failed conan dependency build (no binary available)
     # This WILL be handy some day, so leave it here
@@ -461,8 +504,9 @@ jobs:
           #name: ${{ matrix.os }}-gdbm_config.log
           #path: ~/.conan/data/gdbm/1.18.1/_/_/build/**/source_subfolder/config.log
 
-    - name: Build
+    - name: Build (Unix)
       working-directory: ./build
+      if: runner.os != 'Windows'
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
       run: cmake --build . --target package -j 2 --config $BUILD_TYPE
@@ -491,14 +535,30 @@ jobs:
       run: |
           Xvfb :99 &
           export DISPLAY=:99
-          ctest -j -T test --no-compress-output -C $BUILD_TYPE || true
+          ctest -j -T test --output-on-failure --no-compress-output -C $BUILD_TYPE || true
 
     - name: Archive test results?
       uses: actions/upload-artifact@v2
       with:
           name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.os }}-Test.xml
           path: build/Testing/**/*.xml
 
+    - name: Benchmark
+      working-directory: ./build
+      shell: bash
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
+        Xvfb :99 &
+        export DISPLAY=:99
+        Products/SpacesSurfaces_Benchmark --benchmark_out_format=csv --benchmark_out='bench_results_SpacesSurfaces.csv' || true
+
+    - name: Archive benchmark results?
+      uses: actions/upload-artifact@v2
+      with:
+          name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.os }}-bench_results.csv
+          path: build/bench_results_*.csv
+
     #- name: Create a release if triggered by a tag
       #id: create_release_tag
       #if: contains(github.ref, 'refs/tags')
@@ -548,5 +608,6 @@ jobs:
       shell: bash
       run: |
         ls OpenStudioApplication-*
-        /bin/rm OpenStudioApplication-*${{ env.PLATFORM_NAME }}*
+        /bin/rm OpenStudioApplication-*${{ env.COMPRESSED_EXT }} || true
+        /bin/rm OpenStudioApplication-*${{ env.BINARY_EXT }} || true
         ls OpenStudioApplication-* || true
diff --git a/.github/workflows/check_osm_versions.yml b/.github/workflows/check_osm_versions.yml
@@ -13,7 +13,7 @@ jobs:
 
     - uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.5
+        ruby-version: 2.7
 
     - name: Verify that OSMs have been updated
       shell: bash

diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -12,10 +12,25 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Install cppcheck
+      shell: bash
+      run: |
+          # Current stable (2.3-25-20201207-23616-ga9f4a14c8, rev 1637) is broken, so use edge for now
+          # cppcheck has been removed completely from snap actually
+          # sudo snap install cppcheck --edge
+          mkdir cppcheck
+          cd cppcheck
+          wget https://github.com/danmar/cppcheck/archive/2.3.tar.gz
+          tar xfz 2.3.tar.gz
+          mkdir build
+          cd build
+          cmake -DCMAKE_BUILD_TYPE=Release ../cppcheck-2.3/
+          make -j $(nproc)
+          sudo make install
+
     - name: Run cppcheck
       shell: bash
       run: |
-          sudo snap install cppcheck
           cppcheck \
             --suppress=noExplicitConstructor \
             --suppress=useStlAlgorithm \

diff --git a/.github/workflows/release_notes.yml b/.github/workflows/release_notes.yml
@@ -13,7 +13,7 @@ jobs:
 
     - uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.5
+        ruby-version: 2.7
 
     - uses: actions/setup-python@v2
       with:

diff --git a/.gitignore b/.gitignore
@@ -36,4 +36,6 @@ developer/msvc/Visualizers/all_concat.natvis
 .vs/
 *.cache
 .DS_Store
-
+.clangd/
+cppcheck.txt*
+clang_format.patch
diff --git a/CMake/FindRuby.cmake b/CMake/FindRuby.cmake
@@ -37,7 +37,8 @@ This module will set the following variables in your project:
 ``Ruby_INCLUDE_DIRS``
   include dirs to be used when using the ruby library
 ``Ruby_LIBRARIES``
-  libraries needed to use ruby from C.
+  .. versionadded:: 3.18
+    libraries needed to use ruby from C.
 ``Ruby_VERSION``
   the version of ruby which was found, e.g. "1.8.7"
 ``Ruby_VERSION_MAJOR``
@@ -47,9 +48,10 @@ This module will set the following variables in your project:
 ``Ruby_VERSION_PATCH``
   Ruby patch version.
 
-
-The following variables are also provided for compatibility reasons,
-don't use them in new code:
+.. versionchanged:: 3.18
+  Previous versions of CMake used the ``RUBY_`` prefix for all variables.
+  The following variables are provided for compatibility reasons,
+  don't use them in new code:
 
 ``RUBY_EXECUTABLE``
   same as Ruby_EXECUTABLE.
@@ -67,6 +69,8 @@ don't use them in new code:
 Hints
 ^^^^^
 
+.. versionadded:: 3.18
+
 ``Ruby_ROOT_DIR``
   Define the root directory of a Ruby installation.
 
@@ -401,6 +405,7 @@ if(Ruby_VERSION_MAJOR)
   set(_Ruby_VERSION_SHORT "${Ruby_VERSION_MAJOR}.${Ruby_VERSION_MINOR}")
   set(_Ruby_VERSION_SHORT_NODOT "${Ruby_VERSION_MAJOR}${Ruby_VERSION_MINOR}")
   set(_Ruby_NODOT_VERSION "${Ruby_VERSION_MAJOR}${Ruby_VERSION_MINOR}${Ruby_VERSION_PATCH}")
+  set(_Ruby_NODOT_VERSION_ZERO_PATCH "${Ruby_VERSION_MAJOR}${Ruby_VERSION_MINOR}0")
 endif()
 
 # FIXME: Currently we require both the interpreter and development components to be found
@@ -433,22 +438,27 @@ endif()
 set(_Ruby_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_Ruby_VERSION_SHORT} ruby${_Ruby_VERSION_SHORT_NODOT} ruby-${_Ruby_VERSION_SHORT} ruby-${Ruby_VERSION})
 
 if(WIN32)
+  set(_Ruby_POSSIBLE_MSVC_RUNTIMES "msvcrt;vcruntime140;vcruntime140_1")
   if(MSVC_TOOLSET_VERSION)
-    set(_Ruby_MSVC_RUNTIME "${MSVC_TOOLSET_VERSION}")
+    list(APPEND _Ruby_POSSIBLE_MSVC_RUNTIMES "msvcr${MSVC_TOOLSET_VERSION}")
   else()
-    set(_Ruby_MSVC_RUNTIME "")
+    list(APPEND _Ruby_POSSIBLE_MSVC_RUNTIMES "msvcr")
   endif()
 
+  set(_Ruby_POSSIBLE_VERSION_SUFFICES "${_Ruby_NODOT_VERSION};${_Ruby_NODOT_VERSION_ZERO_PATCH}")
+
   set(_Ruby_ARCH_PREFIX "")
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(_Ruby_ARCH_PREFIX "x64-")
   endif()
 
-  list(APPEND _Ruby_POSSIBLE_LIB_NAMES
-             "${_Ruby_ARCH_PREFIX}msvcr${_Ruby_MSVC_RUNTIME}-ruby${_Ruby_NODOT_VERSION}"
-             "${_Ruby_ARCH_PREFIX}msvcr${_Ruby_MSVC_RUNTIME}-ruby${_Ruby_NODOT_VERSION}-static"
-             "${_Ruby_ARCH_PREFIX}msvcrt-ruby${_Ruby_NODOT_VERSION}"
-             "${_Ruby_ARCH_PREFIX}msvcrt-ruby${_Ruby_NODOT_VERSION}-static" )
+  foreach(_Ruby_MSVC_RUNTIME ${_Ruby_POSSIBLE_MSVC_RUNTIMES})
+    foreach(_Ruby_VERSION_SUFFIX ${_Ruby_POSSIBLE_VERSION_SUFFICES})
+      list(APPEND _Ruby_POSSIBLE_LIB_NAMES
+                 "${_Ruby_ARCH_PREFIX}${_Ruby_MSVC_RUNTIME}-ruby${_Ruby_VERSION_SUFFIX}"
+                 "${_Ruby_ARCH_PREFIX}${_Ruby_MSVC_RUNTIME}-ruby${_Ruby_VERSION_SUFFIX}-static")
+    endforeach()
+  endforeach()
 endif()
 
 find_library(Ruby_LIBRARY NAMES ${_Ruby_POSSIBLE_LIB_NAMES} HINTS ${Ruby_POSSIBLE_LIB_DIR} )
@@ -515,6 +525,7 @@ foreach(Camel
     Ruby_SITELIB_DIR
     Ruby_HAS_VENDOR_RUBY
     Ruby_VENDORARCH_DIR
+    Ruby_VENDORLIB_DIR
 
     )
     string(TOUPPER ${Camel} UPPER)