# HG changeset patch # User am@osimis.io # Date 1542816463 -3600 # Node ID 574fc54056af4a02aed7224beea40abd991c4117 # Parent 4fe42ae3653a060939230cc488311f8f15ca699a WRAP_UI and WRAP_CPP commonly used files in stone makefile instead of project makefile diff -r 4fe42ae3653a -r 574fc54056af Applications/Samples/CMakeLists.txt --- 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 ) diff -r 4fe42ae3653a -r 574fc54056af Resources/CMake/QtConfiguration.cmake --- 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