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)
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

index 4798137..61f866d 100644 (file)
@@ -69,9 +69,42 @@ set (INSTALL_SAMPLES OFF CACHE BOOL "${INSTALL_SAMPLES_DESCR}")
 
 # install dir of the project
 if (NOT DEFINED INSTALL_DIR)
+  # set default install directory for Windows
+  if (WIN32)
+    set (CMAKE_INSTALL_PREFIX "C:/opencascade-${OCC_VERSION_STRING_EXT}")
+  endif()
   set (INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "${INSTALL_DIR_DESCR}")
 endif()
 
+# choose a variant of the layout of the install paths
+if (NOT INSTALL_DIR_LAYOUT)
+  if (WIN32)
+    set (INSTALL_DIR_LAYOUT "Windows" CACHE STRING "${INSTALL_DIR_LAYOUT_DESCR}" FORCE)
+  else()
+    set (INSTALL_DIR_LAYOUT "Unix" CACHE STRING "${INSTALL_DIR_LAYOUT_DESCR}" FORCE)
+  endif()
+  SET_PROPERTY(CACHE INSTALL_DIR_LAYOUT PROPERTY STRINGS Windows Unix)
+endif()
+
+# check INSTALL_DIR_LAYOUT changes and update INSTALL_DIR_* paths if necessary
+if (NOT DEFINED INSTALL_DIR_LAYOUT_PREV)
+  set (INSTALL_DIR_LAYOUT_PREV "${INSTALL_DIR_LAYOUT}" CACHE INTERNAL "" FORCE)
+elseif (NOT "${INSTALL_DIR_LAYOUT_PREV}" STREQUAL "${INSTALL_DIR_LAYOUT}")
+  set (INSTALL_DIR_LAYOUT_PREV "${INSTALL_DIR_LAYOUT}" CACHE INTERNAL "" FORCE)
+  # The structure of install folder should be reset due to changed layout
+  OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS ()
+
+  # Unset INSTALL_DIR_WITH_VERSION on windows
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Windows")
+    OCCT_CHECK_AND_UNSET (INSTALL_DIR_WITH_VERSION)
+  else()
+    if (NOT DEFINED INSTALL_DIR_WITH_VERSION)
+      set (INSTALL_DIR_WITH_VERSION OFF CACHE BOOL "${INSTALL_DIR_WITH_VERSION_DESCR}")
+    endif()
+  endif()
+endif()
+
+# check CMAKE_INSTALL_PREFIX changes and update INSTALL_DIR if necessary
 if (NOT DEFINED CMAKE_INSTALL_PREFIX_PREV)
   set (CMAKE_INSTALL_PREFIX_PREV "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "" FORCE)
 elseif (NOT "${CMAKE_INSTALL_PREFIX_PREV}" STREQUAL "${CMAKE_INSTALL_PREFIX}")
@@ -82,6 +115,7 @@ elseif (NOT "${CMAKE_INSTALL_PREFIX_PREV}" STREQUAL "${CMAKE_INSTALL_PREFIX}")
   set (INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "${INSTALL_DIR_DESCR}" FORCE)
 endif()
 
+# check INSTALL_DIR changes and update CMAKE_INSTALL_PREFIX if necessary
 if (NOT DEFINED INSTALL_DIR_PREV)
   set (INSTALL_DIR_PREV "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
 elseif (NOT "${INSTALL_DIR_PREV}" STREQUAL "${INSTALL_DIR}")
@@ -93,14 +127,17 @@ elseif (NOT "${INSTALL_DIR_PREV}" STREQUAL "${INSTALL_DIR}")
 
   # set CMAKE_INSTALL_PREFIX_PREV to avoid the reset of structure of the install folder 
   set (CMAKE_INSTALL_PREFIX_PREV "${INSTALL_DIR}" CACHE INTERNAL "" FORCE)
+endif()
 
-  # The structure of install folder should be reset
-  OCCT_CHECK_AND_UNSET (INSTALL_BIN_DIR)
-  OCCT_CHECK_AND_UNSET (INSTALL_SCRIPT_DIR)
-  OCCT_CHECK_AND_UNSET (INSTALL_LIB_DIR)
-  OCCT_CHECK_AND_UNSET (INSTALL_INCLUDE_DIR)
-  OCCT_CHECK_AND_UNSET (INSTALL_OCCT_RESOURCE_DIR)
-  OCCT_CHECK_AND_UNSET (INSTALL_SHARE_DIR)
+if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+  if (NOT DEFINED INSTALL_DIR_WITH_VERSION_PREV)
+    set (INSTALL_DIR_WITH_VERSION_PREV "${INSTALL_DIR_WITH_VERSION}" CACHE INTERNAL "" FORCE)
+  elseif (NOT "${INSTALL_DIR_WITH_VERSION_PREV}" STREQUAL "${INSTALL_DIR_WITH_VERSION}")
+    # INSTALL_DIR_WITH_VERSION has been changed at previous step
+    set (INSTALL_DIR_WITH_VERSION_PREV "${INSTALL_DIR_WITH_VERSION}" CACHE INTERNAL "" FORCE)
+
+    OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS ()
+  endif()
 endif()
 
 # hide CMAKE_INSTALL_PREFIX from a user
@@ -117,67 +154,117 @@ endif()
 OCCT_MAKE_OS_WITH_BITNESS()
 OCCT_MAKE_COMPILER_SHORT_NAME()
 
-# do not define INSTALL_BIN_DIR for win. 
+# do not define INSTALL_DIR_BIN for win.
 # Leave library structure for win: <prefix>/win64/vc10/bin(d)
-if (NOT DEFINED INSTALL_BIN_DIR)
-  if (UNIX)
-    set (INSTALL_BIN_DIR "${INSTALL_DIR}/bin" CACHE PATH "${INSTALL_BIN_DIR_DESCR}")
+if (NOT DEFINED INSTALL_DIR_BIN)
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+    set (INSTALL_DIR_BIN "bin" CACHE PATH "${INSTALL_DIR_BIN_DESCR}")
   else()
-    if (SINGLE_GENERATOR)
-      set (INSTALL_BIN_DIR "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BIN_LETTER}" CACHE PATH "${INSTALL_BIN_DIR_DESCR}")
-    endif()
+    set (INSTALL_DIR_BIN "${OS_WITH_BIT}/${COMPILER}/bin" CACHE PATH "${INSTALL_DIR_BIN_DESCR}")
   endif()
 endif()
 
 # define folder contaning all shell/batch scripts
-if (NOT DEFINED INSTALL_SCRIPT_DIR)
-  if (UNIX)
-    set (INSTALL_SCRIPT_DIR "${INSTALL_BIN_DIR}/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_SCRIPT_DIR_DESCR}")
+if (NOT DEFINED INSTALL_DIR_SCRIPT)
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+    set (INSTALL_DIR_SCRIPT "${INSTALL_DIR_BIN}" CACHE PATH "${INSTALL_DIR_SCRIPT_DESCR}")
   else()
-    set (INSTALL_SCRIPT_DIR "${INSTALL_DIR}" CACHE PATH "${INSTALL_SCRIPT_DIR_DESCR}")
+    set (INSTALL_DIR_SCRIPT "." CACHE PATH "${INSTALL_DIR_SCRIPT_DESCR}")
   endif()
 endif()
 
 # place the libraries to <prefix>/lib folder for unix and leave old structure for windows
-if (NOT DEFINED INSTALL_LIB_DIR)
-  if (UNIX)
-    set (INSTALL_LIB_DIR "${INSTALL_DIR}/lib" CACHE PATH "${INSTALL_LIB_DIR_DESCR}")
+if (NOT DEFINED INSTALL_DIR_LIB)
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+    set (INSTALL_DIR_LIB "lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
   else()
-    if (SINGLE_GENERATOR)
-      set (INSTALL_LIB_DIR "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BIN_LETTER}" CACHE PATH "${INSTALL_LIB_DIR_DESCR}")
-    endif()
+    set (INSTALL_DIR_LIB "${OS_WITH_BIT}/${COMPILER}/lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
   endif()
 endif()
 
 # OCCT headers: <prefix>/inc for windows,
 #               <prefix>/include/opencascade-7.0.0 for unix
-if (NOT DEFINED INSTALL_INCLUDE_DIR)
-  if (UNIX)
-    set (INSTALL_INCLUDE_DIR "${INSTALL_DIR}/include/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_INCLUDE_DIR_DESCR}")
+if (NOT DEFINED INSTALL_DIR_INCLUDE)
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+    set (INSTALL_DIR_INCLUDE "include/opencascade" CACHE PATH "${INSTALL_DIR_INCLUDE_DESCR}")
+    if (INSTALL_DIR_WITH_VERSION)
+      set (INSTALL_DIR_INCLUDE "include/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_INCLUDE_DESCR}" FORCE)
+    endif()
   else()
-    set (INSTALL_INCLUDE_DIR "${INSTALL_DIR}/inc" CACHE PATH "${INSTALL_INCLUDE_DIR_DESCR}")
+    set (INSTALL_DIR_INCLUDE "inc" CACHE PATH "${INSTALL_DIR_INCLUDE_DESCR}")
   endif()
 endif()
 
 # OCCT resources: <prefix>/src for windows,
 #                 <prefix>/share/opencascade-7.0.0/resources for unix
-if (NOT DEFINED INSTALL_OCCT_RESOURCE_DIR)
-  if (UNIX)
-    set (INSTALL_OCCT_RESOURCE_DIR "${INSTALL_DIR}/share/opencascade-${OCC_VERSION_STRING_EXT}/resources" CACHE PATH "${INSTALL_OCCT_RESOURCE_DIR_DESCR}")
+if (NOT DEFINED INSTALL_DIR_RESOURCE)
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+    set (INSTALL_DIR_RESOURCE "share/opencascade/resources" CACHE PATH "${INSTALL_DIR_RESOURCE_DESCR}")
+    if (INSTALL_DIR_WITH_VERSION)
+      set (INSTALL_DIR_RESOURCE "share/opencascade-${OCC_VERSION_STRING_EXT}/resources" CACHE PATH "${INSTALL_DIR_RESOURCE_DESCR}" FORCE)
+    endif()
   else()
-    set (INSTALL_OCCT_RESOURCE_DIR "${INSTALL_DIR}/src" CACHE PATH "${INSTALL_OCCT_RESOURCE_DIR_DESCR}")
+    set (INSTALL_DIR_RESOURCE "src" CACHE PATH "${INSTALL_DIR_RESOURCE_DESCR}")
   endif()
 endif()
 
 # OCCT data
-if (NOT DEFINED INSTALL_SHARE_DIR)
-  if (UNIX)
-    set (INSTALL_SHARE_DIR "${INSTALL_DIR}/share/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_SHARE_DIR_DESCR}")
+if (NOT DEFINED INSTALL_DIR_DATA)
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+    set (INSTALL_DIR_DATA "share/opencascade/data" CACHE PATH "${INSTALL_DIR_DATA_DESCR}")
+    if (INSTALL_DIR_WITH_VERSION)
+      set (INSTALL_DIR_DATA "share/opencascade-${OCC_VERSION_STRING_EXT}/data" CACHE PATH "${INSTALL_DIR_DATA_DESCR}" FORCE)
+    endif()
+  else()
+    set (INSTALL_DIR_DATA "data" CACHE PATH "${INSTALL_DIR_DATA_DESCR}")
+  endif()
+endif()
+
+# OCCT samples
+if (NOT DEFINED INSTALL_DIR_SAMPLES)
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+    set (INSTALL_DIR_SAMPLES "share/opencascade/samples" CACHE PATH "${INSTALL_DIR_SAMPLES_DESCR}")
+    if (INSTALL_DIR_WITH_VERSION)
+      set (INSTALL_DIR_SAMPLES "share/opencascade-${OCC_VERSION_STRING_EXT}/samples" CACHE PATH "${INSTALL_DIR_SAMPLES_DESCR}" FORCE)
+    endif()
+  else()
+    set (INSTALL_DIR_SAMPLES "samples" CACHE PATH "${INSTALL_DIR_SAMPLES_DESCR}")
+  endif()
+endif()
+
+# OCCT tests
+if (NOT DEFINED INSTALL_DIR_TESTS)
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+    set (INSTALL_DIR_TESTS "share/opencascade/tests" CACHE PATH "${INSTALL_DIR_TESTS_DESCR}")
+    if (INSTALL_DIR_WITH_VERSION)
+      set (INSTALL_DIR_TESTS "share/opencascade-${OCC_VERSION_STRING_EXT}/tests" CACHE PATH "${INSTALL_DIR_TESTS_DESCR}" FORCE)
+    endif()
+  else()
+    set (INSTALL_DIR_TESTS "tests" CACHE PATH "${INSTALL_DIR_TESTS_DESCR}")
+  endif()
+endif()
+
+# OCCT doc
+if (NOT DEFINED INSTALL_DIR_DOC)
+  if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+    set (INSTALL_DIR_DOC "share/doc/opencascade" CACHE PATH "${INSTALL_DIR_DOC_DESCR}")
+    if (INSTALL_DIR_WITH_VERSION)
+      set (INSTALL_DIR_DOC "share/doc/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_DOC_DESCR}" FORCE)
+    endif()
   else()
-    set (INSTALL_SHARE_DIR "${INSTALL_DIR}" CACHE PATH "${INSTALL_SHARE_DIR_DESCR}")
+    set (INSTALL_DIR_DOC "doc" CACHE PATH "${INSTALL_DIR_DOC_DESCR}")
   endif()
 endif()
 
+# install LICENSE_LGPL_21.txt and OCCT_LGPL_EXCEPTION.txt files
+if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
+  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" "${INSTALL_DIR}/${INSTALL_DIR_DOC}")
+  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" "${INSTALL_DIR}/${INSTALL_DIR_DOC}")
+else()
+  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" "${INSTALL_DIR}")
+  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" "${INSTALL_DIR}")
+endif()
+
 # a directory recognized as a 'patch' for OCCT
 set (BUILD_PATCH "" CACHE PATH "${BUILD_PATCH_DESCR}")
 
@@ -186,7 +273,7 @@ set (BUILD_ADDITIONAL_TOOLKITS "" CACHE STRING "${BUILD_ADDITIONAL_TOOLKITS_DESC
 separate_arguments (BUILD_ADDITIONAL_TOOLKITS)
 
 if (MSVC)
-  set (BUILD_MODULE_OcctMfcSamples OFF CACHE BOOL "${BUILD_MODULE_OcctMfcSamples_DESCR}")
+  set (BUILD_MODULE_MfcSamples OFF CACHE BOOL "${BUILD_MODULE_MfcSamples_DESCR}")
 endif()
 
 # whether use optional 3rdparty or not
@@ -213,7 +300,7 @@ if (ANDROID AND BUILD_MODULE_Draw)
 endif()
 
 # Overview
-set (BUILD_DOC_OcctOverview OFF CACHE BOOL "${BUILD_DOC_OcctOverview_DESCR}")
+set (BUILD_DOC_Overview OFF CACHE BOOL "${BUILD_DOC_Overview_DESCR}")
 
 if (NOT USE_D3D)
   list (REMOVE_ITEM Visualization_TOOLKITS TKD3DHost)
@@ -410,23 +497,23 @@ else()
 endif()
 
 # Doxygen
-if (BUILD_DOC_OcctOverview)
-  if (NOT DEFINED INSTALL_DOC_OcctOverview)
-    set (INSTALL_DOC_OcctOverview OFF CACHE BOOL "${INSTALL_DOC_OcctOverview_DESCR}")
+if (BUILD_DOC_Overview)
+  if (NOT DEFINED INSTALL_DOC_Overview)
+    set (INSTALL_DOC_Overview OFF CACHE BOOL "${INSTALL_DOC_Overview_DESCR}")
   endif()
 
-  if (INSTALL_DOC_OcctOverview)
-    install (DIRECTORY "${CMAKE_BINARY_DIR}/doc/overview" DESTINATION  "${INSTALL_SHARE_DIR}/doc")
+  if (INSTALL_DOC_Overview)
+    install (DIRECTORY "${CMAKE_BINARY_DIR}/doc/overview" DESTINATION  "${INSTALL_DIR}/${INSTALL_DIR_DOC}")
 
     # create overview.html only for windows
-    if (WIN32)
-      OCCT_INSTALL_FILE_OR_DIR ("dox/resources/overview.html" "${INSTALL_SCRIPT_DIR}")
+    if (WIN32 AND "${INSTALL_DIR_LAYOUT}" STREQUAL "Windows")
+      OCCT_INSTALL_FILE_OR_DIR ("dox/resources/overview.html" "${INSTALL_DIR}/${INSTALL_DIR_DOC}/..")
     endif()
   endif()
 
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/doxygen")
 else()
-  OCCT_CHECK_AND_UNSET ("INSTALL_DOC_OcctOverview")
+  OCCT_CHECK_AND_UNSET ("INSTALL_DOC_Overview")
 
   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOXYGEN_EXECUTABLE")
   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
@@ -471,6 +558,15 @@ if (3RDPARTY_LIBRARY_DIRS)
 endif()
 
 # build directories
+if (SINGLE_GENERATOR)
+  set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BIN_LETTER}")
+  set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BIN_LETTER}")
+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BIN_LETTER}")
+  if (WIN32)
+    set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BIN_LETTER}")
+  endif()
+endif()
+
 set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
@@ -498,38 +594,46 @@ COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}"
 string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
 message (STATUS "Info: \(${CURRENT_TIME}\) End the collecting")
 
