0027176: Configuration, CMake - INSTALL_DIR is a common prefix for all other install...
authorski <ski@opencascade.com>
Fri, 18 Mar 2016 05:25:53 +0000 (08:25 +0300)
committerabv <abv@opencascade.com>
Fri, 18 Mar 2016 06:44:11 +0000 (09:44 +0300)
commit4b3541c68b96b544f601b7acb1c53f96ec5c8c33
tree55da8ddf346a5229fcd9a044b16f4371c7d11f33
parentcb492860f1ffe88334112e2a8f324f19abd67ad5
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".
154 files changed:
CMakeLists.txt
adm/cmake/3rdparty_macro.cmake
adm/cmake/freetype.cmake
adm/cmake/occt_macros.cmake
adm/cmake/occt_toolkit.cmake
adm/cmake/tbb.cmake
adm/cmake/tcl.cmake
adm/cmake/tk.cmake
adm/cmake/vardescr.cmake
adm/templates/DRAWEXE.vcxproj.user.in
adm/templates/custom.bat.main
adm/templates/custom.build.bat.in
adm/templates/custom.build.sh.in
adm/templates/custom.install.bat.in
adm/templates/custom.install.sh.in
adm/templates/draw.sh
adm/templates/env.bat
adm/templates/env.bat.in [moved from adm/templates/env.install.bat.in with 50% similarity]
adm/templates/env.build.bat.in [deleted file]
adm/templates/env.build.sh.in [deleted file]
adm/templates/env.samples.bat.in [new file with mode: 0644]
adm/templates/env.samples.sh.in [new file with mode: 0644]
adm/templates/env.sh
adm/templates/env.sh.in [moved from adm/templates/env.install.sh.in with 51% similarity]
adm/templates/msvc.bat
adm/templates/occt_toolkit.rc.in
adm/templates/sample.bat
adm/templates/template_dll.rc
dox/dev_guides/building/cmake/cmake.md
genconf.bat
samples/CSharp/OCCTProxy/OCCTProxy.vcproj
samples/CSharp/OCCTProxy/OCCTProxy.vcxproj
samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj
samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj
samples/CSharp/WPF_D3D/OCCViewer.cs
samples/CSharp/WPF_WinForms/OCCViewer.cs
samples/CSharp/WinForms/Form2.cs
samples/CSharp/msvc.bat
samples/CSharp/msvc_D3D.bat
samples/CSharp/run.bat
samples/mfc/standard/01_Geometry/CMakeLists.txt
samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
samples/mfc/standard/02_Modeling/CMakeLists.txt
samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
samples/mfc/standard/03_Viewer2d/CMakeLists.txt
samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
samples/mfc/standard/04_Viewer3d/CMakeLists.txt
samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
samples/mfc/standard/05_ImportExport/CMakeLists.txt
samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
samples/mfc/standard/06_Ocaf/CMakeLists.txt
samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
samples/mfc/standard/07_Triangulation/CMakeLists.txt
samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
samples/mfc/standard/08_HLR/CMakeLists.txt
samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
samples/mfc/standard/09_Animation/CMakeLists.txt
samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
samples/mfc/standard/09_Animation/src/AnimationDoc.cpp
samples/mfc/standard/10_Convert/CMakeLists.txt
samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
samples/mfc/standard/Common/ImportExport/ImportExport.cpp
samples/mfc/standard/Common/ImportExport/SaveSTEPDlg.cpp
samples/mfc/standard/mfcsample/CMakeLists.txt
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
samples/mfc/standard/msvc.bat
samples/mfc/standard/run.bat
samples/qt/Common/src/MDIWindow.cxx
samples/qt/FuncDemo/FuncDemo.pro
samples/qt/FuncDemo/genproj.bat
samples/qt/FuncDemo/msvc.bat
samples/qt/FuncDemo/run.bat
samples/qt/IESample/IESample.pro
samples/qt/IESample/genproj.bat
samples/qt/IESample/msvc.bat
samples/qt/IESample/run.bat
samples/qt/Interface/src/Translate.cxx
samples/qt/Tutorial/Tutorial.pro
samples/qt/Tutorial/genproj.bat
samples/qt/Tutorial/msvc.bat
samples/qt/Tutorial/run.bat
samples/tcl/DataExchangeDemo.tcl
src/DrawResources/DrawDefault
src/DrawResources/DrawTK.tcl
src/DrawResources/TKTopTest.tcl
src/DrawResources/TestCommands.tcl
src/OS/Visualization.tcl
src/TKIVtkDraw/EXTERNLIB
tests/bugs/begin
tests/bugs/vis/bug26719_1
tests/demo/samples/anc101
tests/demo/samples/bottle
tests/demo/samples/cad
tests/demo/samples/cpu
tests/demo/samples/cutter
tests/demo/samples/dimensions
tests/demo/samples/dimensionsglsl
tests/demo/samples/drill
tests/demo/samples/gehause
tests/demo/samples/materials
tests/demo/samples/pencil
tests/demo/samples/penrose
tests/demo/samples/raytrace
tests/demo/samples/snowflake
tests/demo/samples/xde
tests/v3d/materials/bug24855
tests/v3d/materials/bug24872_1
tests/v3d/materials/bug24872_2
tests/xml/ocaf_xml/begin
tests/xml/xcaf_xml/begin