occt: master 4b3541c6

Author Committer Branch Timestamp Parent
abv abv master 2016-03-18 05:25:53 master cb492860
Affected Issues  0027176: Configuration, CMake - INSTALL_DIR is a common prefix for all other install variables
Changeset 0027176: Configuration, CMake - INSTALL_DIR is a common prefix for all other install variables

Possibility to customize layout of installation of OCCT is introduced by:
- variable INSTALL_DIR_LAYOUT - select one of the two predefined layouts: either Windows (classic OCCT layout) or Unix (Linux standard)
- variables INSTALL_DIR_* (BIN, LIB, INCLUDE, RESOURCE, DOC, TESTS, SCRIPT, SAMPLES, DATA) - specify locations of relevant components
- variable INSTALL_DIR_WITH_VERSION (bool) - specifies whether full version of OCCT should be used in paths in Unix layout

Files LICENSE_LGPL_21.txt and OCCT_LGPL_EXCEPTION.txt are always installed.

Environment is extended to support non-default layouts.
For that, environment variables "CSF_OCCT*Path" are defined, corresponding to CMake variables INSTALL_DIR_* described above.
Visual Studio environment, DRAW, tests, samples are amended to use these variables instead of (or as alternative to) CASROOT.

Settings of Products-specific vars are removed from environment scripts.

File genconf.bat was corrected to avoid error message for the case when path to TCL contains spaces.

