Skip to content

Commit e99e5ee

Browse files
authored
Merge pull request #737 from openstudiocoalition/fix_resources_install
Fix resources install
2 parents cd925a1 + 636b46c commit e99e5ee

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@ list(APPEND QT_LIBS Qt6::Svg)
621621
if(WIN32)
622622
find_package(Qt6OpenGL ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
623623
list(APPEND QT_LIBS Qt6::OpenGL)
624+
list(APPEND QT_LIBS Qt6::OpenGLWidgets)
624625

625626
find_program(QT_WINDEPLOY_QT NAMES windeployqt.exe PATHS "${QT_INSTALL_DIR}/bin" NO_DEFAULT_PATH)
626627

src/openstudio_app/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,17 +352,17 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/openstudio_app/Resources/
352352
# install measures/models from openstudio-coalition-measures
353353

354354
install(FILES ${openstudio-coalition-measures_SOURCE_DIR}/models/ShoeboxExample.osm
355-
DESTINATION ${RESOURCES_DEST}/ShoeboxModel
355+
DESTINATION ${RESOURCES_DEST}/ShoeboxModel/
356356
COMPONENT "Resources"
357357
)
358358

359359
install(DIRECTORY ${openstudio-coalition-measures_SOURCE_DIR}/models/ShoeboxExample
360-
DESTINATION ${RESOURCES_DEST}/ShoeboxModel
360+
DESTINATION ${RESOURCES_DEST}/ShoeboxModel/
361361
COMPONENT "Resources"
362362
)
363363

364364
install(DIRECTORY ${openstudio-coalition-measures_SOURCE_DIR}/models/ShoeboxExample/measures/openstudio_results
365-
DESTINATION ${RESOURCES_DEST}/openstudio_results
365+
DESTINATION ${RESOURCES_DEST}/
366366
COMPONENT "Resources"
367367
)
368368

0 commit comments

Comments
 (0)