-OCCT_INSTALL_FILE_OR_DIR ("data" "${INSTALL_SHARE_DIR}")
+OCCT_INSTALL_FILE_OR_DIR ("data/" "${INSTALL_DIR}/${INSTALL_DIR_DATA}")
+
+if (WIN32)
+  set (SCRIPT_EXT bat)
+else()
+  set (SCRIPT_EXT sh)
+endif()
 
 # OCCT samples
 if (INSTALL_SAMPLES)
+  OCCT_CONFIGURE ("adm/templates/env.samples.${SCRIPT_EXT}.in" "env.samples.${SCRIPT_EXT}")
   if (WIN32)
-    OCCT_INSTALL_FILE_OR_DIR ("samples/CSharp" "${INSTALL_SHARE_DIR}/samples")
-    OCCT_INSTALL_FILE_OR_DIR ("samples/mfc" "${INSTALL_SHARE_DIR}/samples")   
+    OCCT_INSTALL_FILE_OR_DIR ("samples/CSharp" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+    OCCT_INSTALL_FILE_OR_DIR ("samples/mfc" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+
+    install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/CSharp" RENAME "env.${SCRIPT_EXT}")
+    install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/mfc/standard" RENAME "env.${SCRIPT_EXT}")
   endif()
-  
-  OCCT_INSTALL_FILE_OR_DIR ("samples/java" "${INSTALL_SHARE_DIR}/samples")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/ocafsamples" "${INSTALL_SHARE_DIR}/samples")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/qt" "${INSTALL_SHARE_DIR}/samples")
-endif()
 
-OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_SHARE_DIR}/samples")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/java" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/ocafsamples" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
 
-if (INSTALL_TEST_CASES)
-  OCCT_INSTALL_FILE_OR_DIR ("tests" "${INSTALL_SHARE_DIR}")
+  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/qt/FuncDemo" RENAME "env.${SCRIPT_EXT}")
+  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/qt/IESample" RENAME "env.${SCRIPT_EXT}")
+  install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/qt/Tutorial" RENAME "env.${SCRIPT_EXT}")
 endif()
 
-if (WIN32)
-  set (SCRIPT_EXT bat)
-else()
-  set (SCRIPT_EXT sh)
+OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+
+if (INSTALL_TEST_CASES)
+  OCCT_INSTALL_FILE_OR_DIR ("tests/" "${INSTALL_DIR}/${INSTALL_DIR_TESTS}")
 endif()
 
 # copy draw script to install script folder
 if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}")
-  install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_SCRIPT_DIR}"
+  install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}"
           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 else()
-  install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_SCRIPT_DIR}"
+  install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}"
           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 endif()
 
@@ -539,63 +643,39 @@ OCCT_COPY_FILE_OR_DIR ("adm/templates/draw.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}")
 set (SUB_CUSTOM_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.${SCRIPT_EXT}")
 
 if (WIN32)
-  set (ADDITIONAL_CUSTOM_CONTENT "\nif exist \"%~dp0${SUB_CUSTOM_NAME}\" (\n  call \"%~dp0${SUB_CUSTOM_NAME}\" %VCVER% %ARCH% %CASDEB% \n)")
+  set (ADDITIONAL_CUSTOM_CONTENT "\nif exist \"%~dp0${SUB_CUSTOM_NAME}\" (\n  call \"%~dp0${SUB_CUSTOM_NAME}\" %1 %2 %3 \n)")
 else()
   set (ADDITIONAL_CUSTOM_CONTENT "\nif [ -e \"\${aScriptPath}/${SUB_CUSTOM_NAME}\" ]; then\n  source \"\${aScriptPath}/${SUB_CUSTOM_NAME}\" \"\$1\" \"\$2\" \nfi")
 endif()
 
  # change custom.bat/sh
-if (EXISTS "${INSTALL_BIN_DIR}/custom.${SCRIPT_EXT}")
-  file (READ "${INSTALL_BIN_DIR}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
+if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
+  file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
 
   set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
 
-  file (WRITE "${INSTALL_BIN_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
+  file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
 else()
-  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_SCRIPT_DIR}")
+  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
 endif()
 
 # write current custom.bat/sh (for install directory)
 set (SUB_CUSTOM_BUILD_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.install.${SCRIPT_EXT}")
-OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_SCRIPT_DIR}")
+OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
 
 # write current custom.bat/sh (for build directory)
 OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}")
 
-if (BUILD_MODULE_OcctMfcSamples)
-  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_SCRIPT_DIR}")
+if (BUILD_MODULE_MfcSamples)
+  OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
   OCCT_COPY_FILE_OR_DIR    ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
 endif()
 
 # env script for draw in building environment
-OCCT_CONFIGURE ("adm/templates/env.build.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
+OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
 
-# end script for draw in standalone environment
-if (UNIX)
-  OCCT_CONFIGURE ("adm/templates/env.install.sh.in" "env.install.sh")
-  install (FILES "${CMAKE_BINARY_DIR}/env.install.sh" DESTINATION  "${INSTALL_SCRIPT_DIR}" RENAME "env.sh")
-else()
-  # release version
-  set (CURRENT_BUILD_LETTER "")
-  OCCT_CONFIGURE ("adm/templates/env.install.bat.in" "env.install.release.bat")
-  install (FILES "${CMAKE_BINARY_DIR}/env.install.release.bat" 
-           CONFIGURATIONS Release
-           DESTINATION  "${INSTALL_SCRIPT_DIR}" RENAME "env.bat")
-
-  # debug version
-  set (CURRENT_BUILD_LETTER "d")
-  OCCT_CONFIGURE ("adm/templates/env.install.bat.in" "env.install.debug.bat")
-  install (FILES "${CMAKE_BINARY_DIR}/env.install.debug.bat" 
-           CONFIGURATIONS Debug
-           DESTINATION  "${INSTALL_SCRIPT_DIR}" RENAME "env.bat")
-
-  # release with debug info version
-  set (CURRENT_BUILD_LETTER "i")
-  OCCT_CONFIGURE ("adm/templates/env.install.bat.in" "env.install.relwithdebinfo.bat")
-  install (FILES "${CMAKE_BINARY_DIR}/env.install.relwithdebinfo.bat" 
-           CONFIGURATIONS RelWithDebInfo
-           DESTINATION  "${INSTALL_SCRIPT_DIR}" RENAME "env.bat")
-endif()
+# install env script
+install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}")
 
 # copy DrawAppliInit from OCCT source to build directory
 if (NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
@@ -608,9 +688,9 @@ foreach(RESOURCE ${RESOURCES})
   get_filename_component(RESOURCE_FOLDER ${RESOURCE} DIRECTORY)
   if(NOT "${RESOURCE_FOLDER}" STREQUAL "")
     get_filename_component(RESOURCE_FOLDER ${RESOURCE_FOLDER} NAME)
-    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_OCCT_RESOURCE_DIR}/${RESOURCE_FOLDER}")
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/${INSTALL_DIR_RESOURCE}/${RESOURCE_FOLDER}")
   else()
-    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_OCCT_RESOURCE_DIR}")
+    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR}/${INSTALL_DIR_RESOURCE}")
   endif()
 endforeach()
 
@@ -622,7 +702,7 @@ foreach (BUILD_TOOLKIT ${BUILD_TOOLKITS})
   OCCT_ADD_SUBDIRECTORY ("src/${BUILD_TOOLKIT}")
 endforeach()
 
-if (BUILD_DOC_OcctOverview)
+if (BUILD_DOC_Overview)
   OCCT_ADD_SUBDIRECTORY (dox)
 endif()
 
@@ -648,7 +728,7 @@ if (MSVC AND 3RDPARTY_DLL_DIRS)
 endif()
 
 # samples do not support patch usage
-if (BUILD_MODULE_OcctMfcSamples)
+if (BUILD_MODULE_MfcSamples)
   set (OCCT_ROOT ${CMAKE_SOURCE_DIR})
 
   set (MFC_STANDARD_SAMPLES_DIR ${OCCT_ROOT}/samples/mfc/standard)
index 4725b44..887c343 100644 (file)
@@ -191,18 +191,18 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
     OCCT_MAKE_COMPILER_SHORT_NAME()
 
     if (WIN32)
-      if (DEFINED INSTALL_BIN_DIR)
-        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" DESTINATION "${INSTALL_BIN_DIR}")
+      if (SINGLE_GENERATOR)
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
       else()
-        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}"
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}"
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
-        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" 
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
+        install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}"
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
       endif()
     else()
       get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} REALPATH)
@@ -210,20 +210,20 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
       if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
         get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
 
-        if (DEFINED INSTALL_LIB_DIR)
-          install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_LIB_DIR}" RENAME ${FREEIMLIB}.3)
+        if (SINGLE_GENERATOR)
+          install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}" RENAME ${FREEIMLIB}.3)
         else()
           install (FILES "${ABS_PATH}"
                    CONFIGURATIONS Release
-                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                   DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
                    RENAME ${FREEIMLIB}.3)
           install (FILES "${ABS_PATH}"
                    CONFIGURATIONS RelWithDebInfo
-                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+                   DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i"
                    RENAME ${FREEIMLIB}.3)
           install (FILES "${ABS_PATH}"
                    CONFIGURATIONS Debug
-                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+                   DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
                    RENAME ${FREEIMLIB}.3)
         endif()
       endif()
@@ -231,20 +231,20 @@ macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME LIBRARY_NAME_DEB
       if("${PRODUCT_NAME}" STREQUAL "GL2PS")
         get_filename_component(GL2PSLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
 
-        if (DEFINED INSTALL_LIB_DIR)
-          install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_LIB_DIR}" RENAME ${GL2PSLIB}.1)
+        if (SINGLE_GENERATOR)
+          install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}" RENAME ${GL2PSLIB}.1)
         else()
           install (FILES "${ABS_PATH}"
                    CONFIGURATIONS Release
-                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                   DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
                    RENAME ${GL2PSLIB}.1)
           install (FILES "${ABS_PATH}"
                    CONFIGURATIONS RelWithDebInfo
-                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+                   DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i"
                    RENAME ${GL2PSLIB}.1)
           install (FILES "${ABS_PATH}"
                    CONFIGURATIONS Debug
-                   DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+                   DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
                    RENAME ${GL2PSLIB}.1)
         endif()
       endif()
index 8adb739..865caf6 100644 (file)
@@ -292,39 +292,39 @@ if (INSTALL_FREETYPE)
   OCCT_MAKE_OS_WITH_BITNESS()
 
   if (WIN32)
-    if (DEFINED INSTALL_BIN_DIR)
-      install (FILES "${3RDPARTY_FREETYPE_DLL}" DESTINATION "${INSTALL_BIN_DIR}")
+    if (SINGLE_GENERATOR)
+      install (FILES "${3RDPARTY_FREETYPE_DLL}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
     else()
       install (FILES "${3RDPARTY_FREETYPE_DLL}"
                CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
       install (FILES "${3RDPARTY_FREETYPE_DLL}"
                CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
       install (FILES "${3RDPARTY_FREETYPE_DLL}"
                CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
     endif()
   else()
     get_filename_component(3RDPARTY_FREETYPE_LIBRARY_ABS ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
     get_filename_component(3RDPARTY_FREETYPE_LIBRARY_NAME ${3RDPARTY_FREETYPE_LIBRARY} NAME)
 
-    if (DEFINED INSTALL_LIB_DIR)
+    if (SINGLE_GENERATOR)
       install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-               DESTINATION "${INSTALL_LIB_DIR}"
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
                RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
     else()
       install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
                CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
                RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
       install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
                CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i"
                RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
       install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
                CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
                RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
     endif()
   endif()
index f352096..03b778a 100644 (file)
@@ -26,6 +26,18 @@ macro (OCCT_CHECK_AND_UNSET_GROUP VARNAME)
   endif()
 endmacro()
 
+macro (OCCT_CHECK_AND_UNSET_INSTALL_DIR_SUBDIRS)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_BIN)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_SCRIPT)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_LIB)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_INCLUDE)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_RESOURCE)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_DATA)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_SAMPLES)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_TESTS)
+  OCCT_CHECK_AND_UNSET (INSTALL_DIR_DOC)
+endmacro()
+
 # COMPILER_BITNESS variable
 macro (OCCT_MAKE_COMPILER_BITNESS)
   math (EXPR COMPILER_BITNESS "32 + 32*(${CMAKE_SIZEOF_VOID_P}/8)")