Product name in rc files changed to "Open CASCADE Technology".
mod - adm/cmake/3rdparty_macro.cmake Diff File
mod - adm/cmake/freetype.cmake Diff File
mod - adm/cmake/occt_macros.cmake Diff File
mod - adm/cmake/occt_toolkit.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/vardescr.cmake Diff File
mod - adm/templates/custom.bat.main Diff File
mod - adm/templates/custom.build.bat.in Diff File
mod - adm/templates/custom.build.sh.in Diff File
mod - adm/templates/custom.install.bat.in Diff File
mod - adm/templates/custom.install.sh.in Diff File
mod - adm/templates/draw.sh Diff File
mod - adm/templates/DRAWEXE.vcxproj.user.in Diff File
mod - adm/templates/env.bat Diff File
rm - adm/templates/env.build.bat.in Diff File
rm - adm/templates/env.build.sh.in Diff File
add - adm/templates/env.samples.bat.in Diff File
add - adm/templates/env.samples.sh.in Diff File
mod - adm/templates/env.sh Diff File
mod - adm/templates/msvc.bat Diff File
mod - adm/templates/occt_toolkit.rc.in Diff File
mod - adm/templates/sample.bat Diff File
mod - adm/templates/template_dll.rc Diff File
mod - CMakeLists.txt Diff File
mod - dox/dev_guides/building/cmake/cmake.md Diff File
mod - genconf.bat Diff File
mod - samples/CSharp/msvc.bat Diff File
mod - samples/CSharp/msvc_D3D.bat Diff File
mod - samples/CSharp/OCCTProxy/OCCTProxy.vcproj Diff File
mod - samples/CSharp/OCCTProxy/OCCTProxy.vcxproj Diff File
mod - samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj Diff File
mod - samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj Diff File
mod - samples/CSharp/run.bat Diff File
mod - samples/CSharp/WinForms/Form2.cs Diff File
mod - samples/CSharp/WPF_D3D/OCCViewer.cs Diff File
mod - samples/CSharp/WPF_WinForms/OCCViewer.cs Diff File
mod - samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj Diff File
mod - samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj Diff File
mod - samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj Diff File
mod - samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj Diff File
mod - samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj Diff File
mod - samples/mfc/standard/01_Geometry/CMakeLists.txt Diff File
mod - samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj Diff File
mod - samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj Diff File
mod - samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj Diff File
mod - samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj Diff File
mod - samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj Diff File
mod - samples/mfc/standard/02_Modeling/CMakeLists.txt Diff File
mod - samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj Diff File
mod - samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj Diff File
mod - samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj Diff File
mod - samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj Diff File
mod - samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj Diff File
mod - samples/mfc/standard/03_Viewer2d/CMakeLists.txt Diff File
mod - samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj Diff File
mod - samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj Diff File
mod - samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj Diff File
mod - samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj Diff File
mod - samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj Diff File
mod - samples/mfc/standard/04_Viewer3d/CMakeLists.txt Diff File
mod - samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj Diff File
mod - samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj Diff File
mod - samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj Diff File
mod - samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj Diff File
mod - samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj Diff File
mod - samples/mfc/standard/05_ImportExport/CMakeLists.txt Diff File
mod - samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj Diff File
mod - samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj Diff File
mod - samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj Diff File
mod - samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj Diff File
mod - samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj Diff File
mod - samples/mfc/standard/06_Ocaf/CMakeLists.txt Diff File
mod - samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj Diff File
mod - samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj Diff File
mod - samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj Diff File
mod - samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj Diff File
mod - samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj Diff File
mod - samples/mfc/standard/07_Triangulation/CMakeLists.txt Diff File
mod - samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj Diff File
mod - samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj Diff File
mod - samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj Diff File
mod - samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj Diff File
mod - samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj Diff File
mod - samples/mfc/standard/08_HLR/CMakeLists.txt Diff File
mod - samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj Diff File
mod - samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj Diff File
mod - samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj Diff File
mod - samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj Diff File
mod - samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj Diff File
mod - samples/mfc/standard/09_Animation/CMakeLists.txt Diff File
mod - samples/mfc/standard/09_Animation/src/AnimationDoc.cpp Diff File
mod - samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj Diff File
mod - samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj Diff File
mod - samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj Diff File
mod - samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj Diff File
mod - samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj Diff File
mod - samples/mfc/standard/10_Convert/CMakeLists.txt Diff File
mod - samples/mfc/standard/Common/ImportExport/ImportExport.cpp Diff File
mod - samples/mfc/standard/Common/ImportExport/SaveSTEPDlg.cpp Diff File
mod - samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj Diff File
mod - samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj Diff File
mod - samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj Diff File
mod - samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj Diff File
mod - samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj Diff File
mod - samples/mfc/standard/mfcsample/CMakeLists.txt Diff File
mod - samples/mfc/standard/msvc.bat Diff File
mod - samples/mfc/standard/run.bat Diff File
mod - samples/qt/Common/src/MDIWindow.cxx Diff File
mod - samples/qt/FuncDemo/FuncDemo.pro Diff File
mod - samples/qt/FuncDemo/genproj.bat Diff File
mod - samples/qt/FuncDemo/msvc.bat Diff File
mod - samples/qt/FuncDemo/run.bat Diff File
mod - samples/qt/IESample/genproj.bat Diff File
mod - samples/qt/IESample/IESample.pro Diff File
mod - samples/qt/IESample/msvc.bat Diff File
mod - samples/qt/IESample/run.bat Diff File
mod - samples/qt/Interface/src/Translate.cxx Diff File
mod - samples/qt/Tutorial/genproj.bat Diff File
mod - samples/qt/Tutorial/msvc.bat Diff File
mod - samples/qt/Tutorial/run.bat Diff File
mod - samples/qt/Tutorial/Tutorial.pro Diff File
mod - samples/tcl/DataExchangeDemo.tcl Diff File
mod - src/DrawResources/DrawDefault Diff File
mod - src/DrawResources/DrawTK.tcl Diff File
mod - src/DrawResources/TestCommands.tcl Diff File
mod - src/DrawResources/TKTopTest.tcl Diff File
mod - src/OS/Visualization.tcl Diff File
mod - src/TKIVtkDraw/EXTERNLIB Diff File
mod - tests/bugs/begin Diff File
mod - tests/bugs/vis/bug26719_1 Diff File
mod - tests/demo/samples/anc101 Diff File
mod - tests/demo/samples/bottle Diff File
mod - tests/demo/samples/cad Diff File
mod - tests/demo/samples/cpu Diff File
mod - tests/demo/samples/cutter Diff File
mod - tests/demo/samples/dimensions Diff File
mod - tests/demo/samples/dimensionsglsl Diff File
mod - tests/demo/samples/drill Diff File
mod - tests/demo/samples/gehause Diff File
mod - tests/demo/samples/materials Diff File
mod - tests/demo/samples/pencil Diff File
mod - tests/demo/samples/penrose Diff File
mod - tests/demo/samples/raytrace Diff File
mod - tests/demo/samples/snowflake Diff File
mod - tests/demo/samples/xde Diff File
mod - tests/v3d/materials/bug24855 Diff File
mod - tests/v3d/materials/bug24872_1 Diff File
mod - tests/v3d/materials/bug24872_2 Diff File
mod - tests/xml/ocaf_xml/begin Diff File
mod - tests/xml/xcaf_xml/begin Diff File