Merge pull request #737 from openstudiocoalition/fix_resources_install

Fix resources install
openstudiocoalition · Sep 4, 2024 · e99e5ee · e99e5ee
2 parents cd925a1 + 636b46c
commit e99e5ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -621,6 +621,7 @@ list(APPEND QT_LIBS Qt6::Svg)
 if(WIN32)
   find_package(Qt6OpenGL ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
   list(APPEND QT_LIBS Qt6::OpenGL)
+  list(APPEND QT_LIBS Qt6::OpenGLWidgets)
 
   find_program(QT_WINDEPLOY_QT NAMES windeployqt.exe PATHS "${QT_INSTALL_DIR}/bin" NO_DEFAULT_PATH)
 

diff --git a/src/openstudio_app/CMakeLists.txt b/src/openstudio_app/CMakeLists.txt
@@ -352,17 +352,17 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/openstudio_app/Resources/
 # install measures/models from openstudio-coalition-measures
 
 install(FILES ${openstudio-coalition-measures_SOURCE_DIR}/models/ShoeboxExample.osm
-        DESTINATION ${RESOURCES_DEST}/ShoeboxModel
+        DESTINATION ${RESOURCES_DEST}/ShoeboxModel/
         COMPONENT "Resources"
 )
 
 install(DIRECTORY ${openstudio-coalition-measures_SOURCE_DIR}/models/ShoeboxExample
-        DESTINATION ${RESOURCES_DEST}/ShoeboxModel
+        DESTINATION ${RESOURCES_DEST}/ShoeboxModel/
         COMPONENT "Resources"
 )
 
 install(DIRECTORY ${openstudio-coalition-measures_SOURCE_DIR}/models/ShoeboxExample/measures/openstudio_results
-        DESTINATION ${RESOURCES_DEST}/openstudio_results
+        DESTINATION ${RESOURCES_DEST}/
         COMPONENT "Resources"
 )