@@ -287,7 +299,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOO
     configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
   endforeach()
   
-  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_INCLUDE_DIR}")
+  install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_INCLUDE}")
   
   string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
   message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
index e98b4b0..b721e4c 100644 (file)
@@ -130,48 +130,48 @@ endif()
 if ("${PROJECT_NAME}" STREQUAL "DRAWEXE")
   add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})
 
-  if (DEFINED INSTALL_BIN_DIR)
-    install (TARGETS ${PROJECT_NAME} DESTINATION "${INSTALL_BIN_DIR}")
+  if (SINGLE_GENERATOR)
+    install (TARGETS ${PROJECT_NAME} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
   else()
     install (TARGETS ${PROJECT_NAME}
              CONFIGURATIONS Release
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+             DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
     install (TARGETS ${PROJECT_NAME}
              CONFIGURATIONS RelWithDebInfo
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+             DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
     install (TARGETS ${PROJECT_NAME}
              CONFIGURATIONS Debug
-             DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+             DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
   endif()
 else()
   add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE})
 
-  if (DEFINED INSTALL_LIB_DIR)
+  if (SINGLE_GENERATOR)
     install (TARGETS ${PROJECT_NAME}
-             RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-             ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-             LIBRARY DESTINATION "${INSTALL_LIB_DIR}") 
+             RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
   else()
     install (TARGETS ${PROJECT_NAME}
              CONFIGURATIONS Release
-             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin"
-             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+             RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
     install (TARGETS ${PROJECT_NAME}
              CONFIGURATIONS RelWithDebInfo
-             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini"
-             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
+             RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i")
     install (TARGETS ${PROJECT_NAME}
              CONFIGURATIONS Debug
-             RUNTIME DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind"
-             ARCHIVE DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-             LIBRARY DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+             RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d"
+             ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
+             LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d")
 
     if (MSVC)
       install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind/${PROJECT_NAME}.pdb
                CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
     endif()
   endif()
 endif()
index 7bcde73..aba4a10 100644 (file)
@@ -236,38 +236,38 @@ macro (TBB_PRODUCT_SEARCH PRODUCT_NAME)
     OCCT_MAKE_COMPILER_SHORT_NAME()
 
     if (WIN32)
-      if (DEFINED INSTALL_BIN_DIR)
-        install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL} DESTINATION "${INSTALL_BIN_DIR}")
+      if (SINGLE_GENERATOR)
+        install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
       else()
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_DLL}
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
       endif()
     else()
       get_filename_component (PRODUCT_LIBRARY_NAME ${3RDPARTY_${PRODUCT_NAME}_LIBRARY} NAME)
 
-      if (DEFINED INSTALL_LIB_DIR)
+      if (SINGLE_GENERATOR)
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
-                 DESTINATION "${INSTALL_LIB_DIR}"
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
                  RENAME ${PRODUCT_LIBRARY_NAME}.2)
       else()
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
                  CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
                  RENAME ${PRODUCT_LIBRARY_NAME}.2)
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
                  CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i"
                  RENAME ${PRODUCT_LIBRARY_NAME}.2)
         install (FILES ${3RDPARTY_${PRODUCT_NAME}_LIBRARY}.2
                  CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+                 DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
                  RENAME ${PRODUCT_LIBRARY_NAME}.2)
       endif()
     endif()
index 8d9ff9c..08df381 100644 (file)
@@ -204,46 +204,41 @@ if (INSTALL_TCL)
     # collect and install all dlls from tcl dll dirs
     file (GLOB TCL_DLLS "${3RDPARTY_TCL_DLL_DIR}/*.dll")
 
-    if (DEFINED INSTALL_BIN_DIR)
-      install (FILES ${TCL_DLLS} DESTINATION "${INSTALL_BIN_DIR}")
+    if (SINGLE_GENERATOR)
+      install (FILES ${TCL_DLLS} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
     else()
       install (FILES ${TCL_DLLS}
                CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
       install (FILES ${TCL_DLLS}
                CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
       install (FILES ${TCL_DLLS}
                CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
     endif()
   else()
     get_filename_component(3RDPARTY_TCL_LIBRARY_REALPATH ${3RDPARTY_TCL_LIBRARY} REALPATH)
 
-    if (DEFINED INSTALL_LIB_DIR)
-      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH} DESTINATION "${INSTALL_LIB_DIR}")
+    if (SINGLE_GENERATOR)
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
     else()
       install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
                CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
       install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
                CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}i")
       install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
                CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d")
     endif()
   endif()
 
   if (TCL_TCLSH_VERSION)
     # tcl is required to install in lib folder (without)
-    if (DEFINED INSTALL_LIB_DIR)
-      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_LIB_DIR}")
-      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_LIB_DIR}")
-    else()
-      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-      install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-    endif()
+    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
+    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
   else()
     message (STATUS "\nWarning: tclX.X subdir won't be copyied during the installation process.")
     message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
index d0343dc..04b12b9 100644 (file)
@@ -208,44 +208,40 @@ if (INSTALL_TK)
     # collect and install all dlls from tk dll dirs
     file (GLOB TK_DLLS  "${3RDPARTY_TK_DLL_DIR}/*.dll")
 
-    if (DEFINED INSTALL_BIN_DIR)
-      install (FILES ${TK_DLLS} DESTINATION "${INSTALL_BIN_DIR}")
+    if (SINGLE_GENERATOR)
+      install (FILES ${TK_DLLS} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
     else()
       install (FILES ${TK_DLLS}
                CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
       install (FILES ${TK_DLLS}
                CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}i")
       install (FILES ${TK_DLLS}
                CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
     endif()
   else()
     get_filename_component(3RDPARTY_TK_LIBRARY_REALPATH ${3RDPARTY_TK_LIBRARY} REALPATH)
 
-    if (DEFINED INSTALL_LIB_DIR)
-      install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH} DESTINATION "${INSTALL_LIB_DIR}")
+    if (SINGLE_GENERATOR)
+      install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
     else()
       install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
                CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}/")
       install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
                CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}/i")
       install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
                CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
+               DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d")
     endif()
   endif()
 
   if (TCL_TCLSH_VERSION)
     # tk is required to install in lib folder (without)
-    if (DEFINED INSTALL_LIB_DIR)
-      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_LIB_DIR}")
-    else()
-      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-    endif()
+    install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
   else()
     message (STATUS "\nWarning: tkX.X subdir won't be copyied during the installation process.")
     message (STATUS "Try seeking tk within another folder by changing 3RDPARTY_TK_DIR variable.")
index 9a0c7fa..c3cd822 100644 (file)
@@ -28,6 +28,33 @@ set (INSTALL_DIR_DESCR
 samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_GL2PS, INSTALL_TBB and
 other similar variables) will be placed during the installation process (building INSTALL project)")
 
