Mercurial > hg > orthanc-stone
changeset 1316:7045a0ff32c4 broker
Added DISABLE_STONE_QT_CMAKE_FILE option (Qt5 Win10 builds do not work when QtConfiguration.cmake is included). This is a quick hacky fix.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 16 Mar 2020 11:21:57 +0100 |
| parents | 1a08b779be64 |
| children | 8981bfca3457 |
| files | Resources/CMake/OrthancStoneConfiguration.cmake |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/OrthancStoneConfiguration.cmake Mon Mar 16 11:21:13 2020 +0100 +++ b/Resources/CMake/OrthancStoneConfiguration.cmake Mon Mar 16 11:21:57 2020 +0100 @@ -121,12 +121,16 @@ -DORTHANC_ENABLE_SDL=1 ) elseif(ENABLE_QT) - message("QT is enabled") - include(${CMAKE_CURRENT_LIST_DIR}/QtConfiguration.cmake) add_definitions( -DORTHANC_ENABLE_QT=1 -DORTHANC_ENABLE_SDL=0 ) + if(DISABLE_STONE_QT_CMAKE_FILE) + message("QT is enabled, but QtConfiguration.cmake will not be included") + else() + message("QT is enabled") + include(${CMAKE_CURRENT_LIST_DIR}/QtConfiguration.cmake) + endif() else() message("SDL and QT are both disabled") unset(USE_SYSTEM_SDL CACHE)