0029571: Samples: build qt samples together with OCCT
authornds <nds@opencascade.com>
Sun, 18 Mar 2018 12:34:17 +0000 (15:34 +0300)
committerbugmaster <bugmaster@opencascade.com>
Thu, 22 Mar 2018 12:11:27 +0000 (15:11 +0300)
commit1fa1615244319b1e0ede0aba9b86f0dc1d3672a9
tree19f059b5640a57019598916ffc82bbc5be90b6ad
parent7f3408c8c86da4f5d51cec212dc60b85e36da78a
0029571: Samples: build qt samples together with OCCT

Extending CMake procedure by 'BUILD_MODULE_QtSamples' variable to switch on qt samples build.
Implementation required:
- union of occt_toolkit_tool.cmake and occt_toolkit.cmake files;
- correction of qt samples sources by adding path to Qt 'plugins' folder. It helps to avoid definition of additional variable (QT_QPA_PLATFORM_PLUGIN_PATH) when staring sample.bat for qt samples;
- executable processing is extended in cmake procedure by providing 'EXECUTABLE_PROJECT' variable. Now we need not specify custom processing for DRAWEXE in occt_toolkit.cmake
82 files changed:
CMakeLists.txt
adm/SAMPLES [new file with mode: 0644]
adm/SAMPLES_RESOURCES [new file with mode: 0644]
adm/cmake/occt_macros.cmake
adm/cmake/occt_toolkit.cmake
adm/cmake/occt_toolkit_prepare_sample.cmake [new file with mode: 0644]
adm/cmake/occt_toolkit_prepare_tool.cmake [new file with mode: 0644]
adm/cmake/occt_toolkit_tool.cmake [deleted file]
adm/cmake/qt_macro.cmake
adm/cmake/vardescr.cmake
adm/templates/sample.bat
samples/qt/AndroidQt/AndroidQt.pro
samples/qt/AndroidQt/AndroidQt.qrc [deleted file]
samples/qt/AndroidQt/CMakeLists.txt [new file with mode: 0644]
samples/qt/AndroidQt/EXTERNLIB [new file with mode: 0644]
samples/qt/AndroidQt/FILES [new file with mode: 0644]
samples/qt/AndroidQt/PACKAGES [new file with mode: 0644]
samples/qt/AndroidQt/ReadMe.md
samples/qt/AndroidQt/res/qml/main.qml
samples/qt/AndroidQt/src/AndroidQt.cxx [moved from samples/qt/AndroidQt/AndroidQt.cxx with 100% similarity]
samples/qt/AndroidQt/src/AndroidQt.h [moved from samples/qt/AndroidQt/AndroidQt.h with 100% similarity]
samples/qt/AndroidQt/src/AndroidQt.qrc [new file with mode: 0644]
samples/qt/AndroidQt/src/AndroidQt_TouchParameters.cxx [moved from samples/qt/AndroidQt/AndroidQt_TouchParameters.cxx with 100% similarity]
samples/qt/AndroidQt/src/AndroidQt_TouchParameters.h [moved from samples/qt/AndroidQt/AndroidQt_TouchParameters.h with 100% similarity]
samples/qt/AndroidQt/src/AndroidQt_UserInteractionParameters.h [moved from samples/qt/AndroidQt/AndroidQt_UserInteractionParameters.h with 100% similarity]
samples/qt/AndroidQt/src/AndroidQt_Window.cxx [moved from samples/qt/AndroidQt/AndroidQt_Window.cxx with 100% similarity]
samples/qt/AndroidQt/src/AndroidQt_Window.h [moved from samples/qt/AndroidQt/AndroidQt_Window.h with 100% similarity]
samples/qt/AndroidQt/src/FILES [new file with mode: 0644]
samples/qt/AndroidQt/src/Main.cxx [moved from samples/qt/AndroidQt/Main.cxx with 93% similarity]
samples/qt/Common/src/ApplicationCommon.cxx
samples/qt/Common/src/DocumentCommon.cxx
samples/qt/Common/src/FILES [new file with mode: 0644]
samples/qt/Common/src/MDIWindow.cxx
samples/qt/FuncDemo/CMakeLists.txt [new file with mode: 0644]
samples/qt/FuncDemo/EXTERNLIB [new file with mode: 0644]
samples/qt/FuncDemo/FILES [new file with mode: 0644]
samples/qt/FuncDemo/FuncDemo.pro
samples/qt/FuncDemo/PACKAGES [new file with mode: 0644]
samples/qt/FuncDemo/env.bat
samples/qt/FuncDemo/src/FILES [new file with mode: 0644]
samples/qt/FuncDemo/src/FuncDemo.qrc [new file with mode: 0644]
samples/qt/FuncDemo/src/main.cpp
samples/qt/IESample/CMakeLists.txt [new file with mode: 0644]
samples/qt/IESample/EXTERNLIB [new file with mode: 0644]
samples/qt/IESample/FILES [new file with mode: 0644]
samples/qt/IESample/PACKAGES [new file with mode: 0644]
samples/qt/IESample/env.bat
samples/qt/IESample/src/FILES [new file with mode: 0644]
samples/qt/IESample/src/Main.cxx
samples/qt/Interface/src/Application.cxx
samples/qt/Interface/src/FILES [new file with mode: 0644]
samples/qt/Tutorial/CMakeLists.txt [new file with mode: 0644]
samples/qt/Tutorial/EXTERNLIB [new file with mode: 0644]
samples/qt/Tutorial/FILES [new file with mode: 0644]
samples/qt/Tutorial/PACKAGES [new file with mode: 0644]
samples/qt/Tutorial/env.bat
samples/qt/Tutorial/src/ApplicationTut.cxx
samples/qt/Tutorial/src/FILES [new file with mode: 0644]
samples/qt/Tutorial/src/Main.cxx
samples/tools/TInspectorEXE/CMakeLists.txt
samples/tools/TInspectorEXE/FILES
samples/tools/TInspectorEXE/PACKAGES [new file with mode: 0644]
samples/tools/TInspectorEXE/TInspectorEXE.qrc [deleted file]
samples/tools/TInspectorEXE/src/FILES [new file with mode: 0644]
samples/tools/TInspectorEXE/src/TInspectorEXE.cxx [moved from samples/tools/TInspectorEXE/TInspectorEXE.cxx with 93% similarity]
samples/tools/TInspectorEXE/src/TInspectorEXE.qrc [new file with mode: 0644]
samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.cxx [moved from samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.cxx with 98% similarity]
samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileDialog.hxx [moved from samples/tools/TInspectorEXE/TInspectorEXE_OpenFileDialog.hxx with 100% similarity]
samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.cxx [moved from samples/tools/TInspectorEXE/TInspectorEXE_OpenFileViewModel.cxx with 100% similarity]
samples/tools/TInspectorEXE/src/TInspectorEXE_OpenFileViewModel.hxx [moved from samples/tools/TInspectorEXE/TInspectorEXE_OpenFileViewModel.hxx with 100% similarity]
samples/tools/TStandalone/adm/cmake/occt_toolkit_standalone.cmake
src/DRAWEXE/CMakeLists.txt
tools/DFBrowserPane/DFBrowserPane.hxx
tools/TInspector/TInspector_Communicator.cxx
tools/TKDFBrowser/CMakeLists.txt
tools/TKShapeView/CMakeLists.txt
tools/TKTInspector/CMakeLists.txt
tools/TKTInspectorAPI/CMakeLists.txt
tools/TKToolsDraw/CMakeLists.txt
tools/TKTreeModel/CMakeLists.txt
tools/TKVInspector/CMakeLists.txt
tools/TKView/CMakeLists.txt