+set (INSTALL_DIR_WITH_VERSION_DESCR
+"Use OCCT version number as suffix for names of directories")
+
+set (INSTALL_DIR_LAYOUT_DESCR
+"Defines structure of OCCT files (binaries, resources, headers etc.) for the install directory.
+Two variants are predefined: for Windows (standard OCCT layout) and for Unix operating systems (standard Linux layout).
+If needed, layout can be customized with INSTALL_DIR_* variables.")
+
+set (INSTALL_DIR_BIN_DESCR 
+"Subdirectory of INSTALL_DIR where binaries will be installed")
+set (INSTALL_DIR_INCLUDE_DESCR 
+"Subdirectory of INSTALL_DIR where OCCT headers will be installed")
+set (INSTALL_DIR_DATA_DESCR 
+"Subdirectory of INSTALL_DIR where sample data files will be installed")
+set (INSTALL_DIR_DOC_DESCR 
+"Subdirectory of INSTALL_DIR where documentation will be installed")
+set (INSTALL_DIR_LIB_DESCR 
+"Subdirectory of INSTALL_DIR where libraries (.so on Linux, .lib on Windows) will be installed")
+set (INSTALL_DIR_RESOURCE_DESCR 
+"Subdirectory of INSTALL_DIR where OCCT resource files will be installed")
+set (INSTALL_DIR_SAMPLES_DESCR 
+"Subdirectory of INSTALL_DIR where samples will be installed")
+set (INSTALL_DIR_TESTS_DESCR 
+"Subdirectory of INSTALL_DIR where test scripts will be installed")
+set (INSTALL_DIR_SCRIPT_DESCR 
+"Subdirectory of INSTALL_DIR where scripts will be installed")
+
 macro (INSTALL_MESSAGE INSTALL_TARGET_VARIABLE INSTALL_TARGET_STRING)
 set (${INSTALL_TARGET_VARIABLE}_DESCR
 "Indicates whether ${INSTALL_TARGET_STRING} should be installed (building INSTALL
@@ -36,7 +63,7 @@ endmacro()
 
 INSTALL_MESSAGE (INSTALL_SAMPLES          "OCCT samples")
 INSTALL_MESSAGE (INSTALL_TEST_CASES       "non-regression OCCT test scripts")
-INSTALL_MESSAGE (INSTALL_DOC_OcctOverview "OCCT overview documentation (HTML format)")
+INSTALL_MESSAGE (INSTALL_DOC_Overview     "OCCT overview documentation (HTML format)")
 INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
 INSTALL_MESSAGE (INSTALL_FREEIMAGEPLUS    "FreeImagePlus binaries")
 INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
@@ -44,6 +71,7 @@ INSTALL_MESSAGE (INSTALL_GL2PS            "GL2PS binaries")
 INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
 INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
 INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
+
 #INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
 
 # build variables
@@ -69,17 +97,17 @@ want to build some particular libraries (toolkits) only, then you may uncheck
 all modules in the corresponding BUILD_MODUE_* options and provide the list of
 necessary libraries here. Of course, all dependencies will be resolved automatically")
 
-set (BUILD_MODULE_OcctMfcSamples_DESCR
+set (BUILD_MODULE_MfcSamples_DESCR
 "Indicates whether OCCT MFC samples should be built together with OCCT.
 These samples show some possibilities of using OCCT and they can be executed
 with script samples.bat from the installation directory (INSTALL_DIR)")
 
-set (BUILD_DOC_OcctOverview_DESCR
+set (BUILD_DOC_Overview_DESCR
 "Indicates whether OCCT overview documentation project (Markdown format) should be
 created together with OCCT. It is not built together with OCCT. Checking this options
 leads to automatic search of Doxygen binaries. Building of it will be call Doxygen command
 to generate the documentation in HTML format. The documentation will be available in the
-installation directory (overview.bat script) if INSTALL_DOC_OcctOverview variable is checked")
+installation directory (overview.bat script) if INSTALL_DOC_Overview variable is checked")
 
 set (3RDPARTY_DIR_DESCR
 "The root directory where all required 3-rd party products will be searched. If a
index 7e02dda..f7fa9cd 100644 (file)
@@ -1,21 +1,36 @@
 \feff<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@X_COMPILER_BITNESS@'">
- <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
+  <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
+CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src
+CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
+CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples
+CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests
+CSF_OCCTDocPath=@CMAKE_SOURCE_DIR@/doc
 PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
  </LocalDebuggerEnvironment>
  <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
  <LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|@X_COMPILER_BITNESS@'">
- <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
+  <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
+CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src
+CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
+CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples
+CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests
+CSF_OCCTDocPath=@CMAKE_SOURCE_DIR@/doc
 PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
  </LocalDebuggerEnvironment>
  <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
  <LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@X_COMPILER_BITNESS@'">
- <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
+  <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
+CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src
+CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
+CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples
+CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests
+CSF_OCCTDocPath=@CMAKE_SOURCE_DIR@/doc
 PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
  </LocalDebuggerEnvironment>
  <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
index 110e363..328c030 100644 (file)
@@ -1,14 +1,5 @@
 echo off
 
-if not ["%1"]    == [""]      set "VCVER=%1"
-if not ["%2"]    == [""]      set "ARCH=%2"
-if /I ["%ARCH%"] == ["win32"] set "ARCH=32"
-if /I ["%ARCH%"] == ["win64"] set "ARCH=64"
-if /I ["%3"]     == ["debug"] set "CASDEB=d"
-if /I ["%3"]     == ["d"]     set "CASDEB=d"
-if /I ["%3"]     == ["i"]     set "CASDEB=i"
-if /I ["%3"]     == ["relwithdeb"] set "CASDEB=i"
-
 rem include other custom.bat files with specific 3rdparty paths
 @ADDITIONAL_CUSTOM_CONTENT@
 
index 4fd1c72..e2df8a5 100644 (file)
@@ -1,6 +1,6 @@
 echo off
 
-if "%VCVER%" == "@COMPILER@" (
+if /I "%VCVER%" == "@COMPILER@" (
   if "%ARCH%" == "@COMPILER_BITNESS@" (
     set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@"
     set "TK_DIR=@3RDPARTY_TK_DLL_DIR@"
@@ -10,6 +10,29 @@ if "%VCVER%" == "@COMPILER@" (
     set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIR@"
     set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
     set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
+
+    set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+    set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
+
+    rem CSF_OCCTBinPath and CSF_OCCTLibPath are defined differently for 
+    rem multiple and single configuration builds
+    set "CSF_OCCTBinPath=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
+    if ["@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"] == [""] (
+      set "CSF_OCCTBinPath=@CMAKE_BINARY_DIR@/win%ARCH%/%VCVER%/bin%3"
+    )
+    set "CSF_OCCTLibPath=@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@"
+    if ["@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@"] == [""] (
+      set "CSF_OCCTLibPath=@CMAKE_BINARY_DIR@/win%ARCH%/%VCVER%/lib%3"
+    )
+
+    set "CSF_OCCTIncludePath=@CMAKE_BINARY_DIR@/inc"
+    set "CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src"
+    set "CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data"
+    set "CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples"
+    set "CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests"
+    set "CSF_OCCTDocPath=@CMAKE_SOURCE_DIR@/doc"
+
+    rem for compatability with external application using CASROOT
+    set "CASROOT=@CMAKE_SOURCE_DIR@"
   ) 
 )
-
index e635d53..1c87faa 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [ "$COMPILER" == "@COMPILER@" ]; then
-  if [ "$ARCH" == "@COMPILER_BITNESS@" ]; then
+if [ "$1" == "@BIN_LETTER@" ]; then
+  if [ "$2" == "@COMPILER_BITNESS@" ]; then
     export TCL_DIR="@3RDPARTY_TCL_LIBRARY_DIR@"
     export TK_DIR="@3RDPARTY_TK_LIBRARY_DIR@"
     export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@"
@@ -9,6 +9,21 @@ if [ "$COMPILER" == "@COMPILER@" ]; then
     export GL2PS_DIR="@3RDPARTY_GL2PS_LIBRARY_DIR@"
     export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
     export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
+
+    export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+    export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
+
+    export CSF_OCCTBinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
+    export CSF_OCCTLibPath="@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@"
+    export CSF_OCCTIncludePath="@CMAKE_BINARY_DIR@/inc"
+    export CSF_OCCTResourcePath="@CMAKE_SOURCE_DIR@/src"
+    export CSF_OCCTDataPath="@CMAKE_SOURCE_DIR@/data"
+    export CSF_OCCTSamplesPath="@CMAKE_SOURCE_DIR@/samples"
+    export CSF_OCCTTestsPath="@CMAKE_SOURCE_DIR@/tests"
+    export CSF_OCCTDocPath="@CMAKE_SOURCE_DIR@/doc"
+
+    # for compatability with external application using CASROOT
+    export CASROOT="@CMAKE_SOURCE_DIR@"
   fi
 fi
 
index 1d05432..fbc295d 100644 (file)
@@ -1,6 +1,8 @@
 echo off
 
-if "%VCVER%" == "@COMPILER@" (
+rem CASDEB comes as third argument
+
+if /I "%VCVER%" == "@COMPILER@" (
   if "%ARCH%" == "@COMPILER_BITNESS@" (
     set "TCL_DIR=@USED_3RDPARTY_TCL_DIR@"
     set "TK_DIR=@USED_3RDPARTY_TK_DIR@"
@@ -10,6 +12,22 @@ if "%VCVER%" == "@COMPILER@" (
     set "GL2PS_DIR=@USED_3RDPARTY_GL2PS_DIR@"
     set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
     set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
-  ) 
+
+    set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+    set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
+
+    set "CSF_OCCTBinPath=@INSTALL_DIR@/@INSTALL_DIR_BIN@%3"
+    set "CSF_OCCTLibPath=@INSTALL_DIR@/@INSTALL_DIR_LIB@%3"
+
+    set "CSF_OCCTIncludePath=@INSTALL_DIR@/@INSTALL_DIR_INCLUDE@"
+    set "CSF_OCCTResourcePath=@INSTALL_DIR@/@INSTALL_DIR_RESOURCE@"
+    set "CSF_OCCTDataPath=@INSTALL_DIR@/@INSTALL_DIR_DATA@"
+    set "CSF_OCCTSamplesPath=@INSTALL_DIR@/@INSTALL_DIR_SAMPLES@"
+    set "CSF_OCCTTestsPath=@INSTALL_DIR@/@INSTALL_DIR_TESTS@"
+    set "CSF_OCCTDocPath=@INSTALL_DIR@/@INSTALL_DIR_DOC@"
+
+    rem for compatability with external application using CASROOT
+    set "CASROOT=@INSTALL_DIR@"
+  )
 )
 
index c48a023..6edc643 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$1" == "@COMPILER@" ]; then
+if [ "$1" == "@BIN_LETTER@" ]; then
   if [ "$2" == "@COMPILER_BITNESS@" ]; then
     export TCL_DIR="@USED_3RDPARTY_TCL_DIR@"
     export TK_DIR="@USED_3RDPARTY_TK_DIR@"
@@ -10,31 +10,20 @@ if [ "$1" == "@COMPILER@" ]; then
     export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
     export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
 
-    export BIN_PATH="@INSTALL_BIN_DIR@"
-    if [ "$BIN_PATH" != "" ]; then
-      export PATH="${BIN_PATH}:${PATH}"
-    fi
+    export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+    export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
 
-    export LIB_PATH="@INSTALL_LIB_DIR@"
-    if [ "$LIB_PATH" != "" ]; then
-      if [ "$LD_LIBRARY_PATH" != "" ]; then
-        export LD_LIBRARY_PATH="${LIB_PATH}:${LD_LIBRARY_PATH}"
-      else
-        export LD_LIBRARY_PATH="${LIB_PATH}"
-      fi
-    fi
+    export CSF_OCCTBinPath="@INSTALL_DIR@/@INSTALL_DIR_BIN@"
+    export CSF_OCCTLibPath="@INSTALL_DIR@/@INSTALL_DIR_LIB@"
+    export CSF_OCCTIncludePath="@INSTALL_DIR@/@INSTALL_DIR_INCLUDE@"
+    export CSF_OCCTResourcePath="@INSTALL_DIR@/@INSTALL_DIR_RESOURCE@"
+    export CSF_OCCTDataPath="@INSTALL_DIR@/@INSTALL_DIR_DATA@"
+    export CSF_OCCTSamplesPath="@INSTALL_DIR@/@INSTALL_DIR_SAMPLES@"
+    export CSF_OCCTTestsPath="@INSTALL_DIR@/@INSTALL_DIR_TESTS@"
+    export CSF_OCCTDocPath="@INSTALL_DIR@/@INSTALL_DIR_DOC@"
     
-    export OCCT_RESOURCE_PATH="${CASROOT}/src"
-    if [ "@INSTALL_OCCT_RESOURCE_DIR@" != "" ]; then
-      export OCCT_RESOURCE_PATH="@INSTALL_OCCT_RESOURCE_DIR@"
-    fi
-
-    # required for set default testing environment
-    # and "Samples" window creation in DRAW
-    export OCCT_SHARE_PATH="${CASROOT}"
-    if [ "@INSTALL_SHARE_DIR@" != "" ]; then
-      export OCCT_SHARE_PATH="@INSTALL_SHARE_DIR@"
-    fi
+    # for compatability with external application using CASROOT
+    export CASROOT="@INSTALL_DIR@"
   fi
 fi
 
index 5dc0f24..02e6043 100755 (executable)
@@ -1,8 +1,10 @@
 #!/bin/bash
 
+aCurrentPath="$PWD"
 aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
 
 source "${aScriptPath}/env.sh" "$1"
 
 echo 'Hint: use "pload ALL" command to load standard commands'
+cd ${aCurrentPath}
 DRAWEXE
index e9171b9..1785249 100644 (file)
@@ -28,9 +28,6 @@ set "CSF_OPT_BIN32="
 set "CSF_OPT_BIN64="
 
 rem ----- Load local settings -----
-if not ["%CASROOT%"] == [""] if exist "%CASROOT%\custom.bat" (
-  call "%CASROOT%\custom.bat" %1 %2 %3 %4 %5
-)
 if exist "%~dp0custom.bat" (
   call "%~dp0custom.bat" %1 %2 %3 %4 %5
 )
@@ -106,42 +103,50 @@ set "CSF_OPT_LNK64D=%CSF_OPT_LNK64D% %OPT_LIB64%"
 set "CSF_OPT_LNK32I=%CSF_OPT_LNK32I% %OPT_LIB32%"
 set "CSF_OPT_LNK64I=%CSF_OPT_LNK64I% %OPT_LIB64%"
 
-set "CASBIN=win%ARCH%\%VCVER%"
+rem ----- Default paths to sub-folders (can be different in install env) -----
+if "%CSF_OCCTIncludePath%" == "" set "CSF_OCCTIncludePath=%CASROOT%\inc"
+if "%CSF_OCCTResourcePath%" == "" set "CSF_OCCTResourcePath=%CASROOT%\src"
+if "%CSF_OCCTSamplesPath%" == "" set "CSF_OCCTSamplesPath=%CASROOT%\samples"
+if "%CSF_OCCTDataPath%" == "" set "CSF_OCCTDataPath=%CASROOT%\data"
+if "%CSF_OCCTTestsPath%" == "" set "CSF_OCCTTestsPath=%CASROOT%\tests"
+if "%CSF_OCCTBinPath%" == "" set "CSF_OCCTBinPath=%CASROOT%\win%ARCH%\%VCVER%\bin%CASDEB%"
+if "%CSF_OCCTLibPath%" == "" set "CSF_OCCTLibPath=%CASROOT%\win%ARCH%\%VCVER%\lib%CASDEB%"
 
 rem ----- Set path to 3rd party and OCCT libraries -----
-set "PATH=%SCRIPTROOT%\%CASBIN%\bin%CASDEB%;%PATH%"
+set "PATH=%CSF_OCCTBinPath%;%PATH%"
 if ["%CASDEB%"] == [""] if ["%ARCH%"] == ["32"] set "PATH=%CSF_OPT_BIN32%;%PATH%"
 if ["%CASDEB%"] == [""] if ["%ARCH%"] == ["64"] set "PATH=%CSF_OPT_BIN64%;%PATH%"
 if ["%CASDEB%"] == ["d"] if ["%ARCH%"] == ["32"] set "PATH=%CSF_OPT_BIN32D%;%PATH%"
 if ["%CASDEB%"] == ["d"] if ["%ARCH%"] == ["64"] set "PATH=%CSF_OPT_BIN64D%;%PATH%"
-
 if ["%CASDEB%"] == ["i"] if ["%ARCH%"] == ["32"] set "PATH=%CSF_OPT_BIN32I%;%PATH%"
 if ["%CASDEB%"] == ["i"] if ["%ARCH%"] == ["64"] set "PATH=%CSF_OPT_BIN64I%;%PATH%"
 
 rem ----- Set envoronment variables used by OCCT -----
 set CSF_LANGUAGE=us
 set MMGT_CLEAR=1
-set CSF_EXCEPTION_PROMPT=1
-set "CSF_SHMessage=%CASROOT%\src\SHMessage"
-set "CSF_MDTVTexturesDirectory=%CASROOT%\src\Textures"
-set "CSF_ShadersDirectory=%CASROOT%\src\Shaders"
-set "CSF_XSMessage=%CASROOT%\src\XSMessage"
-set "CSF_TObjMessage=%CASROOT%\src\TObj"
-set "CSF_StandardDefaults=%CASROOT%\src\StdResource"
-set "CSF_PluginDefaults=%CASROOT%\src\StdResource"
-set "CSF_XCAFDefaults=%CASROOT%\src\StdResource"
-set "CSF_TObjDefaults=%CASROOT%\src\StdResource"
-set "CSF_StandardLiteDefaults=%CASROOT%\src\StdResource"
-set "CSF_UnitsLexicon=%CASROOT%\src\UnitsAPI\Lexi_Expr.dat"
-set "CSF_UnitsDefinition=%CASROOT%\src\UnitsAPI\Units.dat"
-set "CSF_IGESDefaults=%CASROOT%\src\XSTEPResource"
-set "CSF_STEPDefaults=%CASROOT%\src\XSTEPResource"
-set "CSF_XmlOcafResource=%CASROOT%\src\XmlOcafResource"
-set "CSF_MIGRATION_TYPES=%CASROOT%\src\StdResource\MigrationSheet.txt"
+set "CSF_SHMessage=%CSF_OCCTResourcePath%\SHMessage"
+set "CSF_MDTVTexturesDirectory=%CSF_OCCTResourcePath%\Textures"
+set "CSF_ShadersDirectory=%CSF_OCCTResourcePath%\Shaders"
+set "CSF_XSMessage=%CSF_OCCTResourcePath%\XSMessage"
+set "CSF_TObjMessage=%CSF_OCCTResourcePath%\TObj"
+set "CSF_StandardDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_PluginDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_XCAFDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_TObjDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_StandardLiteDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_UnitsLexicon=%CSF_OCCTResourcePath%\UnitsAPI\Lexi_Expr.dat"
+set "CSF_UnitsDefinition=%CSF_OCCTResourcePath%\UnitsAPI\Units.dat"
+set "CSF_IGESDefaults=%CSF_OCCTResourcePath%\XSTEPResource"
+set "CSF_STEPDefaults=%CSF_OCCTResourcePath%\XSTEPResource"
+set "CSF_XmlOcafResource=%CSF_OCCTResourcePath%\XmlOcafResource"
+set "CSF_MIGRATION_TYPES=%CSF_OCCTResourcePath%\StdResource\MigrationSheet.txt"
 
 rem Draw Harness special stuff
-if exist "%CASROOT%\src\DrawResources" (
-  set "DRAWHOME=%CASROOT%\src\DrawResources"
+if exist "%CSF_OCCTResourcePath%\DrawResources\DrawDefault" (
+  set "DRAWDEFAULT=%CSF_OCCTResourcePath%\DrawResources\DrawDefault"
+)
+if exist "%CSF_OCCTResourcePath%\DrawResources" (
+  set "DRAWHOME=%CSF_OCCTResourcePath%\DrawResources"
   set "CSF_DrawPluginDefaults=%DRAWHOME%"
 )
 goto :eof
similarity index 50%
rename from adm/templates/env.install.bat.in
rename to adm/templates/env.bat.in
index 5739c02..36bed54 100644 (file)
@@ -3,9 +3,10 @@ echo off
 set "SCRIPTROOT=%~dp0"
 set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
 
+rem ----- Reset values to defaults -----
 set "VCVER=@COMPILER@"
 set "ARCH=@COMPILER_BITNESS@"
-set "CASDEB=@CURRENT_BUILD_LETTER@"
+set "CASDEB="
 
 if not ["%1"]    == [""]      set "VCVER=%1"
 if not ["%2"]    == [""]      set "ARCH=%2"
@@ -20,11 +21,10 @@ if exist "%~dp0custom.bat" (
   call "%~dp0custom.bat" %VCVER% %ARCH% %CASDEB%
 )
 
+rem for compatability with external application using CASROOT
 if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
 set "PRODROOT="
 
-set "ORIGIN_PATH=%PATH%"
-
 if not ["%TCL_DIR%"] == [""]           set "PATH=%TCL_DIR%;%PATH%"
 if not ["%TK_DIR%"] == [""]            set "PATH=%TK_DIR%;%PATH%"
 if not ["%FREETYPE_DIR%"] == [""]      set "PATH=%FREETYPE_DIR%;%PATH%"
@@ -35,45 +35,41 @@ if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
 if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
 
 rem ----- Set path to 3rd party and OCCT libraries -----
-set "BIN_TAIL=win%ARCH%/%VCVER%/bin%CASDEB%"
-set "PATH=%CASROOT%/%BIN_TAIL%;%PATH%"
+if not "%CSF_OCCTBinPath%" == "" (
+  set "PATH=%CSF_OCCTBinPath%;%PATH%"
+)
+
 if not ["%TK_DIR%"] == ["%TCL_DIR%"] (
-  if not ["%TK_DIR%"] == [""]  set "TK_LIBRARY=%TK_DIR%/../lib/tk@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
-  if not ["%TCL_DIR%"] == [""] set "TCL_LIBRARY=%TCL_DIR%/../lib/tcl@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+  if not ["%TK_DIR%"] == [""]  set "TK_LIBRARY=%TK_DIR%/../lib/tk%TK_VERSION_WITH_DOT%"
+  if not ["%TCL_DIR%"] == [""] set "TCL_LIBRARY=%TCL_DIR%/../lib/tcl%TCL_VERSION_WITH_DOT%"
 )
 
 rem ----- Set envoronment variables used by OCCT -----
 set  CSF_LANGUAGE=us
 set  MMGT_CLEAR=1
-set  CSF_EXCEPTION_PROMPT=1
-set "CSF_SHMessage=%CASROOT%\src\SHMessage"
-set "CSF_MDTVTexturesDirectory=%CASROOT%\src\Textures"
-set "CSF_ShadersDirectory=%CASROOT%\src\Shaders"
-set "CSF_XSMessage=%CASROOT%\src\XSMessage"
-set "CSF_TObjMessage=%CASROOT%\src\TObj"
-set "CSF_StandardDefaults=%CASROOT%\src\StdResource"
-set "CSF_PluginDefaults=%CASROOT%\src\StdResource"
-set "CSF_XCAFDefaults=%CASROOT%\src\StdResource"
-set "CSF_TObjDefaults=%CASROOT%\src\StdResource"
-set "CSF_StandardLiteDefaults=%CASROOT%\src\StdResource"
-set "CSF_UnitsLexicon=%CASROOT%\src\UnitsAPI\Lexi_Expr.dat"
-set "CSF_UnitsDefinition=%CASROOT%\src\UnitsAPI\Units.dat"
-set "CSF_IGESDefaults=%CASROOT%\src\XSTEPResource"
-set "CSF_STEPDefaults=%CASROOT%\src\XSTEPResource"
-set "CSF_XmlOcafResource=%CASROOT%\src\XmlOcafResource"
-set "CSF_MIGRATION_TYPES=%CASROOT%\src\StdResource\MigrationSheet.txt"
+set "CSF_SHMessage=%CSF_OCCTResourcePath%\SHMessage"
+set "CSF_MDTVTexturesDirectory=%CSF_OCCTResourcePath%\Textures"
+set "CSF_ShadersDirectory=%CSF_OCCTResourcePath%\Shaders"
+set "CSF_XSMessage=%CSF_OCCTResourcePath%\XSMessage"
+set "CSF_TObjMessage=%CSF_OCCTResourcePath%\TObj"
+set "CSF_StandardDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_PluginDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_XCAFDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_TObjDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_StandardLiteDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_UnitsLexicon=%CSF_OCCTResourcePath%\UnitsAPI\Lexi_Expr.dat"
+set "CSF_UnitsDefinition=%CSF_OCCTResourcePath%\UnitsAPI\Units.dat"
+set "CSF_IGESDefaults=%CSF_OCCTResourcePath%\XSTEPResource"
+set "CSF_STEPDefaults=%CSF_OCCTResourcePath%\XSTEPResource"
+set "CSF_XmlOcafResource=%CSF_OCCTResourcePath%\XmlOcafResource"
+set "CSF_MIGRATION_TYPES=%CSF_OCCTResourcePath%\StdResource\MigrationSheet.txt"
 
 rem Draw Harness special stuff
-if exist "%CASROOT%\src\DrawResources" (
-  set "DRAWHOME=%CASROOT%\src\DrawResources"
-  set "CSF_DrawPluginDefaults=%CASROOT%\src\DrawResources"
+if exist "%CSF_OCCTResourcePath%\DrawResources" (
+  set "DRAWHOME=%CSF_OCCTResourcePath%\DrawResources"
+  set "CSF_DrawPluginDefaults=%CSF_OCCTResourcePath%\DrawResources"
 
-  if exist "%CASROOT%\src\DrawResources\DrawDefault" (
-    set "DRAWDEFAULT=%CASROOT%\src\DrawResources\DrawDefault"
+  if exist "%CSF_OCCTResourcePath%\DrawResources\DrawDefault" (
+    set "DRAWDEFAULT=%CSF_OCCTResourcePath%\DrawResources\DrawDefault"
   )
 )
-
-if exist "%CASROOT%\src\DrawResourcesProducts" (
-  set "CSF_DrawPluginProductsDefaults=%CASROOT%\src\DrawResourcesProducts"
-)
-
diff --git a/adm/templates/env.build.bat.in b/adm/templates/env.build.bat.in
deleted file mode 100644 (file)
index ef3ead2..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-echo off
-
-set "SCRIPTROOT=%~dp0"
-set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
-
-set "CASROOT=@CMAKE_SOURCE_DIR@"
-
-set "VCVER=@COMPILER@"
-set "ARCH=@COMPILER_BITNESS@"
-set "CASDEB="
-
-if not ["%1"]    == [""]      set "VCVER=%1"
-if not ["%2"]    == [""]      set "ARCH=%2"
-if /I ["%ARCH%"] == ["win32"] set "ARCH=32"
-if /I ["%ARCH%"] == ["win64"] set "ARCH=64"
-if /I ["%3"]     == ["debug"] set "CASDEB=d"
-if /I ["%3"]     == ["d"]     set "CASDEB=d"
-if /I ["%3"]     == ["i"]     set "CASDEB=i"
-if /I ["%3"]     == ["relwithdeb"] set "CASDEB=i"
-
-if exist "%~dp0custom.bat" (
-  call "%~dp0custom.bat" %1 %2 %3
-)
-
-if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
-set "PRODROOT="
-
-set "ORIGIN_PATH=%PATH%"
-
-if not ["%TCL_DIR%"] == [""]           set "PATH=%TCL_DIR%;%PATH%"
-if not ["%TK_DIR%"] == [""]            set "PATH=%TK_DIR%;%PATH%"
-if not ["%FREETYPE_DIR%"] == [""]      set "PATH=%FREETYPE_DIR%;%PATH%"
-if not ["%FREEIMAGE_DIR%"] == [""]     set "PATH=%FREEIMAGE_DIR%;%PATH%"
-if not ["%FREEIMAGEPLUS_DIR%"] == [""] set "PATH=%FREEIMAGEPLUS_DIR%;%PATH%"
-if not ["%GL2PS_DIR%"] == [""]         set "PATH=%GL2PS_DIR%;%PATH%"
-if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
-if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
-
-rem ----- Set path to 3rd party and OCCT libraries -----
-set "BIN_TAIL=win%ARCH%/%VCVER%/bin%CASDEB%"
-set "PATH=@CMAKE_BINARY_DIR@/%BIN_TAIL%;%PATH%"
-if not ["%TK_DIR%"] == ["%TCL_DIR%"] (
-  if not ["%TK_DIR%"] == [""]  set "TK_LIBRARY=%TK_DIR%/../lib/tk@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
-  if not ["%TCL_DIR%"] == [""] set "TCL_LIBRARY=%TCL_DIR%/../lib/tcl@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
-)
-
-rem ----- Set envoronment variables used by OCCT -----
-set  CSF_LANGUAGE=us
-set  MMGT_CLEAR=1
-set  CSF_EXCEPTION_PROMPT=1
-set "CSF_SHMessage=%CASROOT%\src\SHMessage"
-set "CSF_MDTVTexturesDirectory=%CASROOT%\src\Textures"
-set "CSF_ShadersDirectory=%CASROOT%\src\Shaders"
-set "CSF_XSMessage=%CASROOT%\src\XSMessage"
-set "CSF_TObjMessage=%CASROOT%\src\TObj"
-set "CSF_StandardDefaults=%CASROOT%\src\StdResource"
-set "CSF_PluginDefaults=%CASROOT%\src\StdResource"
-set "CSF_XCAFDefaults=%CASROOT%\src\StdResource"
-set "CSF_TObjDefaults=%CASROOT%\src\StdResource"
-set "CSF_StandardLiteDefaults=%CASROOT%\src\StdResource"
-set "CSF_UnitsLexicon=%CASROOT%\src\UnitsAPI\Lexi_Expr.dat"
-set "CSF_UnitsDefinition=%CASROOT%\src\UnitsAPI\Units.dat"
-set "CSF_IGESDefaults=%CASROOT%\src\XSTEPResource"
-set "CSF_STEPDefaults=%CASROOT%\src\XSTEPResource"
-set "CSF_XmlOcafResource=%CASROOT%\src\XmlOcafResource"
-set "CSF_MIGRATION_TYPES=%CASROOT%\src\StdResource\MigrationSheet.txt"
-
-rem Draw Harness special stuff
-if exist "%CASROOT%\src\DrawResources" (
-  set "DRAWHOME=%CASROOT%\src\DrawResources"
-  set "CSF_DrawPluginDefaults=%CASROOT%\src\DrawResources"
-
-  if exist "%CASROOT%\src\DrawResources\DrawDefault" (
-    set "DRAWDEFAULT=%CASROOT%\src\DrawResources\DrawDefault"
-  )
-)
-
-if exist "%CASROOT%\src\DrawResourcesProducts" (
-  set "CSF_DrawPluginProductsDefaults=%CASROOT%\src\DrawResourcesProducts"
-)
-
diff --git a/adm/templates/env.build.sh.in b/adm/templates/env.build.sh.in
deleted file mode 100644 (file)
index bae619b..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash
-
-aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-
-export CASROOT="@CMAKE_SOURCE_DIR@"
-
-if [ "${CASROOT}" == "" ]; then
-  export CASROOT="${aScriptPath}"
-fi
-
-# Read script arguments
-shopt -s nocasematch
-export CASDEB="";
-if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
-if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
-if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
-if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
-shopt -u nocasematch
-
-export COMPILER="@COMPILER@"
-
-# ----- Set path to 3rd party and OCCT libraries -----
-anArch=`uname -m`
-if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
-  export ARCH="32";
-else
-  export ARCH="64";
-fi
-
-aSystem=`uname -s`
-if [ "$aSystem" == "Darwin" ]; then
-  export WOKSTATION="mac";
-  export ARCH="64";
-else
-  export WOKSTATION="lin";
-fi
-
-# ----- Set local settings -----
-if [ -e "${aScriptPath}/custom.sh" ]; then
-  source "${aScriptPath}/custom.sh" "${COMPILER}" "${WOKSTATION}${ARCH}" "${CASDEB}"
-fi
-
-THRDPARTY_PATH=""
-if [ "$TCL_DIR" != "" ]; then
-  THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$TK_DIR" != "" ]; then
-  THRDPARTY_PATH="${TK_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$FREETYPE_DIR" != "" ]; then
-  THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$FREEIMAGE_DIR" != "" ]; then
-  THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$GL2PS_DIR" != "" ]; then
-  THRDPARTY_PATH="${GL2PS_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$TBB_DIR" != "" ]; then
-  THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$VTK_DIR" != "" ]; then
-  THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
-fi
-
-if [ "$TK_DIR" != "$TCL_DIR" ]; then
-  if [ "$TK_DIR" != "" ]; then
-    export TK_LIBRARY="${TK_DIR}/../lib/tk@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
-  fi
-  if [ "$TCL_DIR" != "" ]; then
-    export TCL_LIBRARY="${TCL_DIR}/../lib/tcl@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
-  fi
-fi
-
-BIN_PATH="${WOKSTATION}${ARCH}/${COMPILER}/bin${CASDEB}"
-LIBS_PATH="${WOKSTATION}${ARCH}/${COMPILER}/lib${CASDEB}"
-
-export PATH="@CMAKE_BINARY_DIR@/${BIN_PATH}:${PATH}"
-
-if [ "$LD_LIBRARY_PATH" != "" ]; then
-  export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/${LIBS_PATH}:${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
-else
-  export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/${LIBS_PATH}:${THRDPARTY_PATH}"
-fi
-
-if [ "$WOKSTATION" == "mac" ]; then
-  if [ "$DYLD_LIBRARY_PATH" != "" ]; then
-    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
-  else
-    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
-  fi
-fi
-
-# ----- Set envoronment variables used by OCCT -----
-export CSF_LANGUAGE=us
-export MMGT_CLEAR=1
-export CSF_EXCEPTION_PROMPT=1
-export CSF_SHMessage="${CASROOT}/src/SHMessage"
-export CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"
-export CSF_ShadersDirectory="${CASROOT}/src/Shaders"
-export CSF_XSMessage="${CASROOT}/src/XSMessage"
-export CSF_TObjMessage="${CASROOT}/src/TObj"
-export CSF_StandardDefaults="${CASROOT}/src/StdResource"
-export CSF_PluginDefaults="${CASROOT}/src/StdResource"
-export CSF_XCAFDefaults="${CASROOT}/src/StdResource"
-export CSF_TObjDefaults="${CASROOT}/src/StdResource"
-export CSF_StandardLiteDefaults="${CASROOT}/src/StdResource"
-export CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
-export CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
-export CSF_IGESDefaults="${CASROOT}/src/XSTEPResource"
-export CSF_STEPDefaults="${CASROOT}/src/XSTEPResource"
-export CSF_XmlOcafResource="${CASROOT}/src/XmlOcafResource"
-export CSF_MIGRATION_TYPES="${CASROOT}/src/StdResource/MigrationSheet.txt"
-
-# Draw Harness special stuff
-if [ -e "${CASROOT}/src/DrawResources" ]; then
-  export DRAWHOME="${CASROOT}/src/DrawResources"
-  export CSF_DrawPluginDefaults="${CASROOT}/src/DrawResources"
-
-  if [ -e "${CASROOT}/src/DrawResources/DrawDefault" ]; then
-    export DRAWDEFAULT="${CASROOT}/src/DrawResources/DrawDefault"
-  fi
-fi
-
-if [ -e "${CASROOT}/src/DrawResourcesProducts" ]; then
-  export CSF_DrawPluginProductsDefaults="${CASROOT}/src/DrawResourcesProducts"
-fi
-
diff --git a/adm/templates/env.samples.bat.in b/adm/templates/env.samples.bat.in
new file mode 100644 (file)
index 0000000..ef3db43
--- /dev/null
@@ -0,0 +1,28 @@
+@echo off
+
+if exist "%~dp0custom.bat" (
+  call "%~dp0custom.bat" %1 %2 %3
+)
+
+call "@INSTALL_DIR@\@INSTALL_DIR_SCRIPT@\env.bat" %1 %2 %3
+
+set "BIN_DIR=win%ARCH%\%VCVER%\bind"
+set "LIB_DIR=win%ARCH%\%VCVER%\libd"
+
+if ["%CASDEB%"] == [""] (
+  set "BIN_DIR=win%ARCH%\%VCVER%\bin"
+  set "LIB_DIR=win%ARCH%\%VCVER%\lib"
+)
+
+set "PATH=%~dp0%BIN_DIR%;%PATH%"
+
+if not "%QTDIR%" == "" (
+  set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
+
+  set "CSF_ResourcesDefaults=!RES_DIR!"
+  set "CSF_TutorialResourcesDefaults=!RES_DIR!"
+  set "CSF_IEResourcesDefaults=!RES_DIR!"
+
+  set "PATH=%QTDIR%/bin;%PATH%"
+  set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"
+)
diff --git a/adm/templates/env.samples.sh.in b/adm/templates/env.samples.sh.in
new file mode 100644 (file)
index 0000000..51ae3d5
--- /dev/null
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+if [ -e "custom.sh" ]; then
+   source "custom.sh";
+fi
+
+if [ -e "@INSTALL_DIR@/@INSTALL_DIR_SCRIPT@/env.sh" ]; then
+   source "@INSTALL_DIR@/@INSTALL_DIR_SCRIPT@/env.sh";
+fi
+
+if test "${QTDIR}" == ""; then
+   echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script."
+   exit 1
+fi
+
+host=`uname -s`
+export STATION=$host
+export RES_DIR=${aSamplePath}/${STATION}/res
+
+export PATH=${QTDIR}/bin:${PATH}
index 10bbb9d..751610e 100644 (file)
@@ -175,16 +175,27 @@ else
   export CSF_OPT_LNK32I="$OPT_LINKER_OPTIONS_REL_WITH_DEB_INFO"
 fi
 
+# ----- Default paths to sub-folders (can be different in install env) -----
+export CSF_OCCTIncludePath="${CSF_OCCTIncludePath:-$CASROOT/inc}"
+export CSF_OCCTResourcePath="${CSF_OCCTResourcePath:-$CASROOT/src}"
+export CSF_OCCTSamplesPath="${CSF_OCCTSamplesPath:-$CASROOT/samples}"
+export CSF_OCCTDataPath="${CSF_OCCTDataPath:-$CASROOT/data}"
+export CSF_OCCTTestsPath="${CSF_OCCTTestsPath:-$CASROOT/tests}"
 
-BIN_PATH="${CASBIN}/bin${CASDEB}"
-LIBS_PATH="${CASBIN}/lib${CASDEB}"
 if [ "${TARGET}" == "xcd" ]; then
-  [[ "${CASDEB}" == "d" ]] && BIN_PATH="${CASBIN}/Debug" || BIN_PATH="${CASBIN}/Release"
-  LIBS_PATH="$BIN_PATH"
+  if [ "${CASDEB}" == "d" ]; then
+    export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/Debug}"
+  else
+    export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/Release}"
+  fi
+  export CSF_OCCTLibPath="${CSF_OCCTLibPath:-$CSF_OCCTBinPath}"
+else
+  export CSF_OCCTBinPath="${CSF_OCCTBinPath:-$CASROOT/$CASBIN/bin$CASDEB}"
+  export CSF_OCCTLibPath="${CSF_OCCTLibPath:-$CASROOT/$CASBIN/lib$CASDEB}"
 fi
 
-export PATH="${CASROOT}/${BIN_PATH}:${PATH}"
-export LD_LIBRARY_PATH="${CASROOT}/${LIBS_PATH}:${LD_LIBRARY_PATH}"
+export PATH="${CSF_OCCTBinPath}:${PATH}"
+export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
 if [ "$WOKSTATION" == "mac" ]; then
   export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
 fi
@@ -192,7 +203,6 @@ fi
 # Set envoronment variables used by OCCT
 export CSF_LANGUAGE="us"
 export MMGT_CLEAR="1"
-export CSF_EXCEPTION_PROMPT="1"
 export CSF_SHMessage="${CASROOT}/src/SHMessage"
 export CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"
 export CSF_ShadersDirectory="${CASROOT}/src/Shaders"
@@ -215,6 +225,3 @@ if [ -e "${CASROOT}/src/DrawResources" ]; then
   export DRAWHOME="${CASROOT}/src/DrawResources"
   export CSF_DrawPluginDefaults="${DRAWHOME}"
 fi
-if [ -e "${aScriptPath}/src/DrawResourcesProducts" ]; then
-  export CSF_DrawPluginProductsDefaults="${aScriptPath}/src/DrawResourcesProducts"
-fi
similarity index 51%
rename from adm/templates/env.install.sh.in
rename to adm/templates/env.sh.in
index 5701f19..fb000d7 100644 (file)
@@ -2,6 +2,7 @@
 
 aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
 
+# ----- for compatability with external application using CASROOT -----
 if [ "${CASROOT}" == "" ]; then
   export CASROOT="${aScriptPath}"
 fi
@@ -15,8 +16,6 @@ if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
 if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
 shopt -u nocasematch
 
-export COMPILER="@COMPILER@"
-
 # ----- Set path to 3rd party and OCCT libraries -----
 anArch=`uname -m`
 if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
@@ -34,8 +33,8 @@ else
 fi
 
 # ----- Set local settings -----
-if [ -e "${aScriptPath}/custom.sh" ]; then 
-  source "${aScriptPath}/custom.sh" "${COMPILER}" "${ARCH}"
+if [ -e "${aScriptPath}/custom.sh" ]; then
+  source "${aScriptPath}/custom.sh" "${CASDEB}" "${ARCH}"
 fi
 
 THRDPARTY_PATH=""
@@ -69,10 +68,10 @@ fi
 
 if [ "$TK_DIR" != "$TCL_DIR" ]; then
   if [ "$TK_DIR" != "" ]; then
-    export TK_LIBRARY="${TK_DIR}/../lib/tk@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
+    export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"
   fi
   if [ "$TCL_DIR" != "" ]; then
-    export TCL_LIBRARY="${TCL_DIR}/../lib/tcl@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+    export TCL_LIBRARY="${TCL_DIR}/../lib/tcl${TCL_VERSION_WITH_DOT}"
   fi
 fi
 
@@ -82,6 +81,18 @@ else
   export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
 fi
 
+if [ "$CSF_OCCTBinPath" != "" ]; then
+  export PATH="${CSF_OCCTBinPath}:${PATH}"
+fi
+
+if [ "$CSF_OCCTLibPath" != "" ]; then
+  if [ "$LD_LIBRARY_PATH" != "" ]; then
+    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
+  else
+    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}"
+  fi
+fi
+
 if [ "$WOKSTATION" == "mac" ]; then
   if [ "$DYLD_LIBRARY_PATH" != "" ]; then
     export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
@@ -93,35 +104,29 @@ fi
 # ----- Set envoronment variables used by OCCT -----
 export CSF_LANGUAGE=us
 export MMGT_CLEAR=1
-export CSF_EXCEPTION_PROMPT=1
-export CSF_SHMessage="${OCCT_RESOURCE_PATH}/SHMessage"
-export CSF_MDTVTexturesDirectory="${OCCT_RESOURCE_PATH}/Textures"
-export CSF_ShadersDirectory="${OCCT_RESOURCE_PATH}/Shaders"
-export CSF_XSMessage="${OCCT_RESOURCE_PATH}/XSMessage"
-export CSF_TObjMessage="${OCCT_RESOURCE_PATH}/TObj"
-export CSF_StandardDefaults="${OCCT_RESOURCE_PATH}/StdResource"
-export CSF_PluginDefaults="${OCCT_RESOURCE_PATH}/StdResource"
-export CSF_XCAFDefaults="${OCCT_RESOURCE_PATH}/StdResource"
-export CSF_TObjDefaults="${OCCT_RESOURCE_PATH}/StdResource"
-export CSF_StandardLiteDefaults="${OCCT_RESOURCE_PATH}/StdResource"
-export CSF_UnitsLexicon="${OCCT_RESOURCE_PATH}/UnitsAPI/Lexi_Expr.dat"
-export CSF_UnitsDefinition="${OCCT_RESOURCE_PATH}/UnitsAPI/Units.dat"
-export CSF_IGESDefaults="${OCCT_RESOURCE_PATH}/XSTEPResource"
-export CSF_STEPDefaults="${OCCT_RESOURCE_PATH}/XSTEPResource"
-export CSF_XmlOcafResource="${OCCT_RESOURCE_PATH}/XmlOcafResource"
-export CSF_MIGRATION_TYPES="${OCCT_RESOURCE_PATH}/StdResource/MigrationSheet.txt"
+export CSF_SHMessage="${CSF_OCCTResourcePath}/SHMessage"
+export CSF_MDTVTexturesDirectory="${CSF_OCCTResourcePath}/Textures"
+export CSF_ShadersDirectory="${CSF_OCCTResourcePath}/Shaders"
+export CSF_XSMessage="${CSF_OCCTResourcePath}/XSMessage"
+export CSF_TObjMessage="${CSF_OCCTResourcePath}/TObj"
+export CSF_StandardDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_PluginDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_XCAFDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_TObjDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_StandardLiteDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_UnitsLexicon="${CSF_OCCTResourcePath}/UnitsAPI/Lexi_Expr.dat"
+export CSF_UnitsDefinition="${CSF_OCCTResourcePath}/UnitsAPI/Units.dat"
+export CSF_IGESDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
+export CSF_STEPDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
+export CSF_XmlOcafResource="${CSF_OCCTResourcePath}/XmlOcafResource"
+export CSF_MIGRATION_TYPES="${CSF_OCCTResourcePath}/StdResource/MigrationSheet.txt"
 
 # Draw Harness special stuff
-if [ -e "${OCCT_RESOURCE_PATH}/DrawResources" ]; then
-  export DRAWHOME="${OCCT_RESOURCE_PATH}/DrawResources"
-  export CSF_DrawPluginDefaults="${OCCT_RESOURCE_PATH}/DrawResources"
+if [ -e "${CSF_OCCTResourcePath}/DrawResources" ]; then
+  export DRAWHOME="${CSF_OCCTResourcePath}/DrawResources"
+  export CSF_DrawPluginDefaults="${CSF_OCCTResourcePath}/DrawResources"
 
-  if [ -e "${OCCT_RESOURCE_PATH}/DrawResources/DrawDefault" ]; then
-    export DRAWDEFAULT="${OCCT_RESOURCE_PATH}/DrawResources/DrawDefault"
+  if [ -e "${CSF_OCCTResourcePath}/DrawResources/DrawDefault" ]; then
+    export DRAWDEFAULT="${CSF_OCCTResourcePath}/DrawResources/DrawDefault"
   fi
 fi
-
-if [ -e "${OCCT_RESOURCE_PATH}/DrawResourcesProducts" ]; then
-  export CSF_DrawPluginProductsDefaults="${OCCT_RESOURCE_PATH}/DrawResourcesProducts"
-fi
-
index 87eeb25..3c4b5ef 100644 (file)
@@ -12,21 +12,21 @@ if not "%4" == "" (
 
 set "VisualStudioExpressName=VCExpress"
 
-if "%VCVER%" == "vc8" (
+if /I "%VCVER%" == "vc8" (
   set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc9" (
+) else if /I "%VCVER%" == "vc9" (
   set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc10" (
+) else if /I "%VCVER%" == "vc10" (
   set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc11" (
+) else if /I "%VCVER%" == "vc11" (
   set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
   rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
   rem and has a new name for executable - WDExpress
   set "VisualStudioExpressName=WDExpress"
-) else if "%VCVER%" == "vc12" (
+) else if /I "%VCVER%" == "vc12" (
   set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
   set "VisualStudioExpressName=WDExpress"
-) else if "%VCVER%" == "vc14" (
+) else if /I "%VCVER%" == "vc14" (
   set "DevEnvDir=%VS140COMNTOOLS%..\IDE"
 ) else (
   echo Error: wrong VS identifier
index e92bae1..5614d5d 100644 (file)
@@ -18,9 +18,9 @@ BEGIN
       VALUE "FileDescription", "@PROJECT_NAME@ Toolkit\000"
       VALUE "FileVersion",     OCC_VERSION_STRING_EXT "\000"
       VALUE "LegalCopyright",  "\251 OPEN CASCADE SAS\000"
-      VALUE "ProductName",     "@PROJECT_NAME@\000"
+      VALUE "ProductName",     "Open CASCADE Technology\000"
       VALUE "ProductVersion",  OCC_VERSION_STRING_EXT "\000"
-      VALUE "OfficialSite",    "www.opencascade.org\000"
+      VALUE "OfficialSite",    "www.opencascade.com\000"
     END
   END
   BLOCK "VarFileInfo"
index 513fe1c..89b0fdb 100644 (file)
@@ -16,16 +16,19 @@ if ["%1"] == [""] (
   echo    HLR
   echo    Animation
   echo    Convert
+  PAUSE
   exit /B
 )
 
 call "%~dp0env.bat" %2 %3 %4
+set "EXE_PATH=%CSF_OCCTBinPath%/%1.exe"
 
-if not exist "%~dp0/%BIN_TAIL%/%1.exe" (
-  echo Executable %~dp0/%BIN_TAIL%/%1.exe not found.
+if not exist "%EXE_PATH%" (
+  echo Executable %EXE_PATH% not found.
   echo Probably you didn't compile the application.
+  PAUSE
   exit /B
 )
 
-"%~dp0/%BIN_TAIL%/%1.exe"
+"%EXE_PATH%"
 
index 84004d0..e1deafc 100644 (file)
@@ -18,9 +18,9 @@ BEGIN
       VALUE "FileDescription", "__TKNAM__ Toolkit\000"
       VALUE "FileVersion",     OCC_VERSION_STRING_EXT "\000"
       VALUE "LegalCopyright",  "\251 OPEN CASCADE SAS\000"
-      VALUE "ProductName",     "__TKNAM__\000"
+      VALUE "ProductName",     "Open CASCADE Technology\000"
       VALUE "ProductVersion",  OCC_VERSION_STRING_EXT "\000"
-      VALUE "OfficialSite",    "www.opencascade.org\000"
+      VALUE "OfficialSite",    "www.opencascade.com\000"
     END
   END
   BLOCK "VarFileInfo"
index 13bb98f..b70b818 100644 (file)
@@ -90,12 +90,21 @@ The following table enumerates the full list of environment variables used at co
 | BUILD_LIBRARY_TYPE | String |  Specifies the type of library to be created. "Shared" libraries are linked dynamically and loaded at runtime. "Static" libraries are archives of object files for use when linking other targets |
 | BUILD_ADDITIONAL_TOOLKITS | String | Semicolon-separated individual toolkits to include into build process. If you want to build some particular libraries (toolkits) only, then you may uncheck all modules in the corresponding *BUILD_MODUE_\<MODULE\>* options and provide the list of necessary libraries here. Of course, all dependencies will be resolved automatically |
 | BUILD_YACCLEX | Boolean flag | Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and ExprIntrp functionality are generated automatically with Flex/Bison. Checking this options leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files |
-| BUILD_MODULE_OcctMfcSamples | Boolean flag | Indicates whether MFC samples should be built together with OCCT. This option is only relevant to Windows platforms |
-| BUILD_DOC_OcctOverview | Boolean flag | Indicates whether OCCT overview documentation project should be created together with OCCT. It is not built together with OCCT. Checking this options leads to automatic search of Doxygen binaries. Building of it will be call Doxygen command to generate the documentation in HTML format |
+| BUILD_MODULE_MfcSamples | Boolean flag | Indicates whether MFC samples should be built together with OCCT. This option is only relevant to Windows platforms |
+| BUILD_DOC_Overview | Boolean flag | Indicates whether OCCT overview documentation project should be created together with OCCT. It is not built together with OCCT. Checking this options leads to automatic search of Doxygen binaries. Building of it will be call Doxygen command to generate the documentation in HTML format |
 | BUILD_PATCH | Path | Points to the directory recognized as a "patch" for OCCT. If specified, the files from this directory take precedence over the corresponding native OCCT sources. This way you are able to introduce patches to Open CASCADE Technology not affecting the original source distribution |
 | BUILD_WITH_DEBUG | Boolean flag | Enables extended messages of many OCCT algorithms, usually printed to cout. These include messages on internal errors and special cases encountered, timing etc |
 | CMAKE_CONFIGURATION_TYPES | String | Semicolon-separated CMake configurations |
-| INSTALL_DIR | Path | Points to the installation directory |
+| INSTALL_DIR | Path | Points to the installation directory. INSTALL_DIR is synonym of CMAKE_INSTALL_PREFIX . User can specify both INSTALL_DIR or CMAKE_INSTALL_PREFIX |
+| INSTALL_DIR_BIN | Path | Relative path to the binaries installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_BIN}) |
+| INSTALL_DIR_SCRIPT | Path | Relative path to the scripts installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}) |
+| INSTALL_DIR_LIB | Path | Relative path to the libraries installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_LIB}) |
+| INSTALL_DIR_INCLUDE | Path | Relative path to the includes installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_INCLUDE}) |
+| INSTALL_DIR_RESOURCE | Path | Relative path to the resources installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_RESOURCE}) |
+| INSTALL_DIR_DATA | Path | Relative path to the data files installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_DATA}) |
+| INSTALL_DIR_SAMPLES | Path | Relative path to the samples installation directory. Note that only "samples/tcl" folder will be installed. (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}) |
+| INSTALL_DIR_TESTS | Path | Relative path to the tests installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_TESTS}) |
+| INSTALL_DIR_DOC | Path | Relative path to the documentation installation directory (absolute path is ${INSTALL_DIR}/${INSTALL_DIR_DOC}) |
 | INSTALL_FREETYPE | Boolean flag | Indicates whether Freetype binaries should be installed into the installation directory |
 | INSTALL_FREEIMAGE* | Boolean flag | Indicates whether Freeimage binaries should be installed into the installation directory |
 | INSTALL_GL2PS | Boolean flag | Indicates whether GL2PS binaries should be installed into the installation directory |
