# HG changeset patch # User Benjamin Golinvaux # Date 1584354117 -3600 # Node ID 7045a0ff32c4d4685a5d2904bd2f3b5100674743 # Parent 1a08b779be6417575ac030eb9adc6aed38afb34b Added DISABLE_STONE_QT_CMAKE_FILE option (Qt5 Win10 builds do not work when QtConfiguration.cmake is included). This is a quick hacky fix. diff -r 1a08b779be64 -r 7045a0ff32c4 Resources/CMake/OrthancStoneConfiguration.cmake --- 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)