Mercurial > hg > orthanc-stone
changeset 423:574fc54056af am-vsol-upgrade
WRAP_UI and WRAP_CPP commonly used files in stone makefile instead of project makefile
author | am@osimis.io |
---|---|
date | Wed, 21 Nov 2018 17:07:43 +0100 |
parents | 4fe42ae3653a |
children | bb573a52fc63 |
files | Applications/Samples/CMakeLists.txt Resources/CMake/QtConfiguration.cmake |
diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Applications/Samples/CMakeLists.txt Tue Nov 20 21:44:48 2018 +0100 +++ b/Applications/Samples/CMakeLists.txt Wed Nov 21 17:07:43 2018 +0100 @@ -160,8 +160,6 @@ ) ORTHANC_QT_WRAP_CPP(SIMPLE_VIEWER_APPLICATION_SOURCES - ${ORTHANC_STONE_ROOT}/Applications/Qt/QCairoWidget.h - ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.h ${ORTHANC_STONE_ROOT}/Applications/Samples/SimpleViewer/Qt/SimpleViewerMainWindow.h )
--- a/Resources/CMake/QtConfiguration.cmake Tue Nov 20 21:44:48 2018 +0100 +++ b/Resources/CMake/QtConfiguration.cmake Wed Nov 21 17:07:43 2018 +0100 @@ -64,6 +64,11 @@ ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.cpp ) +ORTHANC_QT_WRAP_CPP(QT_SOURCES + ${ORTHANC_STONE_ROOT}/Applications/Qt/QCairoWidget.h + ${ORTHANC_STONE_ROOT}/Applications/Qt/QStoneMainWindow.h + ) + # NB: Including CMAKE_CURRENT_BINARY_DIR is mandatory, as the CMake # macros for Qt will put their result in that directory, which cannot