@@ -103,8 +112,7 @@ The following table enumerates the full list of environment variables used at co
 | INSTALL_VTK | Boolean flag | Indicates whether VTK binaries should be installed into the installation directory |
 | INSTALL_TCL | Boolean flag | Indicates whether TCL binaries should be installed into the installation directory |
 | INSTALL_TEST_CASES | Boolean flag | Indicates whether non-regression OCCT test scripts should be installed into the installation directory |
-| INSTALL_SAMPLES | Boolean flag | Indicates whether OCCT samples should be installed into the installation directory |
-| INSTALL_DOC_OcctOverview | Boolean flag | Indicates whether OCCT overview documentation should be installed into the installation directory |
+| INSTALL_DOC_Overview | Boolean flag | Indicates whether OCCT overview documentation should be installed into the installation directory |
 
 **Note:** In those CMake options defining paths only the forward slashes ("/") are acceptable.
 
@@ -164,7 +172,7 @@ Go to the build folder, start the Visual Studio solution *OCCT.sln* and build it
 By default the build solution process skips the building of the INSTALL and Overview project.
 
 When the building process is finished build:
-* Overview project to generate OCCT overview documentation (if BUILD_DOC_OcctOverview variable is checked)
+* Overview project to generate OCCT overview documentation (if BUILD_DOC_Overview variable is checked)
 * the *INSTALL* project to run **the installation process**
 
 For this, right-click on the *Overview/INSTALL* project and select **Project Only -> Build Only** -> *Overview/INSTALL* in the solution explorer. 
