Mercurial > hg > orthanc-stone
comparison Resources/CMake/OrthancStoneConfiguration.cmake @ 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 | 3d26447ddd28 |
children | 4d8d642f7036 |
comparison
equal
deleted
inserted
replaced
1315:1a08b779be64 | 1316:7045a0ff32c4 |
---|---|
119 add_definitions( | 119 add_definitions( |
120 -DORTHANC_ENABLE_QT=0 | 120 -DORTHANC_ENABLE_QT=0 |
121 -DORTHANC_ENABLE_SDL=1 | 121 -DORTHANC_ENABLE_SDL=1 |
122 ) | 122 ) |
123 elseif(ENABLE_QT) | 123 elseif(ENABLE_QT) |
124 message("QT is enabled") | |
125 include(${CMAKE_CURRENT_LIST_DIR}/QtConfiguration.cmake) | |
126 add_definitions( | 124 add_definitions( |
127 -DORTHANC_ENABLE_QT=1 | 125 -DORTHANC_ENABLE_QT=1 |
128 -DORTHANC_ENABLE_SDL=0 | 126 -DORTHANC_ENABLE_SDL=0 |
129 ) | 127 ) |
128 if(DISABLE_STONE_QT_CMAKE_FILE) | |
129 message("QT is enabled, but QtConfiguration.cmake will not be included") | |
130 else() | |
131 message("QT is enabled") | |
132 include(${CMAKE_CURRENT_LIST_DIR}/QtConfiguration.cmake) | |
133 endif() | |
130 else() | 134 else() |
131 message("SDL and QT are both disabled") | 135 message("SDL and QT are both disabled") |
132 unset(USE_SYSTEM_SDL CACHE) | 136 unset(USE_SYSTEM_SDL CACHE) |
133 add_definitions( | 137 add_definitions( |
134 -DORTHANC_ENABLE_SDL=0 | 138 -DORTHANC_ENABLE_SDL=0 |