Merge pull request #329 from openstudiocoalition/update_os_3_2_0_rc1

Update os 3 2 0 rc1
openstudiocoalition · Apr 26, 2021 · 4bd15bc · 4bd15bc
2 parents 66e2eff + 643e438
commit 4bd15bc
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 173 deletions.
diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml
@@ -107,7 +107,7 @@ jobs:
 
     - uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.5
+        ruby-version: 2.7
 
     - name: Extract OSApp version from CMakeLists.txt
       shell: python

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/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/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,20 @@ if(CCACHE_PROGRAM)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
 endif()
 
-project(OpenStudioApplication VERSION 1.1.1)
+project(OpenStudioApplication VERSION 1.2.0)
+
+
+# If Linux, check LSB_RELEASE globally so we can use it after
+if(UNIX AND NOT APPLE)
+
+  find_program(LSB_RELEASE lsb_release)
+  # -rs outputs only 18.04, or 20.04
+  execute_process(COMMAND ${LSB_RELEASE} -rs
+    OUTPUT_VARIABLE LSB_RELEASE_VERSION_SHORT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  message(STATUS "LSB_RELEASE_VERSION_SHORT = ${LSB_RELEASE_VERSION_SHORT}")
+endif()
 
 # set openstudio_DIR to the directory that contains the openstudioConfig.cmake
 # eg C:\src\OpenStudio\build-vs\_CPack_Packages\win64\ZIP\OpenStudio-3.0.0-rc2+ce27ae6b85-Windows\lib\cmake\openstudio
@@ -372,18 +385,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
                   OUTPUT_VARIABLE GCC_VERSION)
 endif()
 