index 21536a8..ab7b6d6 100644 (file)
@@ -54,6 +54,6 @@ if not defined TCL_FOUND (
 ) 
 
 :: run GUI tool
-%TCL_FOUND% %~dp0adm/genconf.tcl
+"%TCL_FOUND%" %~dp0adm/genconf.tcl
 
 SET "PATH=%OLD_PATH%"
index 2f74a96..5eb62a5 100644 (file)
@@ -46,7 +46,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath)"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -67,7 +67,7 @@
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)/OCCTProxy.dll"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/libd"
+                               AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                AssemblyDebug="1"
                                ProgramDatabaseFile="$(OutDir)/OCCTProxy.pdb"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath)"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)/OCCTProxy.dll"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/libd"
+                               AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                AssemblyDebug="1"
                                ProgramDatabaseFile="$(OutDir)/OCCTProxy.pdb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)/OCCTProxy.dll"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/lib"
+                               AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)/OCCTProxy.dll"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/lib"
+                               AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
index 57b6002..26b8d1e 100644 (file)
@@ -82,7 +82,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <ProgramDatabaseFile>$(OutDir)OCCTProxy.pdb</ProgramDatabaseFile>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <ProgramDatabaseFile>$(OutDir)OCCTProxy.pdb</ProgramDatabaseFile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
index 02d9783..7ab2689 100644 (file)
@@ -46,7 +46,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath);&quot;$(DXSDK_DIR)Include&quot;"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
@@ -68,7 +68,7 @@
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/libd"
+                               AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                AssemblyDebug="1"
                                ProgramDatabaseFile="$(OutDir)/OCCTProxy_D3D.pdb"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath);&quot;$(DXSDK_DIR)Include&quot;"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/libd"
