occt: master 1fa16152

Diff Back to Repository
Author Committer Branch Timestamp Parent
nds bugmaster master 2018-03-18 12:34:17 master 7f3408c8
Affected Issues  0029571: Samples: build qt samples together with OCCT
Changeset 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
mod - adm/cmake/occt_macros.cmake Diff File
mod - adm/cmake/occt_toolkit.cmake Diff File
add - adm/cmake/occt_toolkit_prepare_sample.cmake Diff File
add - adm/cmake/occt_toolkit_prepare_tool.cmake Diff File
rm - adm/cmake/occt_toolkit_tool.cmake Diff File
mod - adm/cmake/qt_macro.cmake Diff File
mod - adm/cmake/vardescr.cmake Diff File
add - adm/SAMPLES Diff File
add - adm/SAMPLES_RESOURCES Diff File
mod - adm/templates/sample.bat Diff File
mod - CMakeLists.txt Diff File
mod - samples/qt/AndroidQt/AndroidQt.pro Diff File
rm - samples/qt/AndroidQt/AndroidQt.qrc Diff File
add - samples/qt/AndroidQt/CMakeLists.txt Diff File
add - samples/qt/AndroidQt/EXTERNLIB Diff File
add - samples/qt/AndroidQt/FILES Diff File
add - samples/qt/AndroidQt/PACKAGES Diff File
mod - samples/qt/AndroidQt/ReadMe.md Diff File
mod - samples/qt/AndroidQt/res/qml/main.qml Diff File
add - samples/qt/AndroidQt/src/AndroidQt.qrc Diff File
add - samples/qt/AndroidQt/src/FILES Diff File
mod - samples/qt/Common/src/ApplicationCommon.cxx Diff File
mod - samples/qt/Common/src/DocumentCommon.cxx Diff File
add - samples/qt/Common/src/FILES Diff File
mod - samples/qt/Common/src/MDIWindow.cxx Diff File
add - samples/qt/FuncDemo/CMakeLists.txt Diff File
mod - samples/qt/FuncDemo/env.bat Diff File
add - samples/qt/FuncDemo/EXTERNLIB Diff File
add - samples/qt/FuncDemo/FILES Diff File
mod - samples/qt/FuncDemo/FuncDemo.pro Diff File
add - samples/qt/FuncDemo/PACKAGES Diff File
add - samples/qt/FuncDemo/src/FILES Diff File
add - samples/qt/FuncDemo/src/FuncDemo.qrc Diff File
mod - samples/qt/FuncDemo/src/main.cpp Diff File
add - samples/qt/IESample/CMakeLists.txt Diff File
mod - samples/qt/IESample/env.bat Diff File
add - samples/qt/IESample/EXTERNLIB Diff File
add - samples/qt/IESample/FILES Diff File
add - samples/qt/IESample/PACKAGES Diff File
add - samples/qt/IESample/src/FILES Diff File
mod - samples/qt/IESample/src/Main.cxx Diff File
mod - samples/qt/Interface/src/Application.cxx Diff File
add - samples/qt/Interface/src/FILES Diff File
add - samples/qt/Tutorial/CMakeLists.txt Diff File
mod - samples/qt/Tutorial/env.bat Diff File
add - samples/qt/Tutorial/EXTERNLIB Diff File
add - samples/qt/Tutorial/FILES Diff File
add - samples/qt/Tutorial/PACKAGES Diff File
mod - samples/qt/Tutorial/src/ApplicationTut.cxx Diff File
add - samples/qt/Tutorial/src/FILES Diff File
mod - samples/qt/Tutorial/src/Main.cxx Diff File
mod - samples/tools/TInspectorEXE/CMakeLists.txt Diff File
mod - samples/tools/TInspectorEXE/FILES Diff File
add - samples/tools/TInspectorEXE/PACKAGES Diff File
add - samples/tools/TInspectorEXE/src/FILES Diff File
add - samples/tools/TInspectorEXE/src/TInspectorEXE.qrc Diff File
rm - samples/tools/TInspectorEXE/TInspectorEXE.qrc Diff File
mod - samples/tools/TStandalone/adm/cmake/occt_toolkit_standalone.cmake Diff File
mod - src/DRAWEXE/CMakeLists.txt Diff File
mod - tools/DFBrowserPane/DFBrowserPane.hxx Diff File
mod - tools/TInspector/TInspector_Communicator.cxx Diff File
mod - tools/TKDFBrowser/CMakeLists.txt Diff File
mod - tools/TKShapeView/CMakeLists.txt Diff File
mod - tools/TKTInspector/CMakeLists.txt Diff File
mod - tools/TKTInspectorAPI/CMakeLists.txt Diff File
mod - tools/TKToolsDraw/CMakeLists.txt Diff File
mod - tools/TKTreeModel/CMakeLists.txt Diff File
mod - tools/TKView/CMakeLists.txt Diff File
mod - tools/TKVInspector/CMakeLists.txt Diff File