-# If Linux, check LSB_RELEASE globally so we can use it after
-if(UNIX AND NOT APPLE)
-
-  find_program(LSB_RELEASE lsb_release)
-  # -rs outputs only 16.04, or 18.04
-  execute_process(COMMAND ${LSB_RELEASE} -rs
-    OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  message(STATUS "LSB_RELEASE_ID_SHORT = ${LSB_RELEASE_ID_SHORT}")
-endif()
-
 # compiler id for about boxes
 if(MSVC)
   set(ABOUT_COMPILER "${CMAKE_GENERATOR}")
@@ -435,7 +436,7 @@ set(QT_VERSION "5.15.0")
     #set(QT_ZIP_FILENAME "DOES_NOT_EXIST_qt_5_11_redhat_shared.tar.gz")
     #set(QT_ZIP_EXPECTED_MD5 "b0610716854ed91a003347c455b22eb8")
   #else()
-    #if(LSB_RELEASE_ID_SHORT MATCHES "18.04")
+    #if(LSB_RELEASE_VERSION_SHORT MATCHES "18.04")
       #set(QT_ZIP_FILENAME "qt_5_11_linux_shared.tar.gz")
       #set(QT_ZIP_EXPECTED_MD5 "33c5a562935612625ec5e41fe4b75e17")
     #else()
@@ -731,7 +732,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenStudioApplication ${OpenStudioApplica
 
 # The actual package file name on disk
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${OPENSTUDIOAPPLICATION_LONG_VERSION}-${CMAKE_SYSTEM_NAME}")
-if(LSB_RELEASE_ID_SHORT MATCHES "20.04")
+if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
   set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${OPENSTUDIOAPPLICATION_LONG_VERSION}-${CMAKE_SYSTEM_NAME}20.04")
 endif()
 set(CPACK_PACKAGE_CONTACT "[email protected]")

diff --git a/ConanInstall.cmake b/ConanInstall.cmake
@@ -6,8 +6,8 @@
 
 if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
 
-  set(CMAKE_CONAN_EXPECTED_HASH 773399d30bb924959b86883f95d64df6)
-  set(CMAKE_CONAN_VERSION "v0.15")
+  set(CMAKE_CONAN_EXPECTED_HASH 170c3250029af321395135a3952a9045)
+  set(CMAKE_CONAN_VERSION "v0.16.1")
 
   if(EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
     file(MD5 "${CMAKE_BINARY_DIR}/conan.cmake" CMAKE_CONAN_HASH)
@@ -37,42 +37,60 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
   #conan_add_remote(NAME jmarrec
   #  URL https://api.bintray.com/conan/jmarrec/testing)
 
-  #list(APPEND CONAN_OPTIONS "zlib:minizip=True")
+  # Enable revisions in conan: check if they are already enabled, if not do it and warn user
+  execute_process(
+    COMMAND ${CONAN_CMD} config get general.revisions_enabled
+    OUTPUT_VARIABLE CONAN_REV_STATUS
+    ERROR_VARIABLE CONAN_REV_STATUS
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  message(STATUS "Conan: config get general.revisions_enabled=${CONAN_REV_STATUS}")
+  if (NOT "${CONAN_REV_STATUS}" STREQUAL "True")
+    message(AUTHOR_WARNING "Conan: Force enabling revisions (conan config set general.revisions_enabled=True)")
+    execute_process(COMMAND ${CONAN_CMD} config set general.revisions_enabled=True)
+  endif()
+
+  list(APPEND CONAN_OPTIONS "zlib:minizip=True")
+  # TODO:  list(APPEND CONAN_OPTIONS "fmt:header_only=True")
+
   # You do want to rebuild packages if there's a newer recipe in the remote (which applies mostly to our own openstudio_ruby where we don't
   # bump the actual package version when we make changes) than the binaries were built with
   # 'outdated' also acts like 'missing': if no binary, will build them.
-  list(APPEND CONAN_BUILD "outdated")
+  # list(APPEND CONAN_BUILD "outdated")
+  list(APPEND CONAN_BUILD "missing")
 
   if (BUILD_TESTING)
-    set(CONAN_GTEST "gtest/1.10.0")
+    set(CONAN_GTEST "gtest/1.10.0#ef88ba8e54f5ffad7d706062d0731a40")
   else()
     set(CONAN_GTEST "")
   endif()
 
-  # DLM: add option for shared libs if we are building shared?
+  #if(BUILD_RUBY_BINDINGS OR BUILD_CLI)
+    # Track NREL/stable in general, on a feature branch this could be temporarily switched to NREL/testing
+    set(CONAN_RUBY "openstudio_ruby/2.7.2@nrel/testing#5cc83469365344df986cd820cca4884d")
+  #endif()
 
   # This will create the conanbuildinfo.cmake in the current binary dir, not the cmake_binary_dir
   conan_cmake_run(REQUIRES
     ${CONAN_READLINE}
     ${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/stable   # TODO: Temp #@nrel/stable
-    boost/1.73.0
-    pugixml/1.10
-    jsoncpp/1.9.3
-    zlib/1.2.11
-    minizip/1.2.11
-    fmt/7.0.1
-    sqlite3/3.32.3
-    cpprestsdk/2.10.16
-    websocketpp/0.8.2
-    geographiclib/1.50.1
-    swig/4.0.2
+    ${CONAN_RUBY}
+    "openssl/1.1.0l#7f3fa5cfcfba31fffa344c71a9795176" # 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
+    "boost/1.73.0#4129a76c9b83c300fc103e36d1908792"
+    "pugixml/1.10#64b3ebc897bb9d9854c8a2443bf112a8"
+    "jsoncpp/1.9.3#073a6d3cb40911d7c8027bddb6ae7dbf"
+    "zlib/1.2.11#0df31fd24179543f5720ec7beb2a88d7"
+    "fmt/7.0.1#0580b1492b1dddb43b1768e68f25c43c"
+    "sqlite3/3.32.3#914492672c458f8be511e3800c14c717"
+    "cpprestsdk/2.10.16#d097ff9a8719d9d0ed34293c2ebd90ed"
+    "websocketpp/0.8.2#6d77b9b8a2368fa5fd5377af0c0ca211"
+    "geographiclib/1.50.1#b1a7966385dead17ec170b25a99cf71b"
+    "swig/4.0.2#bfafb16cd2bea6af3b8003163abcbd09"
     ${CONAN_GTEST}
 
     # Override to avoid dependency mismatches
-    bzip2/1.0.8
+    #"bzip2/1.0.8#d4a5c7144832d75fc3f349c5346160b0"
+    #"libyaml/0.2.5#9e234874df88c3ba7249f6d1368fceaf"
     BASIC_SETUP CMAKE_TARGETS NO_OUTPUT_DIRS
     OPTIONS ${CONAN_OPTIONS}
     BUILD ${CONAN_BUILD}
@@ -91,4 +109,3 @@ else()
   message(STATUS "openstudio: CONAN RUN BY CALLING SCRIPT")
 
 endif()
-
diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake
@@ -1,27 +1,34 @@
 set(OPENSTUDIO_VERSION_MAJOR 3)
-set(OPENSTUDIO_VERSION_MINOR 1)
-set(OPENSTUDIO_VERSION_PATCH 1)
+set(OPENSTUDIO_VERSION_MINOR 2)
+set(OPENSTUDIO_VERSION_PATCH 0)
 set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
 
 #If this is a release enter the SHA as "+79857912c4"
 #set(OPENSTUDIO_VERSION_SHA "+09b7c8a554")
 #If this is a pre-release enter the pre-release and SHA as "-rc1+79857912c4"
-set(OPENSTUDIO_VERSION_SHA "-alpha+3d83fc2b65")
+set(OPENSTUDIO_VERSION_SHA "-rc1+2249bb4700")
 
 # Paths where the cmake-downloaded archives will be put
 set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSION}")
 
 # If downloaded, we need the SHA to match. This block is here since we need "OPENSTUDIO_PLATFORM" anyways
 if(APPLE)
-  set(OPENSTUDIO_EXPECTED_HASH b584509c1ee4d22336a1557f5e32c914)
+  set(OPENSTUDIO_EXPECTED_HASH 6b553cc839852f94f0c77c2fd222007a)
   set(OPENSTUDIO_PLATFORM "Darwin")
   set(OPENSTUDIO_EXT "tar.gz")
 elseif(UNIX)
-  set(OPENSTUDIO_EXPECTED_HASH 3ae05f06deb53219e0cb519026a0e6df)
-  set(OPENSTUDIO_PLATFORM "Linux")
+
+  if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
+    set(OPENSTUDIO_EXPECTED_HASH 0bca38a37f74e733ac49a2577abac9cf)
+    set(OPENSTUDIO_PLATFORM "Ubuntu-20.04")
+  else() # Assumes 18.04
+    set(OPENSTUDIO_EXPECTED_HASH 9161ae070c597affa88a38b9c2f5e82f)
+    set(OPENSTUDIO_PLATFORM "Ubuntu-18.04")
+  endif()
   set(OPENSTUDIO_EXT "tar.gz")
+
 elseif(WIN32)
-  set(OPENSTUDIO_EXPECTED_HASH e761d02a7b377dc0cc9682287d51f698)
+  set(OPENSTUDIO_EXPECTED_HASH fbb37b1e83beb41abbe002bcf3d19f68)
   set(OPENSTUDIO_PLATFORM "Windows")
   set(OPENSTUDIO_EXT "tar.gz")
 endif()
@@ -50,7 +57,7 @@ else()
   # base link for release builds
   set(OPENSTUDIO_BASELINK_RELEASE
     #"https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}"
-    https://github.com/NREL/OpenStudio/releases/download/v3.1.0
+    https://github.com/NREL/OpenStudio/releases/download/v3.2.0-rc1/
     CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)
 
   # base link for develop builds. (Using https will fail)

diff --git a/ProjectMacros.cmake b/ProjectMacros.cmake
@@ -56,67 +56,6 @@ macro(FIND_QT_STATIC_LIB NAMES P)
   unset(QT_STATIC_LIB_D CACHE )
 endmacro()
 
-# This function is nearly identical to QT5_WRAP_CPP (from Qt5CoreMacros.cmake), except that it removes Boost
-# from the include directories and outputs .cxx files
-
-# qt5_wrap_cpp_minimally(outfiles inputfile ...)
-function(QT5_WRAP_CPP_MINIMALLY outfiles)
-  # Remove Boost and possibly other include directories
-  get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES)
-  set(_orig_DIRS ${_inc_DIRS})
-  if(APPLE)
-    if(NOT ${target_name} STREQUAL "qwt")
-      foreach(_current ${_inc_DIRS})
-        if(NOT "${_current}" MATCHES "[Qq][Tt]5")
-          list(REMOVE_ITEM _inc_DIRS "${_current}")
-        endif()
-      endforeach()
-      set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/src;${PROJECT_BINARY_DIR}/src;${_inc_DIRS}")
-    endif()
-  elseif(UNIX)
-    foreach(_current ${_inc_DIRS})
-      if(NOT "${_current}" MATCHES "[Qq][Tt]5")
-        list(REMOVE_ITEM _inc_DIRS "${_current}")
-      endif()
-    endforeach()
-    set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/src;${PROJECT_BINARY_DIR}/src;${_inc_DIRS}")
-  else()
-    foreach(_current ${_inc_DIRS})
-      if("${_current}" MATCHES "[Bb][Oo][Oo][Ss][Tt]")
-        list(REMOVE_ITEM _inc_DIRS "${_current}")
-      endif()
-    endforeach()
-    set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${_inc_DIRS}")
-  endif()
-
-  qt5_get_moc_flags(moc_flags)
-
-  set(options)
-  set(oneValueArgs TARGET)
-  set(multiValueArgs OPTIONS)
-
-  cmake_parse_arguments(_WRAP_CPP "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  set(moc_files ${_WRAP_CPP_UNPARSED_ARGUMENTS})
-  set(moc_options ${_WRAP_CPP_OPTIONS})
-  set(moc_target ${_WRAP_CPP_TARGET})
-
-  if(moc_target AND CMAKE_VERSION VERSION_LESS 2.8.12)
-    message(FATAL_ERROR "The TARGET parameter to qt5_wrap_cpp is only available when using CMake 2.8.12 or later.")
-  endif()
-  foreach(it ${moc_files})
-    get_filename_component(it ${it} ABSOLUTE)
-    qt5_make_output_file(${it} moc_ cxx outfile)
-    qt5_create_moc_command(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}" "")
-    list(APPEND ${outfiles} ${outfile})
-  endforeach()
-  set(${outfiles} ${${outfiles}} PARENT_SCOPE)
-
-  # Restore include directories
-  set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${_orig_DIRS}")
-endfunction()
-
-
 
 ###############################################################################
 #                                  O T H E R                                  #
@@ -334,8 +273,6 @@ macro(MAKE_SWIG_TARGET_OSAPP NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PA
   ## Finish requirements gathering
   ##
 
-  include_directories(${RUBY_INCLUDE_DIRS})
-
   if(WIN32)
     set(SWIG_DEFINES "-D_WINDOWS")
     set(SWIG_COMMON "-Fmicrosoft")
@@ -467,6 +404,7 @@ macro(MAKE_SWIG_TARGET_OSAPP NAME SIMPLENAME KEY_I_FILE I_FILES PARENT_TARGET PA
   set_target_properties(${swig_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ruby/")
   set_target_properties(${swig_target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ruby/")
   target_link_libraries(${swig_target} ${PARENT_TARGET})
+  target_include_directories(${swig_target} SYSTEM PRIVATE ${RUBY_INCLUDE_DIRS})
   add_dependencies(${swig_target} ${PARENT_TARGET})
 
   # QT-Separation-Move

diff --git a/ruby/CMakeLists.txt b/ruby/CMakeLists.txt
@@ -19,7 +19,7 @@ add_library(openstudio_modeleditor_rb MODULE
   openstudio_modeleditor_rb.cpp
 )
 
-target_include_directories(openstudio_modeleditor_rb PRIVATE ${RUBY_INCLUDE_DIRS})
+target_include_directories(openstudio_modeleditor_rb SYSTEM PRIVATE ${RUBY_INCLUDE_DIRS})
 
 set_target_properties(openstudio_modeleditor_rb PROPERTIES PREFIX "")
 set_target_properties(openstudio_modeleditor_rb PROPERTIES OUTPUT_NAME openstudio_modeleditor)
@@ -62,12 +62,12 @@ if(APPLE)
     COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/platforms/
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:Qt5::QCocoaIntegrationPlugin> $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/platforms/.
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtConcurrent.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtConcurrent.framework
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtCore.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtCore.framework 
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtDBus.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtDBus.framework 
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtGui.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtGui.framework 
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtCore.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtCore.framework
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtDBus.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtDBus.framework
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtGui.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtGui.framework
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtNetwork.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtNetwork.framework
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtPrintSupport.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtPrintSupport.framework
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtWidgets.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtWidgets.framework 
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtWidgets.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtWidgets.framework
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${QT_INSTALL_DIR}/lib/QtXml.framework $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/QtXml.framework
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:openstudio::openstudiolib> $<TARGET_FILE_DIR:openstudio_modeleditor_rb>/.
     COMMAND ruby "${PROJECT_SOURCE_DIR}/SketchUpInstallName.rb" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ruby/openstudio_modeleditor.bundle"
@@ -120,7 +120,7 @@ if(BUILD_TESTING)
 
   # I added FindRuby.cmake from cmake 3.18.2 (after patching cmake to support versions greater than 2 and adding RVM support) in the CMake folder which is part of the CMAKE_MODULE_PATH
   set(Ruby_FIND_VIRTUALENV FIRST)
-  find_package(Ruby 2.5)
+  find_package(Ruby 2.7)
 
   if(NOT Ruby_EXECUTABLE)
     message(WARNING "Your system ruby wasn't found, you won't be able to run the `ctest -R RubyTest` command and the tests won't be created at all.")

diff --git a/src/model_editor/CMakeLists.txt b/src/model_editor/CMakeLists.txt
@@ -80,7 +80,7 @@ set(${target_name}_qrc
 CONFIGURE_FILE_WITH_CHECKSUM(AboutBox.hpp.in "${CMAKE_CURRENT_BINARY_DIR}/AboutBox.hpp")
 
 ## Qt MOC generation
-qt5_wrap_cpp_minimally(${target_name}_mocs ${${target_name}_moc})
+qt5_wrap_cpp(${target_name}_mocs ${${target_name}_moc})
 
 ## Qt UI Generation
 qt5_wrap_ui(${target_name}_uis ${${target_name}_ui})

diff --git a/src/openstudio_app/CMakeLists.txt b/src/openstudio_app/CMakeLists.txt
@@ -39,7 +39,7 @@ set(${target_name}_moc
 )
 
 ## Qt UI generation
-qt5_wrap_cpp_minimally(${target_name}_moc_src ${${target_name}_moc})
+qt5_wrap_cpp(${target_name}_moc_src ${${target_name}_moc})
 
 # configure the AboutBox.hpp file
 # this needs to be configured to embed the build number
@@ -119,7 +119,7 @@ elseif(UNIX)
 
 endif()
 
-#include_directories(${RUBY_INCLUDE_DIRS})
+#include_directories(SYSTEM ${RUBY_INCLUDE_DIRS})
 
 add_executable(${target_name}
   WIN32

diff --git a/src/openstudio_lib/CMakeLists.txt b/src/openstudio_lib/CMakeLists.txt
@@ -704,7 +704,7 @@ set(${target_name}_qrc
 )
 
 ## Qt UI generation
-qt5_wrap_cpp_minimally(${target_name}_moc_src ${${target_name}_moc})
+qt5_wrap_cpp(${target_name}_moc_src ${${target_name}_moc})
 
 # generate rules for building source files from the resources
 qt5_add_resources(${target_name}_qrcs ${${target_name}_qrc})