+                               AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                AssemblyDebug="1"
                                ProgramDatabaseFile="$(OutDir)/OCCTProxy_D3D.pdb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath);&quot;$(DXSDK_DIR)Include&quot;"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="$(CASROOT)/win32/$(VCVER)/lib"
+                               AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\OCC\;$(CASROOT)/inc;&quot;$(DXSDK_DIR)Include&quot;"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OCCTIncludePath);&quot;$(DXSDK_DIR)Include&quot;"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="$(CASROOT)/win64/$(VCVER)/lib"
+                               AdditionalLibraryDirectories="$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
index 364f7f9..78bac3c 100644 (file)
@@ -83,7 +83,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/libd;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <ProgramDatabaseFile>$(OutDir)OCCTProxy_D3D.pdb</ProgramDatabaseFile>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
       <ProgramDatabaseFile>$(OutDir)OCCTProxy_D3D.pdb</ProgramDatabaseFile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
index f0bdde3..bdb3c0f 100644 (file)
@@ -96,7 +96,7 @@ namespace IE_WPF_D3D
     {
       int aFormat = 10;
       OpenFileDialog anOpenDialog = new OpenFileDialog ();
-      string aDataDir = ((Environment.GetEnvironmentVariable ("CASROOT")) + "\\..\\data");
+      string aDataDir = Environment.GetEnvironmentVariable ("CSF_OCCTDataPath");
       string aFilter = "";
 
       switch (theFormat)
@@ -141,7 +141,7 @@ namespace IE_WPF_D3D
     {
       int aFormat = 10;
       SaveFileDialog saveDialog = new SaveFileDialog ();
-      string aDataDir = ((Environment.GetEnvironmentVariable ("CASROOT")) + "\\..\\data");
+      string aDataDir = Environment.GetEnvironmentVariable ("CSF_OCCTDataPath");
       string aFilter = "";
 
       switch (theFormat)
index 48101da..29e4e10 100644 (file)
@@ -171,7 +171,7 @@ namespace IE_WPF_WinForms
         {
             int aFormat = 10;
             OpenFileDialog anOpenDialog = new OpenFileDialog();
-            string aDataDir = ( (Environment.GetEnvironmentVariable("CASROOT")) + "\\..\\data" );
+            string aDataDir = Environment.GetEnvironmentVariable("CSF_OCCTDataPath");
             string aFilter = "";
 
             switch ( theFormat )
@@ -218,7 +218,7 @@ namespace IE_WPF_WinForms
         {
             int aFormat = 10;
             SaveFileDialog saveDialog = new SaveFileDialog();
-            string aDataDir = ( (Environment.GetEnvironmentVariable("CASROOT") ) + "\\..\\data" );
+            string aDataDir = Environment.GetEnvironmentVariable("CSF_OCCTDataPath");
             string aFilter = "";
 
             switch ( theFormat )
index 06287ad..14d0389 100644 (file)
@@ -646,7 +646,7 @@ namespace IE_WinForms
       int theformat = 10;
       System.Windows.Forms.OpenFileDialog openDialog = new OpenFileDialog();
 
-      string DataDir = ((Environment.GetEnvironmentVariable("CASROOT")) + "\\..\\data");
+      string DataDir = Environment.GetEnvironmentVariable("CSF_OCCTDataPath");
 
       string filter = "";
 
@@ -689,7 +689,7 @@ namespace IE_WinForms
     {
       int theformat = 10;
       System.Windows.Forms.SaveFileDialog saveDialog = new SaveFileDialog();
-      string DataDir = ((Environment.GetEnvironmentVariable("CASROOT")) + "\\..\\data");
+      string DataDir = Environment.GetEnvironmentVariable("CSF_OCCTDataPath");
       string filter = "";
       switch (format)
       {
index 902b3fa..60aa836 100644 (file)
@@ -1,25 +1,27 @@
 @echo off
 
+Setlocal EnableDelayedExpansion
+
 rem Setup environment
-call "%~dp0../../env.bat" %1 %2 %3
+call "%~dp0env.bat" %1 %2 %3
 
 rem Define path to project file
 set "PRJFILE=%~dp0\CSharp.sln"
 
 set "VisualStudioExpressName=VCExpress"
 
-if "%VCVER%" == "vc8" (
+if /I "%VCVER%" == "vc8" (
   set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc9" (
+) else if /I "%VCVER%" == "vc9" (
   set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc10" (
+) else if /I "%VCVER%" == "vc10" (
   set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc11" (
+) else if /I "%VCVER%" == "vc11" (
   set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
   rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
   rem and has a new name for executable - WDExpress
   set "VisualStudioExpressName=WDExpress"
-) else if "%VCVER%" == "vc12" (
+) else if /I "%VCVER%" == "vc12" (
   set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
   set "VisualStudioExpressName=WDExpress"
 ) else (
index d9500ac..b5dc772 100644 (file)
@@ -1,14 +1,16 @@
 @echo off
 
+Setlocal EnableDelayedExpansion
+
 rem Setup environment
-call "%~dp0..\..\env.bat" %1 %2 %3
+call "%~dp0env.bat" %1 %2 %3
 
 if NOT DEFINED DXSDK_DIR (
-  if "%VCVER%" == "vc9" (
+  if /I "%VCVER%" == "vc9" (
     echo ERROR: DirectX SDK is required in order to build the sample but it is not found in your system. Please install DirectX SDK and retry.
     exit /B
   )
-  if "%VCVER%" == "vc10" (
+  if /I "%VCVER%" == "vc10" (
     echo ERROR: DirectX SDK is required in order to build the sample but it is not found in your system. Please install DirectX SDK and retry.
     exit /B
   )
@@ -19,18 +21,18 @@ set "PRJFILE=%~dp0\CSharp_D3D.sln"
 
 set "VisualStudioExpressName=VCExpress"
 
-if "%VCVER%" == "vc8" (
+if /I "%VCVER%" == "vc8" (
   set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc9" (
+) else if /I "%VCVER%" == "vc9" (
   set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc10" (
+) else if /I "%VCVER%" == "vc10" (
   set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
-) else if "%VCVER%" == "vc11" (
+) else if /I "%VCVER%" == "vc11" (
   set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
   rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
   rem and has a new name for executable - WDExpress
   set "VisualStudioExpressName=WDExpress"
-) else if "%VCVER%" == "vc12" (
+) else if /I "%VCVER%" == "vc12" (
   set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
   set "VisualStudioExpressName=WDExpress"
 ) else (
index 1643fd6..c67bd20 100644 (file)
@@ -1,5 +1,7 @@
 @echo off
 
+Setlocal EnableDelayedExpansion
+
 if "%1" == "-h" (
   goto err_bat
 )
index 05f6e2c..d83cfae 100644 (file)
@@ -69,15 +69,16 @@ add_executable (Geometry WIN32 ${Geometry_SOURCE_FILES}
 
 set_property(TARGET Geometry PROPERTY FOLDER Samples)
 
-install (TARGETS Geometry
-         CONFIGURATIONS Release
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Geometry
-         CONFIGURATIONS RelWithDebInfo
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Geometry
-         CONFIGURATIONS Debug
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+if (SINGLE_GENERATOR)
+  install (TARGETS Geometry DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+else()
+  install (TARGETS Geometry
+           CONFIGURATIONS Release RelWithDebInfo
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Geometry
+           CONFIGURATIONS Debug
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc
                      ${Geometry_SRC_DIR}
index 1476dab..4d8bc16 100644 (file)
@@ -92,7 +92,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <ProgramDatabaseFile>../../../../win32\vc10\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <ProgramDatabaseFile>../../../../win64\vc10\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc10\bind/Geometry.pdb</ProgramDatabaseFile>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../..\win64\vc10\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc10\bind/Geometry.pdb</ProgramDatabaseFile>
index 22d8ce1..dc004c3 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <ProgramDatabaseFile>../../../../win32\vc11\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <ProgramDatabaseFile>../../../../win64\vc11\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc11\bind/Geometry.pdb</ProgramDatabaseFile>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../..\win64\vc11\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc11\bind/Geometry.pdb</ProgramDatabaseFile>
index e0e3794..f68cd3b 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <ProgramDatabaseFile>../../../../win32\vc12\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <ProgramDatabaseFile>../../../../win64\vc12\bin/Geometry.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc12\bind/Geometry.pdb</ProgramDatabaseFile>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../..\win64\vc12\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc12\bind/Geometry.pdb</ProgramDatabaseFile>
index f949bf3..24169cc 100644 (file)
@@ -53,7 +53,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -85,7 +85,7 @@
                                OutputFile="../../../..\win32\vc8\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OCCTLibPath)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                ProgramDatabaseFile="../../../..\win32\vc8\bin/Geometry.pdb"
                                SubSystem="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win32\vc8\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CASROOT)/win32/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OCCTLibPath)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win32\vc8\bind/Geometry.pdb"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win64\vc8\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CASROOT)/win64/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OCCTLibPath)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                ProgramDatabaseFile="../../../..\win64\vc8\bin/Geometry.pdb"
                                SubSystem="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\\win64\vc8\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CASROOT)/win64/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OCCTLibPath)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win64\vc8\bind/Geometry.pdb"
index 133ec39..7bbf50c 100644 (file)
@@ -54,7 +54,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -86,7 +86,7 @@
                                OutputFile="../../../..\win32\vc9\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CASROOT)/win32/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OCCTLibPath)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                ProgramDatabaseFile="../../../..\win32\vc9\bin/Geometry.pdb"
                                SubSystem="2"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win64\vc9\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CASROOT)/win64/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OCCTLibPath)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                ProgramDatabaseFile="../../../..\win64\vc9\bin/Geometry.pdb"
                                SubSystem="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win32\vc9\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CASROOT)/win32/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OCCTLibPath)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win32\vc9\bind/Geometry.pdb"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src,.,..\..\..\..\Common,..\..\..\src\ISession2d,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\\win64\vc9\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CASROOT)/win64/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OCCTLibPath)"
                                ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win64\vc9\bind/Geometry.pdb"
index 00e0d8b..b986705 100644 (file)
@@ -39,15 +39,16 @@ add_executable ( Modeling WIN32 ${Modeling_SOURCE_FILES}
 
 set_property (TARGET Modeling PROPERTY FOLDER Samples)
 
-install (TARGETS Modeling
-         CONFIGURATIONS Release
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Modeling
-         CONFIGURATIONS RelWithDebInfo
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Modeling
-         CONFIGURATIONS Debug
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+if (SINGLE_GENERATOR)
+  install (TARGETS Modeling DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+else()
+  install (TARGETS Modeling
+           CONFIGURATIONS Release RelWithDebInfo
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Modeling
+           CONFIGURATIONS Debug
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc
                      ${MFC_STANDARD_SAMPLES_DIR}/02_Modeling
index 89ac94a..899b200 100644 (file)
@@ -91,7 +91,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc10\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc10\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc10\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc10\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
index 7c80e6a..a1945d3 100644 (file)
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc11\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc11\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc11\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc11\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
index b672030..068d466 100644 (file)
@@ -95,7 +95,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc12\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bind/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc12\bind/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc12\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;TKBO.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bin/Modeling.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc12\bin/Modeling.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
index 2e82cb2..dadcb34 100644 (file)
@@ -52,7 +52,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -84,7 +84,7 @@
                                OutputFile="../../../..\win32\vc8\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CASROOT)/win32/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win32\vc8\bind/Modeling.pdb"
                                SubSystem="2"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win32\vc8\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win32\vc8\bin/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win64\vc8\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CASROOT)/win64/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win64\vc8\bind/Modeling.pdb"
                                SubSystem="2"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win64\vc8\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CASROOT)/win64/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win64\vc8\bin/Modeling.pdb"
                                SubSystem="2"
                                TargetMachine="17"
index 0431fcb..5a8716e 100644 (file)
@@ -53,7 +53,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -85,7 +85,7 @@
                                OutputFile="../../../..\win32\vc9\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CASROOT)/win32/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win32\vc9\bind/Modeling.pdb"
                                SubSystem="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win64\vc9\bind/Modeling.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CASROOT)/win64/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win64\vc9\bind/Modeling.pdb"
                                SubSystem="2"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win32\vc9\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CASROOT)/win32/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win32\vc9\bin/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\..\Common,.,..\..\..\src,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win64\vc9\bin/Modeling.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CASROOT)/win64/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win64\vc9\bin/Modeling.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
index e482a6b..e295bbd 100644 (file)
@@ -35,15 +35,16 @@ add_executable (Viewer2d WIN32 ${Viewer2d_SOURCE_FILES}
 
 set_property (TARGET Viewer2d PROPERTY FOLDER Samples)
 
-install (TARGETS Viewer2d
-         CONFIGURATIONS Release
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Viewer2d
-         CONFIGURATIONS RelWithDebInfo
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Viewer2d
-         CONFIGURATIONS Debug
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+if (SINGLE_GENERATOR)
+  install (TARGETS Viewer2d DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+else()
+  install (TARGETS Viewer2d
+           CONFIGURATIONS Release RelWithDebInfo
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Viewer2d
+           CONFIGURATIONS Debug
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc
                      ${MFC_STANDARD_SAMPLES_DIR}/03_Viewer2d
index 914cea1..4fe654d 100644 (file)
@@ -92,7 +92,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc10\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc10\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc10\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc10\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index 82d76c3..0de25b3 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc11\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc11\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc11\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc11\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index ce3268a..c94778f 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc12\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bin/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc12\bin/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc12\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bind/Viewer2d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc12\bind/Viewer2d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index e8ee6c4..40d378e 100644 (file)
@@ -53,7 +53,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -85,7 +85,7 @@
                                OutputFile="../../../..\win32\vc8\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win32\vc8\bin/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win32\vc8\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CASROOT)/win32/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer2d.pdb"
                                SubSystem="2"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win64\vc8\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CASROOT)/win64/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win64\vc8\bin/Viewer2d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win64\vc8\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CASROOT)/win64/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win64\vc8\bind/Viewer2d.pdb"
                                SubSystem="2"
index 7c8ea62..a401706 100644 (file)
@@ -54,7 +54,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -86,7 +86,7 @@
                                OutputFile="../../../..\win32\vc9\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CASROOT)/win32/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win32\vc9\bin/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win64\vc9\bin/Viewer2d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CASROOT)/win64/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win64\vc9\bin/Viewer2d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win32\vc9\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CASROOT)/win32/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win32\vc9\bind/Viewer2d.pdb"
                                SubSystem="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\src\Properties,.,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win64\vc9\bind/Viewer2d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CASROOT)/win64/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win64\vc9\bind/Viewer2d.pdb"
                                SubSystem="2"
index 23fa45d..2eae889 100644 (file)
@@ -63,15 +63,16 @@ add_executable (Viewer3d WIN32 ${Viewer3d_SOURCE_FILES}
 
 set_property (TARGET Viewer3d PROPERTY FOLDER Samples)
 
-install (TARGETS Viewer3d
-         CONFIGURATIONS Release
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Viewer3d
-         CONFIGURATIONS RelWithDebInfo
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Viewer3d
-         CONFIGURATIONS Debug
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+if (SINGLE_GENERATOR)
+  install (TARGETS Viewer3d DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+else()
+  install (TARGETS Viewer3d
+           CONFIGURATIONS Release RelWithDebInfo
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Viewer3d
+           CONFIGURATIONS Debug
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc
                      ${Viewer3d_SRC_DIR}
index a9ad53f..d27adf8 100644 (file)
@@ -92,7 +92,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc10\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc10\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc10\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc10\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index 7f8d79b..3226305 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc11\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc11\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc11\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc11\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index 0236ff3..e4126bf 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc12\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bin/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc12\bin/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc12\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKBRep.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bind/Viewer3d.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc12\bind/Viewer3d.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index 470534b..eabc38c 100644 (file)
@@ -53,7 +53,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -85,7 +85,7 @@
                                OutputFile="../../../..\win32\vc8\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win32\vc8\bin/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win32\vc8\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CASROOT)/win32/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win32\vc8\bind/Viewer3d.pdb"
                                SubSystem="2"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win64\vc8\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CASROOT)/win64/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win64\vc8\bin/Viewer3d.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win64\vc8\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CASROOT)/win64/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc8\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win64\vc8\bind/Viewer3d.pdb"
                                SubSystem="2"
index ed9d775..a959d2e 100644 (file)
@@ -54,7 +54,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -86,7 +86,7 @@
                                OutputFile="../../../..\win32\vc9\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CASROOT)/win32/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win32\vc9\bin/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../..\win64\vc9\bin/Viewer3d.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CASROOT)/win64/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../..\win64\vc9\bin/Viewer3d.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win32\vc9\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CASROOT)/win32/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win32\vc9\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win32\vc9\bind/Viewer3d.pdb"
                                SubSystem="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../..\win64\vc9\bind/Viewer3d.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CASROOT)/win64/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\\win64\vc9\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../..\win64\vc9\bind/Viewer3d.pdb"
                                SubSystem="2"
index ee084e2..5970b16 100644 (file)
@@ -37,15 +37,16 @@ add_executable (ImportExport WIN32 ${ImportExport_SOURCE_FILES}
 
 set_property (TARGET ImportExport PROPERTY FOLDER Samples)
 
-install (TARGETS ImportExport
-         CONFIGURATIONS Release
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS ImportExport
-         CONFIGURATIONS RelWithDebInfo
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS ImportExport
-         CONFIGURATIONS Debug
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+if (SINGLE_GENERATOR)
+  install (TARGETS ImportExport DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+else()
+  install (TARGETS ImportExport
+           CONFIGURATIONS Release RelWithDebInfo
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS ImportExport
+           CONFIGURATIONS Debug
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc
                      ${MFC_STANDARD_SAMPLES_DIR}/05_ImportExport
index 3cacd02..280f512 100644 (file)
@@ -92,7 +92,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc10\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc10\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc10\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc10\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index 3ed476b..7a2f943 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc11\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc11\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc11\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc11\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index 8ae6e6a..14870c8 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc12\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bin/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc12\bin/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc12\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bind/ImportExport.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc12\bind/ImportExport.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index 578208f..564ddcd 100644 (file)
@@ -53,7 +53,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -85,7 +85,7 @@
                                OutputFile="../../../../win32\vc8\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win32\vc8\lib,$(CASROOT)/win32/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\win32\vc8\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../../win32\vc8\bin/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="1"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../../win32\vc8\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win32\vc8\libd,$(CASROOT)/win32/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\win32\vc8\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../../win32\vc8\bind/ImportExport.pdb"
                                SubSystem="2"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../../win64\vc8\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win64\vc8\lib,$(CASROOT)/win64/vc8/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\win64\vc8\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../../win64\vc8\bin/ImportExport.pdb"
                                SubSystem="2"
                                TargetMachine="17"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../../win64\vc8\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win64\vc8\libd,$(CASROOT)/win64/vc8/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\win64\vc8\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../../win64\vc8\bind/ImportExport.pdb"
                                SubSystem="2"
index b17cce3..43e8639 100644 (file)
@@ -54,7 +54,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -86,7 +86,7 @@
                                OutputFile="../../../../win32\vc9\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win32\vc9\lib,$(CASROOT)/win32/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\win32\vc9\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../../win32\vc9\bin/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                OutputFile="../../../../win64\vc9\bin/ImportExport.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win64\vc9\lib,$(CASROOT)/win64/vc9/lib"
+                               AdditionalLibraryDirectories="..\..\..\..\win64\vc9\lib,$(CSF_OCCTLibPath)"
                                ProgramDatabaseFile="../../../../win64\vc9\bin/ImportExport.pdb"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../../win32\vc9\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win32\vc9\libd,$(CASROOT)/win32/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\win32\vc9\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../../win32\vc9\bind/ImportExport.pdb"
                                SubSystem="2"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CASROOT)/inc"
+                               AdditionalIncludeDirectories="..\..\..\,..\..\..\src,..\..\..\..\Common,$(CSF_OCCTIncludePath)"
                                PreprocessorDefinitions="_DEBUG;_WINDOWS;WINVER=0x0500"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                OutputFile="../../../../win64\vc9\bind/ImportExport.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\..\win64\vc9\libd,$(CASROOT)/win64/vc9/libd"
+                               AdditionalLibraryDirectories="..\..\..\..\win64\vc9\libd,$(CSF_OCCTLibPath)"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile="../../../../win64\vc9\bind/ImportExport.pdb"
                                SubSystem="2"
index 391ae83..17e3b8b 100644 (file)
@@ -51,15 +51,16 @@ add_executable (Ocaf WIN32 ${Ocaf_SOURCE_FILES}
 
 set_property (TARGET Ocaf PROPERTY FOLDER Samples)
 
-install (TARGETS Ocaf
-         CONFIGURATIONS Release
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Ocaf
-         CONFIGURATIONS RelWithDebInfo
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-install (TARGETS Ocaf
-         CONFIGURATIONS Debug
-         DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+if (SINGLE_GENERATOR)
+  install (TARGETS Ocaf DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+else()
+  install (TARGETS Ocaf
+           CONFIGURATIONS Release RelWithDebInfo
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS Ocaf
+           CONFIGURATIONS Debug
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+endif()
 
 include_directories (${CMAKE_BINARY_DIR}/inc
                      ${MFC_STANDARD_SAMPLES_DIR}/06_Ocaf
index 68d6b8f..1068b5b 100644 (file)
@@ -92,7 +92,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKVCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc10\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc10\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKVCAF.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc10\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc10\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index 25411e5..0b1dc56 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc11\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc11\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc11\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win64\vc11\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
index 7b3af0f..a59c52c 100644 (file)
@@ -96,7 +96,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win32\vc12\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bin/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>../../../../win64\vc12\bin/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc12\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>../../../../win32\vc12\bind/Ocaf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <AdditionalDependencies>TKVCAF.lib;TKLCAF.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKBO.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc12\bind/Ocaf.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\..\win64\vc12\libd;$(CASROO