occt: master 0553a8ea

Diff Back to Repository
Author Committer Branch Timestamp Parent
abv bugmaster master 2018-03-19 06:04:17 master 1fa16152
Affected Issues  0029589: Configuration - allow MFC samples to be built when OCCT is linked statically
Changeset 0029589: Configuration - allow MFC samples to be built when OCCT is linked statically

CMake scripts are corrected to do perform search of libs and dlls of third-party libraries even for static builds of OCCT.
Treatment of errors in this case is relaxed: not found DLLs are reported as warnings, and not found libs as warning for static build, and continuable error for shared build.

Code of samples is corrected to allow building with OCCT linked statically.
Implementation of main application class is corrected to ensure that initialization is done after all global objects are created.
Note however that samples still fails to start for unclear reason (creation of MFC frame window fails).
mod - adm/cmake/3rdparty_macro.cmake Diff File
mod - adm/cmake/ffmpeg.cmake Diff File
mod - adm/cmake/freetype.cmake Diff File
mod - adm/cmake/qt.cmake Diff File
mod - adm/cmake/tbb.cmake Diff File
mod - adm/cmake/tcl.cmake Diff File
mod - adm/cmake/tk.cmake Diff File
mod - adm/cmake/vtk.cmake Diff File
mod - CMakeLists.txt Diff File
mod - samples/mfc/standard/05_ImportExport/src/ImportExportApp.cpp Diff File
mod - samples/mfc/standard/06_Ocaf/CMakeLists.txt Diff File
mod - samples/mfc/standard/Common/OCC_2dChildFrame.h Diff File
mod - samples/mfc/standard/Common/OCC_2dDoc.h Diff File
mod - samples/mfc/standard/Common/OCC_2dView.h Diff File
mod - samples/mfc/standard/Common/OCC_3dBaseDoc.h Diff File
mod - samples/mfc/standard/Common/OCC_3dChildFrame.h Diff File
mod - samples/mfc/standard/Common/OCC_3dDoc.h Diff File
mod - samples/mfc/standard/Common/OCC_3dView.h Diff File
mod - samples/mfc/standard/Common/OCC_App.cpp Diff File
mod - samples/mfc/standard/Common/OCC_App.h Diff File
mod - samples/mfc/standard/Common/OCC_BaseChildFrame.h Diff File
mod - samples/mfc/standard/Common/OCC_BaseDoc.h Diff File
mod - samples/mfc/standard/Common/OCC_BaseView.h Diff File
mod - samples/mfc/standard/Common/OCC_StereoConfigDlg.h Diff File
mod - samples/mfc/standard/mfcsample/CMakeLists.txt Diff File