From 4b3541c68b96b544f601b7acb1c53f96ec5c8c33 Mon Sep 17 00:00:00 2001 From: ski Date: Fri, 18 Mar 2016 08:25:53 +0300 Subject: [PATCH] 0027176: Configuration, CMake - INSTALL_DIR is a common prefix for all other install variables Possibility to customize layout of installation of OCCT is introduced by: - variable INSTALL_DIR_LAYOUT - select one of the two predefined layouts: either Windows (classic OCCT layout) or Unix (Linux standard) - variables INSTALL_DIR_* (BIN, LIB, INCLUDE, RESOURCE, DOC, TESTS, SCRIPT, SAMPLES, DATA) - specify locations of relevant components - variable INSTALL_DIR_WITH_VERSION (bool) - specifies whether full version of OCCT should be used in paths in Unix layout Files LICENSE_LGPL_21.txt and OCCT_LGPL_EXCEPTION.txt are always installed. Environment is extended to support non-default layouts. For that, environment variables "CSF_OCCT*Path" are defined, corresponding to CMake variables INSTALL_DIR_* described above. Visual Studio environment, DRAW, tests, samples are amended to use these variables instead of (or as alternative to) CASROOT. Settings of Products-specific vars are removed from environment scripts. File genconf.bat was corrected to avoid error message for the case when path to TCL contains spaces. Product name in rc files changed to "Open CASCADE Technology". --- CMakeLists.txt | 284 +++++++++++------- adm/cmake/3rdparty_macro.cmake | 36 +-- adm/cmake/freetype.cmake | 20 +- adm/cmake/occt_macros.cmake | 14 +- adm/cmake/occt_toolkit.cmake | 38 +-- adm/cmake/tbb.cmake | 20 +- adm/cmake/tcl.cmake | 29 +- adm/cmake/tk.cmake | 26 +- adm/cmake/vardescr.cmake | 36 ++- adm/templates/DRAWEXE.vcxproj.user.in | 21 +- adm/templates/custom.bat.main | 9 - adm/templates/custom.build.bat.in | 27 +- adm/templates/custom.build.sh.in | 19 +- adm/templates/custom.install.bat.in | 22 +- adm/templates/custom.install.sh.in | 37 +-- adm/templates/draw.sh | 2 + adm/templates/env.bat | 55 ++-- .../{env.install.bat.in => env.bat.in} | 64 ++-- adm/templates/env.build.bat.in | 81 ----- adm/templates/env.build.sh.in | 134 --------- adm/templates/env.samples.bat.in | 28 ++ adm/templates/env.samples.sh.in | 22 ++ adm/templates/env.sh | 27 +- .../{env.install.sh.in => env.sh.in} | 71 +++-- adm/templates/msvc.bat | 12 +- adm/templates/occt_toolkit.rc.in | 4 +- adm/templates/sample.bat | 9 +- adm/templates/template_dll.rc | 4 +- dox/dev_guides/building/cmake/cmake.md | 20 +- genconf.bat | 2 +- samples/CSharp/OCCTProxy/OCCTProxy.vcproj | 16 +- samples/CSharp/OCCTProxy/OCCTProxy.vcxproj | 16 +- .../CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj | 16 +- .../OCCTProxy_D3D/OCCTProxy_D3D.vcxproj | 16 +- samples/CSharp/WPF_D3D/OCCViewer.cs | 4 +- samples/CSharp/WPF_WinForms/OCCViewer.cs | 4 +- samples/CSharp/WinForms/Form2.cs | 4 +- samples/CSharp/msvc.bat | 14 +- samples/CSharp/msvc_D3D.bat | 18 +- samples/CSharp/run.bat | 2 + .../mfc/standard/01_Geometry/CMakeLists.txt | 19 +- .../01_Geometry/adm/win/vc10/Geometry.vcxproj | 16 +- .../01_Geometry/adm/win/vc11/Geometry.vcxproj | 16 +- .../01_Geometry/adm/win/vc12/Geometry.vcxproj | 16 +- .../01_Geometry/adm/win/vc8/Geometry.vcproj | 16 +- .../01_Geometry/adm/win/vc9/Geometry.vcproj | 16 +- .../mfc/standard/02_Modeling/CMakeLists.txt | 19 +- .../02_Modeling/adm/win/vc10/Modeling.vcxproj | 16 +- .../02_Modeling/adm/win/vc11/Modeling.vcxproj | 16 +- .../02_Modeling/adm/win/vc12/Modeling.vcxproj | 16 +- .../02_Modeling/adm/win/vc8/Modeling.vcproj | 16 +- .../02_Modeling/adm/win/vc9/Modeling.vcproj | 16 +- .../mfc/standard/03_Viewer2d/CMakeLists.txt | 19 +- .../03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj | 16 +- .../03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj | 16 +- .../03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj | 16 +- .../03_Viewer2d/adm/win/vc8/Viewer2d.vcproj | 16 +- .../03_Viewer2d/adm/win/vc9/Viewer2d.vcproj | 16 +- .../mfc/standard/04_Viewer3d/CMakeLists.txt | 19 +- .../04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj | 16 +- .../04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj | 16 +- .../04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj | 16 +- .../04_Viewer3d/adm/win/vc8/Viewer3d.vcproj | 16 +- .../04_Viewer3d/adm/win/vc9/Viewer3d.vcproj | 16 +- .../standard/05_ImportExport/CMakeLists.txt | 19 +- .../adm/win/vc10/ImportExport.vcxproj | 16 +- .../adm/win/vc11/ImportExport.vcxproj | 16 +- .../adm/win/vc12/ImportExport.vcxproj | 16 +- .../adm/win/vc8/ImportExport.vcproj | 16 +- .../adm/win/vc9/ImportExport.vcproj | 16 +- samples/mfc/standard/06_Ocaf/CMakeLists.txt | 19 +- .../06_Ocaf/adm/win/vc10/Ocaf.vcxproj | 16 +- .../06_Ocaf/adm/win/vc11/Ocaf.vcxproj | 16 +- .../06_Ocaf/adm/win/vc12/Ocaf.vcxproj | 16 +- .../standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj | 16 +- .../standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj | 16 +- .../standard/07_Triangulation/CMakeLists.txt | 19 +- .../adm/win/vc10/Triangulation.vcxproj | 16 +- .../adm/win/vc11/Triangulation.vcxproj | 16 +- .../adm/win/vc12/Triangulation.vcxproj | 16 +- .../adm/win/vc8/Triangulation.vcproj | 16 +- .../adm/win/vc9/Triangulation.vcproj | 16 +- samples/mfc/standard/08_HLR/CMakeLists.txt | 19 +- .../standard/08_HLR/adm/win/vc10/HLR.vcxproj | 16 +- .../standard/08_HLR/adm/win/vc11/HLR.vcxproj | 16 +- .../standard/08_HLR/adm/win/vc12/HLR.vcxproj | 16 +- .../standard/08_HLR/adm/win/vc8/HLR.vcproj | 16 +- .../standard/08_HLR/adm/win/vc9/HLR.vcproj | 16 +- .../mfc/standard/09_Animation/CMakeLists.txt | 19 +- .../adm/win/vc10/Animation.vcxproj | 16 +- .../adm/win/vc11/Animation.vcxproj | 16 +- .../adm/win/vc12/Animation.vcxproj | 16 +- .../09_Animation/adm/win/vc8/Animation.vcproj | 16 +- .../09_Animation/adm/win/vc9/Animation.vcproj | 16 +- .../09_Animation/src/AnimationDoc.cpp | 6 +- .../mfc/standard/10_Convert/CMakeLists.txt | 19 +- .../10_Convert/adm/win/vc10/Convert.vcxproj | 16 +- .../10_Convert/adm/win/vc11/Convert.vcxproj | 16 +- .../10_Convert/adm/win/vc12/Convert.vcxproj | 16 +- .../10_Convert/adm/win/vc8/Convert.vcproj | 16 +- .../10_Convert/adm/win/vc9/Convert.vcproj | 16 +- .../Common/ImportExport/ImportExport.cpp | 42 +-- .../Common/ImportExport/SaveSTEPDlg.cpp | 6 +- samples/mfc/standard/mfcsample/CMakeLists.txt | 32 +- .../mfcsample/adm/win/vc10/mfcsample.vcxproj | 16 +- .../mfcsample/adm/win/vc11/mfcsample.vcxproj | 16 +- .../mfcsample/adm/win/vc12/mfcsample.vcxproj | 16 +- .../mfcsample/adm/win/vc8/mfcsample.vcproj | 16 +- .../mfcsample/adm/win/vc9/mfcsample.vcproj | 16 +- samples/mfc/standard/msvc.bat | 12 +- samples/mfc/standard/run.bat | 2 + samples/qt/Common/src/MDIWindow.cxx | 2 +- samples/qt/FuncDemo/FuncDemo.pro | 7 +- samples/qt/FuncDemo/genproj.bat | 2 + samples/qt/FuncDemo/msvc.bat | 12 +- samples/qt/FuncDemo/run.bat | 2 + samples/qt/IESample/IESample.pro | 7 +- samples/qt/IESample/genproj.bat | 2 + samples/qt/IESample/msvc.bat | 12 +- samples/qt/IESample/run.bat | 2 + samples/qt/Interface/src/Translate.cxx | 2 - samples/qt/Tutorial/Tutorial.pro | 7 +- samples/qt/Tutorial/genproj.bat | 2 + samples/qt/Tutorial/msvc.bat | 12 +- samples/qt/Tutorial/run.bat | 2 + samples/tcl/DataExchangeDemo.tcl | 4 +- src/DrawResources/DrawDefault | 41 ++- src/DrawResources/DrawTK.tcl | 36 ++- src/DrawResources/TKTopTest.tcl | 8 +- src/DrawResources/TestCommands.tcl | 4 - src/OS/Visualization.tcl | 6 +- src/TKIVtkDraw/EXTERNLIB | 2 + tests/bugs/begin | 3 - tests/bugs/vis/bug26719_1 | 2 +- tests/demo/samples/anc101 | 2 +- tests/demo/samples/bottle | 2 +- tests/demo/samples/cad | 2 +- tests/demo/samples/cpu | 2 +- tests/demo/samples/cutter | 2 +- tests/demo/samples/dimensions | 2 +- tests/demo/samples/dimensionsglsl | 2 +- tests/demo/samples/drill | 2 +- tests/demo/samples/gehause | 2 +- tests/demo/samples/materials | 2 +- tests/demo/samples/pencil | 2 +- tests/demo/samples/penrose | 2 +- tests/demo/samples/raytrace | 2 +- tests/demo/samples/snowflake | 2 +- tests/demo/samples/xde | 2 +- tests/v3d/materials/bug24855 | 2 +- tests/v3d/materials/bug24872_1 | 2 +- tests/v3d/materials/bug24872_2 | 2 +- tests/xml/ocaf_xml/begin | 3 +- tests/xml/xcaf_xml/begin | 3 +- 154 files changed, 1368 insertions(+), 1306 deletions(-) rename adm/templates/{env.install.bat.in => env.bat.in} (50%) delete mode 100644 adm/templates/env.build.bat.in delete mode 100644 adm/templates/env.build.sh.in create mode 100644 adm/templates/env.samples.bat.in create mode 100644 adm/templates/env.samples.sh.in rename adm/templates/{env.install.sh.in => env.sh.in} (51%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4798137640..61f866d3ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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: /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 /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: /inc for windows, # /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: /src for windows, # /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) diff --git a/adm/cmake/3rdparty_macro.cmake b/adm/cmake/3rdparty_macro.cmake index 4725b44eb5..887c343836 100644 --- a/adm/cmake/3rdparty_macro.cmake +++ b/adm/cmake/3rdparty_macro.cmake @@ -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() diff --git a/adm/cmake/freetype.cmake b/adm/cmake/freetype.cmake index 8adb7395f2..865caf685f 100644 --- a/adm/cmake/freetype.cmake +++ b/adm/cmake/freetype.cmake @@ -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() diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake index f352096672..03b778ad3a 100644 --- a/adm/cmake/occt_macros.cmake +++ b/adm/cmake/occt_macros.cmake @@ -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...") diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake index e98b4b037b..b721e4c424 100644 --- a/adm/cmake/occt_toolkit.cmake +++ b/adm/cmake/occt_toolkit.cmake @@ -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() diff --git a/adm/cmake/tbb.cmake b/adm/cmake/tbb.cmake index 7bcde73c69..aba4a10425 100644 --- a/adm/cmake/tbb.cmake +++ b/adm/cmake/tbb.cmake @@ -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() diff --git a/adm/cmake/tcl.cmake b/adm/cmake/tcl.cmake index 8d9ff9c718..08df381eff 100644 --- a/adm/cmake/tcl.cmake +++ b/adm/cmake/tcl.cmake @@ -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.") diff --git a/adm/cmake/tk.cmake b/adm/cmake/tk.cmake index d0343dc487..04b12b9b60 100644 --- a/adm/cmake/tk.cmake +++ b/adm/cmake/tk.cmake @@ -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.") diff --git a/adm/cmake/vardescr.cmake b/adm/cmake/vardescr.cmake index 9a0c7fad9e..c3cd82231a 100644 --- a/adm/cmake/vardescr.cmake +++ b/adm/cmake/vardescr.cmake @@ -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 diff --git a/adm/templates/DRAWEXE.vcxproj.user.in b/adm/templates/DRAWEXE.vcxproj.user.in index 7e02dda7a4..f7fa9cd74c 100644 --- a/adm/templates/DRAWEXE.vcxproj.user.in +++ b/adm/templates/DRAWEXE.vcxproj.user.in @@ -1,21 +1,36 @@  - CASROOT=@CMAKE_SOURCE_DIR@ + 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% WindowsLocalDebugger @CMAKE_BINARY_DIR@ - CASROOT=@CMAKE_SOURCE_DIR@ + 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% WindowsLocalDebugger @CMAKE_BINARY_DIR@ - CASROOT=@CMAKE_SOURCE_DIR@ + 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% WindowsLocalDebugger diff --git a/adm/templates/custom.bat.main b/adm/templates/custom.bat.main index 110e363e82..328c03067a 100644 --- a/adm/templates/custom.bat.main +++ b/adm/templates/custom.bat.main @@ -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@ diff --git a/adm/templates/custom.build.bat.in b/adm/templates/custom.build.bat.in index 4fd1c7233e..e2df8a538e 100644 --- a/adm/templates/custom.build.bat.in +++ b/adm/templates/custom.build.bat.in @@ -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@" ) ) - diff --git a/adm/templates/custom.build.sh.in b/adm/templates/custom.build.sh.in index e635d530aa..1c87faab5a 100644 --- a/adm/templates/custom.build.sh.in +++ b/adm/templates/custom.build.sh.in @@ -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 diff --git a/adm/templates/custom.install.bat.in b/adm/templates/custom.install.bat.in index 1d05432e4b..fbc295d996 100644 --- a/adm/templates/custom.install.bat.in +++ b/adm/templates/custom.install.bat.in @@ -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@" + ) ) diff --git a/adm/templates/custom.install.sh.in b/adm/templates/custom.install.sh.in index c48a023049..6edc643843 100644 --- a/adm/templates/custom.install.sh.in +++ b/adm/templates/custom.install.sh.in @@ -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 diff --git a/adm/templates/draw.sh b/adm/templates/draw.sh index 5dc0f24e62..02e6043de3 100755 --- a/adm/templates/draw.sh +++ b/adm/templates/draw.sh @@ -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 diff --git a/adm/templates/env.bat b/adm/templates/env.bat index e9171b9d86..17852495cc 100644 --- a/adm/templates/env.bat +++ b/adm/templates/env.bat @@ -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 diff --git a/adm/templates/env.install.bat.in b/adm/templates/env.bat.in similarity index 50% rename from adm/templates/env.install.bat.in rename to adm/templates/env.bat.in index 5739c02296..36bed54582 100644 --- a/adm/templates/env.install.bat.in +++ b/adm/templates/env.bat.in @@ -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 index ef3ead205b..0000000000 --- a/adm/templates/env.build.bat.in +++ /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 index bae619b1a3..0000000000 --- a/adm/templates/env.build.sh.in +++ /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 index 0000000000..ef3db43aa9 --- /dev/null +++ b/adm/templates/env.samples.bat.in @@ -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 index 0000000000..51ae3d5a5a --- /dev/null +++ b/adm/templates/env.samples.sh.in @@ -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} diff --git a/adm/templates/env.sh b/adm/templates/env.sh index 10bbb9d2a7..751610e228 100644 --- a/adm/templates/env.sh +++ b/adm/templates/env.sh @@ -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 diff --git a/adm/templates/env.install.sh.in b/adm/templates/env.sh.in similarity index 51% rename from adm/templates/env.install.sh.in rename to adm/templates/env.sh.in index 5701f19338..fb000d725f 100644 --- a/adm/templates/env.install.sh.in +++ b/adm/templates/env.sh.in @@ -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 - diff --git a/adm/templates/msvc.bat b/adm/templates/msvc.bat index 87eeb25251..3c4b5efdc4 100644 --- a/adm/templates/msvc.bat +++ b/adm/templates/msvc.bat @@ -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 diff --git a/adm/templates/occt_toolkit.rc.in b/adm/templates/occt_toolkit.rc.in index e92bae1f52..5614d5df5e 100644 --- a/adm/templates/occt_toolkit.rc.in +++ b/adm/templates/occt_toolkit.rc.in @@ -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" diff --git a/adm/templates/sample.bat b/adm/templates/sample.bat index 513fe1c8a8..89b0fdbb9d 100644 --- a/adm/templates/sample.bat +++ b/adm/templates/sample.bat @@ -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%" diff --git a/adm/templates/template_dll.rc b/adm/templates/template_dll.rc index 84004d02d7..e1deafccd2 100644 --- a/adm/templates/template_dll.rc +++ b/adm/templates/template_dll.rc @@ -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" diff --git a/dox/dev_guides/building/cmake/cmake.md b/dox/dev_guides/building/cmake/cmake.md index 13bb98fba8..b70b818ced 100644 --- a/dox/dev_guides/building/cmake/cmake.md +++ b/dox/dev_guides/building/cmake/cmake.md @@ -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_\* 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. diff --git a/genconf.bat b/genconf.bat index 21536a81a7..ab7b6d6161 100644 --- a/genconf.bat +++ b/genconf.bat @@ -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%" diff --git a/samples/CSharp/OCCTProxy/OCCTProxy.vcproj b/samples/CSharp/OCCTProxy/OCCTProxy.vcproj index 2f74a96642..5eb62a5e01 100644 --- a/samples/CSharp/OCCTProxy/OCCTProxy.vcproj +++ b/samples/CSharp/OCCTProxy/OCCTProxy.vcproj @@ -46,7 +46,7 @@ Disabled - ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) false Default @@ -94,7 +94,7 @@ $(OutDir)OCCTProxy.dll - $(CASROOT)/win32/$(VCVER)/libd;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true true $(OutDir)OCCTProxy.pdb @@ -112,7 +112,7 @@ Disabled - ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) false Default @@ -124,7 +124,7 @@ $(OutDir)OCCTProxy.dll - $(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true true $(OutDir)OCCTProxy.pdb @@ -138,7 +138,7 @@ - ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL @@ -148,7 +148,7 @@ $(OutDir)OCCTProxy.dll - $(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true Windows true @@ -165,7 +165,7 @@ X64 - ..\OCC\;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\OCC\;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL @@ -175,7 +175,7 @@ $(OutDir)OCCTProxy.dll - $(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true Windows true diff --git a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj index 02d9783a94..7ab2689cd6 100644 --- a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj +++ b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj @@ -46,7 +46,7 @@ Disabled - ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) + ..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) false Default @@ -95,7 +95,7 @@ $(OutDir)OCCTProxy_D3D.dll - $(CASROOT)/win32/$(VCVER)/libd;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) true true $(OutDir)OCCTProxy_D3D.pdb @@ -114,7 +114,7 @@ Disabled - ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) + ..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) _DEBUG;%(PreprocessorDefinitions) false Default @@ -126,7 +126,7 @@ $(OutDir)OCCTProxy_D3D.dll - $(CASROOT)/win64/$(VCVER)/libd;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true true $(OutDir)OCCTProxy_D3D.pdb @@ -140,7 +140,7 @@ - ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) + ..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL @@ -150,7 +150,7 @@ $(OutDir)OCCTProxy_D3D.dll - $(CASROOT)/win32/$(VCVER)/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true Windows true @@ -167,7 +167,7 @@ X64 - ..\OCC\;$(CASROOT)/inc;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) + ..\OCC\;$(CSF_OCCTIncludePath);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) MultiThreadedDLL @@ -177,7 +177,7 @@ $(OutDir)OCCTProxy_D3D.dll - $(CASROOT)/win64/$(VCVER)/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true Windows true diff --git a/samples/CSharp/WPF_D3D/OCCViewer.cs b/samples/CSharp/WPF_D3D/OCCViewer.cs index f0bdde3b73..bdb3c0f8db 100644 --- a/samples/CSharp/WPF_D3D/OCCViewer.cs +++ b/samples/CSharp/WPF_D3D/OCCViewer.cs @@ -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) diff --git a/samples/CSharp/WPF_WinForms/OCCViewer.cs b/samples/CSharp/WPF_WinForms/OCCViewer.cs index 48101da5be..29e4e10072 100644 --- a/samples/CSharp/WPF_WinForms/OCCViewer.cs +++ b/samples/CSharp/WPF_WinForms/OCCViewer.cs @@ -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 ) diff --git a/samples/CSharp/WinForms/Form2.cs b/samples/CSharp/WinForms/Form2.cs index 06287ad241..14d0389dd1 100644 --- a/samples/CSharp/WinForms/Form2.cs +++ b/samples/CSharp/WinForms/Form2.cs @@ -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) { diff --git a/samples/CSharp/msvc.bat b/samples/CSharp/msvc.bat index 902b3fa974..60aa836f2e 100644 --- a/samples/CSharp/msvc.bat +++ b/samples/CSharp/msvc.bat @@ -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 ( diff --git a/samples/CSharp/msvc_D3D.bat b/samples/CSharp/msvc_D3D.bat index d9500ac766..b5dc772658 100644 --- a/samples/CSharp/msvc_D3D.bat +++ b/samples/CSharp/msvc_D3D.bat @@ -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 ( diff --git a/samples/CSharp/run.bat b/samples/CSharp/run.bat index 1643fd64ab..c67bd20eaa 100644 --- a/samples/CSharp/run.bat +++ b/samples/CSharp/run.bat @@ -1,5 +1,7 @@ @echo off +Setlocal EnableDelayedExpansion + if "%1" == "-h" ( goto err_bat ) diff --git a/samples/mfc/standard/01_Geometry/CMakeLists.txt b/samples/mfc/standard/01_Geometry/CMakeLists.txt index 05f6e2c27c..d83cfaec9b 100644 --- a/samples/mfc/standard/01_Geometry/CMakeLists.txt +++ b/samples/mfc/standard/01_Geometry/CMakeLists.txt @@ -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} diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj index 1476dab4c5..4d8bc16124 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj @@ -92,7 +92,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ 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) ../../../../win32\vc10\bin/Geometry.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win32\vc10\bin/Geometry.pdb Windows @@ -135,7 +135,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -158,7 +158,7 @@ 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) ../../../../win64\vc10\bin/Geometry.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win64\vc10\bin/Geometry.pdb Windows @@ -177,7 +177,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -201,7 +201,7 @@ 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) ../../../../win32\vc10\bind/Geometry.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win32\vc10\bind/Geometry.pdb @@ -221,7 +221,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -245,7 +245,7 @@ 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) ../../../..\win64\vc10\bind/Geometry.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win64\vc10\bind/Geometry.pdb diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj index 22d8ce182c..dc004c39c6 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc11\bin/Geometry.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win32\vc11\bin/Geometry.pdb Windows @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -162,7 +162,7 @@ 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) ../../../../win64\vc11\bin/Geometry.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win64\vc11\bin/Geometry.pdb Windows @@ -181,7 +181,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -205,7 +205,7 @@ 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) ../../../../win32\vc11\bind/Geometry.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win32\vc11\bind/Geometry.pdb @@ -225,7 +225,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -249,7 +249,7 @@ 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) ../../../..\win64\vc11\bind/Geometry.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win64\vc11\bind/Geometry.pdb diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj index e0e3794ab7..f68cd3bf75 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc12/Geometry.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc12\bin/Geometry.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win32\vc12\bin/Geometry.pdb Windows @@ -139,7 +139,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -162,7 +162,7 @@ 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) ../../../../win64\vc12\bin/Geometry.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest ../../../../win64\vc12\bin/Geometry.pdb Windows @@ -181,7 +181,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -205,7 +205,7 @@ 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) ../../../../win32\vc12\bind/Geometry.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win32\vc12\bind/Geometry.pdb @@ -225,7 +225,7 @@ Disabled - ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src;.;..\..\..\..\Common;..\..\..\src\ISession2d;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -249,7 +249,7 @@ 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) ../../../..\win64\vc12\bind/Geometry.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) $(IntDir)$(TargetFileName).intermediate.manifest true ../../../../win64\vc12\bind/Geometry.pdb diff --git a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj index f949bf385b..24169cc6ce 100644 --- a/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj +++ b/samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj @@ -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" @@ -150,7 +150,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -114,7 +114,7 @@ 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) ../../../../win32\vc10\bind/Modeling.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Modeling.pdb Windows @@ -133,7 +133,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -156,7 +156,7 @@ 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) ../../../../win64\vc10\bind/Modeling.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Modeling.pdb Windows @@ -176,7 +176,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -199,7 +199,7 @@ 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) ../../../../win32\vc10\bin/Modeling.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Modeling.pdb Windows MachineX86 @@ -218,7 +218,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -241,7 +241,7 @@ 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) ../../../../win64\vc10\bin/Modeling.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Modeling.pdb Windows MachineX64 diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj index 7c80e6a5ec..a1945d3914 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj @@ -95,7 +95,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ 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) ../../../../win32\vc11\bind/Modeling.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Modeling.pdb Windows @@ -137,7 +137,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -160,7 +160,7 @@ 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) ../../../../win64\vc11\bind/Modeling.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Modeling.pdb Windows @@ -180,7 +180,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +203,7 @@ 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) ../../../../win32\vc11\bin/Modeling.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Modeling.pdb Windows MachineX86 @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -245,7 +245,7 @@ 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) ../../../../win64\vc11\bin/Modeling.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Modeling.pdb Windows MachineX64 diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj index b6720303fb..068d46635a 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc12/Modeling.vcxproj @@ -95,7 +95,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ 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) ../../../../win32\vc12\bind/Modeling.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Modeling.pdb Windows @@ -137,7 +137,7 @@ Disabled - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -160,7 +160,7 @@ 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) ../../../../win64\vc12\bind/Modeling.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Modeling.pdb Windows @@ -180,7 +180,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +203,7 @@ 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) ../../../../win32\vc12\bin/Modeling.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Modeling.pdb Windows MachineX86 @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;.;..\..\..\src;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;.;..\..\..\src;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -245,7 +245,7 @@ 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) ../../../../win64\vc12\bin/Modeling.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Modeling.pdb Windows MachineX64 diff --git a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj index 2e82cb23f7..dadcb34fbc 100644 --- a/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj +++ b/samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj @@ -52,7 +52,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ 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) ../../../../win32\vc10\bin/Viewer2d.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Viewer2d.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ 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) ../../../../win64\vc10\bin/Viewer2d.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Viewer2d.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ 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) ../../../../win32\vc10\bind/Viewer2d.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Viewer2d.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ 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) ../../../../win64\vc10\bind/Viewer2d.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Viewer2d.pdb Windows diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj index 82d76c3e0f..0de25b325d 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc11\bin/Viewer2d.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Viewer2d.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc11\bin/Viewer2d.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Viewer2d.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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) ../../../../win32\vc11\bind/Viewer2d.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Viewer2d.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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) ../../../../win64\vc11\bind/Viewer2d.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Viewer2d.pdb Windows diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj index ce3268aeb3..c94778f69f 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc12/Viewer2d.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc12\bin/Viewer2d.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Viewer2d.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc12\bin/Viewer2d.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Viewer2d.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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) ../../../../win32\vc12\bind/Viewer2d.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Viewer2d.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\src\Properties;.;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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) ../../../../win64\vc12\bind/Viewer2d.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Viewer2d.pdb Windows diff --git a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj index e8ee6c42fc..40d378e3a0 100644 --- a/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj +++ b/samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj @@ -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" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ 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) ../../../../win32\vc10\bin/Viewer3d.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Viewer3d.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ 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) ../../../../win64\vc10\bin/Viewer3d.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Viewer3d.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -199,7 +199,7 @@ 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) ../../../../win32\vc10\bind/Viewer3d.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Viewer3d.pdb Windows @@ -218,7 +218,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -242,7 +242,7 @@ 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) ../../../../win64\vc10\bind/Viewer3d.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Viewer3d.pdb Windows diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj index 7f8d79b84d..3226305105 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc11\bin/Viewer3d.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Viewer3d.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc11\bin/Viewer3d.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Viewer3d.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -203,7 +203,7 @@ 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) ../../../../win32\vc11\bind/Viewer3d.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Viewer3d.pdb Windows @@ -222,7 +222,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -246,7 +246,7 @@ 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) ../../../../win64\vc11\bind/Viewer3d.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Viewer3d.pdb Windows diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj index 0236ff3ef8..e4126bf574 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc12/Viewer3d.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc12\bin/Viewer3d.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Viewer3d.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc12\bin/Viewer3d.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Viewer3d.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -203,7 +203,7 @@ 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) ../../../../win32\vc12\bind/Viewer3d.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Viewer3d.pdb Windows @@ -222,7 +222,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -246,7 +246,7 @@ 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) ../../../../win64\vc12\bind/Viewer3d.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Viewer3d.pdb Windows diff --git a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj index 470534b3e0..eabc38cbae 100644 --- a/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj +++ b/samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj @@ -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" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ 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) ../../../../win32\vc10\bin/ImportExport.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/ImportExport.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ 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) ../../../../win64\vc10\bin/ImportExport.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/ImportExport.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ 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) ../../../../win32\vc10\bind/ImportExport.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/ImportExport.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ 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) ../../../../win64\vc10\bind/ImportExport.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/ImportExport.pdb Windows diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj index 3ed476b790..7a2f943f95 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc11\bin/ImportExport.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/ImportExport.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc11\bin/ImportExport.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/ImportExport.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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) ../../../../win32\vc11\bind/ImportExport.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/ImportExport.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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) ../../../../win64\vc11\bind/ImportExport.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/ImportExport.pdb Windows diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj index 8ae6e6ab65..14870c85e9 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc12/ImportExport.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc12\bin/ImportExport.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/ImportExport.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc12\bin/ImportExport.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/ImportExport.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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) ../../../../win32\vc12\bind/ImportExport.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/ImportExport.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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) ../../../../win64\vc12\bind/ImportExport.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/ImportExport.pdb Windows diff --git a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj index 578208f127..564ddcde5d 100644 --- a/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj +++ b/samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj @@ -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" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ 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) ../../../../win32\vc10\bin/Ocaf.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Ocaf.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ 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) ../../../../win64\vc10\bin/Ocaf.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Ocaf.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ 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) ../../../../win32\vc10\bind/Ocaf.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Ocaf.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ 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) ../../../../win64\vc10\bind/Ocaf.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Ocaf.pdb Windows diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj index 25411e599e..0b1dc56c33 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc11\bin/Ocaf.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Ocaf.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc11\bin/Ocaf.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Ocaf.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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) ../../../../win32\vc11\bind/Ocaf.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Ocaf.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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) ../../../../win64\vc11\bind/Ocaf.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Ocaf.pdb Windows diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj index 7b3af0f900..a59c52c170 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc12/Ocaf.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc12\bin/Ocaf.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Ocaf.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc12\bin/Ocaf.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Ocaf.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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) ../../../../win32\vc12\bind/Ocaf.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Ocaf.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CASROOT)/inc;$(CASROOT)\..\tools\ocafbrowser\inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\src;...\..\..\res;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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) ../../../../win64\vc12\bind/Ocaf.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Ocaf.pdb Windows diff --git a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj index 3cb7255326..c35564b43c 100644 --- a/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj +++ b/samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CASROOT)/inc,$(CASROOT)\..\tools\ocafbrowser\inc" + AdditionalIncludeDirectories="..\..\..\,..\..\..\src,...\..\..\res,..\..\..\..\Common,$(CSF_OCCTIncludePath)" PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/Ocaf.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OCCTLibPath)" ProgramDatabaseFile="../../../..\win32\vc8\bin/Ocaf.pdb" SubSystem="2" TargetMachine="1" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Triangulation.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Triangulation.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Triangulation.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Triangulation.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Triangulation.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Triangulation.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Triangulation.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Triangulation.pdb Windows diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj index b1654cae1b..5a72c65286 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Triangulation.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Triangulation.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Triangulation.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Triangulation.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Triangulation.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Triangulation.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Triangulation.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Triangulation.pdb Windows diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj index 934b2bfb1f..7574519635 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc12/Triangulation.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Triangulation.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Triangulation.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Triangulation.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Triangulation.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Triangulation.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Triangulation.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\..\Common;..\..\..\;$(CASROOT)/inc;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\Common;..\..\..\;$(CSF_OCCTIncludePath);..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBRep.lib;TKIGES.lib;TKShHealing.lib;TKSTEP.lib;TKSTEP209.lib;TKSTEPAttr.lib;TKSTEPBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Triangulation.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Triangulation.pdb Windows diff --git a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj index 8b41ddf9bf..89cf7adf1c 100644 --- a/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj +++ b/samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CASROOT)/inc,..\..\..\src" + AdditionalIncludeDirectories="..\..\..\..\Common,..\..\..\,$(CSF_OCCTIncludePath),..\..\..\src" PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/Triangulation.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OCCTLibPath)" ProgramDatabaseFile="../../../..\win32\vc8\bin/Triangulation.pdb" SubSystem="2" TargetMachine="1" @@ -149,7 +149,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,7 +115,7 @@ 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) ../../../../win32\vc10\bin/HLR.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/HLR.pdb Windows MachineX86 @@ -134,7 +134,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +157,7 @@ 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) ../../../../win64\vc10\bin/HLR.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/HLR.pdb Windows MachineX64 @@ -175,7 +175,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -198,7 +198,7 @@ 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) ../../../../win32\vc10\bind/HLR.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/HLR.pdb Windows @@ -217,7 +217,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -240,7 +240,7 @@ 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) ../../../../win64\vc10\bind/HLR.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/HLR.pdb Windows diff --git a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj index 726953d2e5..a3aec284b6 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc11\bin/HLR.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/HLR.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc11\bin/HLR.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/HLR.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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) ../../../../win32\vc11\bind/HLR.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/HLR.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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) ../../../../win64\vc11\bind/HLR.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/HLR.pdb Windows diff --git a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj index 8aad934058..dea20be5c5 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc12/HLR.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -119,7 +119,7 @@ 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) ../../../../win32\vc12\bin/HLR.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/HLR.pdb Windows MachineX86 @@ -138,7 +138,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ 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) ../../../../win64\vc12\bin/HLR.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/HLR.pdb Windows MachineX64 @@ -179,7 +179,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -202,7 +202,7 @@ 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) ../../../../win32\vc12\bind/HLR.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/HLR.pdb Windows @@ -221,7 +221,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);..\..\..\src\ISession2D;..\..\..\res;.\src\Properties;..\..\..\src;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -244,7 +244,7 @@ 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) ../../../../win64\vc12\bind/HLR.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/HLR.pdb Windows diff --git a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj index 11b94acd4b..d674241ae3 100644 --- a/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj +++ b/samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CASROOT)/inc,..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" + AdditionalIncludeDirectories="..\..\..\,..\..\..\..\Common,$(CSF_OCCTIncludePath),..\..\..\src\ISession2D,..\..\..\res,.\src\Properties,..\..\..\src" PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/HLR.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OCCTLibPath)" ProgramDatabaseFile="../../../..\win32\vc8\bin/HLR.pdb" SubSystem="2" TargetMachine="1" @@ -149,7 +149,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -114,7 +114,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Animation.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/Animation.pdb Windows @@ -133,7 +133,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -156,7 +156,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Animation.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/Animation.pdb Windows @@ -176,7 +176,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -199,7 +199,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Animation.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/Animation.pdb Windows MachineX86 @@ -218,7 +218,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -242,7 +242,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Animation.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/Animation.pdb Windows MachineX64 diff --git a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj index ad18f7ae1e..8a9618d75a 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj @@ -95,7 +95,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Animation.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/Animation.pdb Windows @@ -137,7 +137,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -160,7 +160,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Animation.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/Animation.pdb Windows @@ -180,7 +180,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +203,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Animation.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/Animation.pdb Windows MachineX86 @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -246,7 +246,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Animation.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/Animation.pdb Windows MachineX64 diff --git a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj index d592c276b7..4242755d9b 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc12/Animation.vcxproj @@ -95,7 +95,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Animation.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/Animation.pdb Windows @@ -137,7 +137,7 @@ Disabled - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -160,7 +160,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Animation.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/Animation.pdb Windows @@ -180,7 +180,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +203,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Animation.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/Animation.pdb Windows MachineX86 @@ -222,7 +222,7 @@ MaxSpeed OnlyExplicitInline - ..\..\..\;..\..\..\..\Common;$(CASROOT)/inc;%(AdditionalIncludeDirectories) + ..\..\..\;..\..\..\..\Common;$(CSF_OCCTIncludePath);%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -246,7 +246,7 @@ 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;TKBO.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Animation.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/Animation.pdb Windows MachineX64 diff --git a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj index 93fd6b5ce9..c4919392c9 100644 --- a/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj +++ b/samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj @@ -52,7 +52,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -116,7 +116,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/Convert.exe true - ..\..\..\..\win32\vc10\lib;$(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win32\obj\$(TargetFileName).intermediate.manifest ../../../../win32\vc10\bin/Convert.pdb Windows @@ -137,7 +137,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -161,7 +161,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/Convert.exe true - ..\..\..\..\win64\vc10\lib;$(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win64\obj\$(TargetFileName).intermediate.manifest ../../../../win64\vc10\bin/Convert.pdb Windows @@ -181,7 +181,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -205,7 +205,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/Convert.exe true - ..\..\..\..\win32\vc10\libd;$(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win32\objd\$(TargetFileName).intermediate.manifest true ../../../../win32\vc10\bind/Convert.pdb @@ -225,7 +225,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -249,7 +249,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/Convert.exe true - ..\..\..\..\win64\vc10\libd;$(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc10\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win64\objd\$(TargetFileName).intermediate.manifest true ../../../../win64\vc10\bind/Convert.pdb diff --git a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj index 68a933fa85..1ac7aa285d 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -120,7 +120,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/Convert.exe true - ..\..\..\..\win32\vc11\lib;$(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win32\obj\$(TargetFileName).intermediate.manifest ../../../../win32\vc11\bin/Convert.pdb Windows @@ -141,7 +141,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -165,7 +165,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/Convert.exe true - ..\..\..\..\win64\vc11\lib;$(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win64\obj\$(TargetFileName).intermediate.manifest ../../../../win64\vc11\bin/Convert.pdb Windows @@ -185,7 +185,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -209,7 +209,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/Convert.exe true - ..\..\..\..\win32\vc11\libd;$(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win32\objd\$(TargetFileName).intermediate.manifest true ../../../../win32\vc11\bind/Convert.pdb @@ -229,7 +229,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -253,7 +253,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/Convert.exe true - ..\..\..\..\win64\vc11\libd;$(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc11\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win64\objd\$(TargetFileName).intermediate.manifest true ../../../../win64\vc11\bind/Convert.pdb diff --git a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj index a4acb4379d..7f5ee9adf7 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc12/Convert.vcxproj @@ -96,7 +96,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -120,7 +120,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/Convert.exe true - ..\..\..\..\win32\vc12\lib;$(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win32\obj\$(TargetFileName).intermediate.manifest ../../../../win32\vc12\bin/Convert.pdb Windows @@ -141,7 +141,7 @@ MaxSpeed OnlyExplicitInline - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -165,7 +165,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/Convert.exe true - ..\..\..\..\win64\vc12\lib;$(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\lib;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win64\obj\$(TargetFileName).intermediate.manifest ../../../../win64\vc12\bin/Convert.pdb Windows @@ -185,7 +185,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -209,7 +209,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/Convert.exe true - ..\..\..\..\win32\vc12\libd;$(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win32\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win32\objd\$(TargetFileName).intermediate.manifest true ../../../../win32\vc12\bind/Convert.pdb @@ -229,7 +229,7 @@ Disabled - ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CASROOT)/inc;../../../Common;%(AdditionalIncludeDirectories) + ../../../../;../../../../Common;../../../src/WNT;../../../src;../../../src/ISession;$(CSF_OCCTIncludePath);../../../Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -253,7 +253,7 @@ TKVCAF.lib;FWOSPlugin.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKGeomAlgo.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPrim.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;TKOpenGl.lib;TKBRep.lib;TKG2d.lib;TKG3d.lib;TKGeomBase.lib;mfcsample.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/Convert.exe true - ..\..\..\..\win64\vc12\libd;$(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + ..\..\..\..\win64\vc12\libd;$(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) .\win64\objd\$(TargetFileName).intermediate.manifest true ../../../../win64\vc12\bind/Convert.pdb diff --git a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj index 3a4a3f9889..761df2ee20 100644 --- a/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj +++ b/samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CASROOT)/inc,../../../Common" + AdditionalIncludeDirectories="../../../../,../../../../Common,../../../src/WNT,../../../src,../../../src/ISession,$(CSF_OCCTIncludePath),../../../Common" PreprocessorDefinitions="NDEBUG;_WINDOWS;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" @@ -85,7 +85,7 @@ OutputFile="../../../..\win32\vc8\bin/Convert.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CASROOT)/win32/vc8/lib" + AdditionalLibraryDirectories="..\..\..\..\\win32\vc8\lib,$(CSF_OCCTLibPath)" ManifestFile=".\win32\obj\$(TargetFileName).intermediate.manifest" ProgramDatabaseFile="../../../..\win32\vc8\bin/Convert.pdb" SubSystem="2" @@ -151,7 +151,7 @@ Disabled - $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -114,7 +114,7 @@ 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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc10\bind/mfcsample.dll true - $(CASROOT)/win32/vc10/libd;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc10\bind/mfcsample.pdb Windows @@ -134,7 +134,7 @@ Disabled - $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -157,7 +157,7 @@ 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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc10\bind/mfcsample.dll true - $(CASROOT)/win64/vc10/libd;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc10\bind/mfcsample.pdb Windows @@ -178,7 +178,7 @@ MaxSpeed OnlyExplicitInline - $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -201,7 +201,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc10\bin/mfcsample.dll true - $(CASROOT)/win32/vc10/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc10\bin/mfcsample.pdb Windows ../../../../win32\vc10\lib/mfcsample.lib @@ -221,7 +221,7 @@ MaxSpeed OnlyExplicitInline - $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -245,7 +245,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc10\bin/mfcsample.dll true - $(CASROOT)/win64/vc10/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc10\bin/mfcsample.pdb Windows ../../../../win64\vc10\lib/mfcsample.lib diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index 2d7010728b..21a553a569 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -95,7 +95,7 @@ Disabled - $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ 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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc11\bind/mfcsample.dll true - $(CASROOT)/win32/vc11/libd;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc11\bind/mfcsample.pdb Windows @@ -138,7 +138,7 @@ Disabled - $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -161,7 +161,7 @@ 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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc11\bind/mfcsample.dll true - $(CASROOT)/win64/vc11/libd;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc11\bind/mfcsample.pdb Windows @@ -182,7 +182,7 @@ MaxSpeed OnlyExplicitInline - $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -205,7 +205,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc11\bin/mfcsample.dll true - $(CASROOT)/win32/vc11/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc11\bin/mfcsample.pdb Windows ../../../../win32\vc11\lib/mfcsample.lib @@ -225,7 +225,7 @@ MaxSpeed OnlyExplicitInline - $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -249,7 +249,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc11\bin/mfcsample.dll true - $(CASROOT)/win64/vc11/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc11\bin/mfcsample.pdb Windows ../../../../win64\vc11\lib/mfcsample.lib diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj index 7f3a815ef7..8906540287 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -95,7 +95,7 @@ Disabled - $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -118,7 +118,7 @@ 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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc12\bind/mfcsample.dll true - $(CASROOT)/win32/vc12/libd;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win32\vc12\bind/mfcsample.pdb Windows @@ -138,7 +138,7 @@ Disabled - $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -161,7 +161,7 @@ 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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc12\bind/mfcsample.dll true - $(CASROOT)/win64/vc12/libd;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) true ../../../../win64\vc12\bind/mfcsample.pdb Windows @@ -182,7 +182,7 @@ MaxSpeed OnlyExplicitInline - $(CASROOT)/inc;..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -205,7 +205,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win32\vc12\bin/mfcsample.dll true - $(CASROOT)/win32/vc12/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win32\vc12\bin/mfcsample.pdb Windows ../../../../win32\vc12\lib/mfcsample.lib @@ -225,7 +225,7 @@ MaxSpeed OnlyExplicitInline - $(CASROOT)/inc;..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) + $(CSF_OCCTIncludePath);..\..\..\..\Common;..\..\..\..\..\..\Common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_AFXEXT;WINVER=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -249,7 +249,7 @@ TKVCAF.lib;TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.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;TKMesh.lib;TKV3d.lib;TKOpenGl.lib;%(AdditionalDependencies) ../../../../win64\vc12\bin/mfcsample.dll true - $(CASROOT)/win64/vc12/lib;%(AdditionalLibraryDirectories) + $(CSF_OCCTLibPath);%(AdditionalLibraryDirectories) ../../../../win64\vc12\bin/mfcsample.pdb Windows ../../../../win64\vc12\lib/mfcsample.lib diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index 067df07bec..080a4f609b 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -52,7 +52,7 @@ setFileMode( QFileDialog::AnyFile ); } - QString datadir = (QString (qgetenv ("CASROOT").constData()) + QObject::tr( QString("INF_PATH_%1").arg( format ).toLatin1().constData() ) ); - myDlg->clear(); if ( !import ) diff --git a/samples/qt/Tutorial/Tutorial.pro b/samples/qt/Tutorial/Tutorial.pro index c5f9813aef..2a2049f04a 100755 --- a/samples/qt/Tutorial/Tutorial.pro +++ b/samples/qt/Tutorial/Tutorial.pro @@ -3,7 +3,7 @@ CONFIG += debug_and_release qt TARGET = Tutorial -SAMPLESROOT = $$quote($$(CASROOT)/samples/qt) +SAMPLESROOT = $$quote($$(CSF_OCCTSamplesPath)/qt) HEADERS = src/*.h \ $${SAMPLESROOT}/Common/src/*.h \ @@ -25,7 +25,7 @@ RES_DIR = $$quote($$(RES_DIR)) INCLUDEPATH += $$quote($${SAMPLESROOT}/Common/src) INCLUDEPATH += $$quote($${SAMPLESROOT}/Interface/src) -INCLUDEPATH += $$quote($$(CASROOT)/inc) +INCLUDEPATH += $$quote($$(CSF_OCCTIncludePath)) OCCT_DEFINES = $$(CSF_DEFINES) @@ -64,14 +64,13 @@ win32 { DESTDIR = ./win$(ARCH)/$(VCVER)/bind OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/objd MOC_DIR = ./win$(ARCH)/$(VCVER)/mocd - LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/libd } else { DEFINES += NDEBUG DESTDIR = ./win$(ARCH)/$(VCVER)/bin OBJECTS_DIR = ./win$(ARCH)/$(VCVER)/obj MOC_DIR = ./win$(ARCH)/$(VCVER)/moc - LIBS = -L$$(QTDIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib } + LIBS = -L$$(QTDIR)/lib;$$(CSF_OCCTLibPath) DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS } diff --git a/samples/qt/Tutorial/genproj.bat b/samples/qt/Tutorial/genproj.bat index ef41b1da06..c8a0780b7a 100644 --- a/samples/qt/Tutorial/genproj.bat +++ b/samples/qt/Tutorial/genproj.bat @@ -6,6 +6,8 @@ REM Use first argument to specify version of Visual Studio (vc8, vc9, or vc10), REM second argument specifies architecture) (win32 or win64) REM third argument specifies Debug or Release mode +Setlocal EnableDelayedExpansion + call "%~dp0env.bat" %1 %2 %3 set EXT=vcproj diff --git a/samples/qt/Tutorial/msvc.bat b/samples/qt/Tutorial/msvc.bat index 73f137aad8..00e3882241 100644 --- a/samples/qt/Tutorial/msvc.bat +++ b/samples/qt/Tutorial/msvc.bat @@ -1,5 +1,7 @@ @echo off +Setlocal EnableDelayedExpansion + rem Setup environment call "%~dp0env.bat" %1 %2 %3 @@ -8,18 +10,18 @@ set "PRJFILE=%~dp0Tutorial-%VCVER%.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 ( diff --git a/samples/qt/Tutorial/run.bat b/samples/qt/Tutorial/run.bat index 7687c09996..e62d672912 100644 --- a/samples/qt/Tutorial/run.bat +++ b/samples/qt/Tutorial/run.bat @@ -1,3 +1,5 @@ +Setlocal EnableDelayedExpansion + call "%~dp0env.bat" %1 %2 %3 set "BIN_DIR=win%ARCH%\%VCVER%\bind" diff --git a/samples/tcl/DataExchangeDemo.tcl b/samples/tcl/DataExchangeDemo.tcl index 32a592dcff..57d2268e85 100644 --- a/samples/tcl/DataExchangeDemo.tcl +++ b/samples/tcl/DataExchangeDemo.tcl @@ -42,7 +42,9 @@ if { [winfo exists .h ] } { } set ddir . -if { [info exists env(CASROOT)] } { +if { [info exists env(CSF_OCCTDataPath)] } { + set ddir [file join $env(CSF_OCCTDataPath) occ] +} else if { [info exists env(CASROOT)] } { set ddir [file join $env(CASROOT) data occ] } diff --git a/src/DrawResources/DrawDefault b/src/DrawResources/DrawDefault index 47fe8c10f3..bb37408e5a 100755 --- a/src/DrawResources/DrawDefault +++ b/src/DrawResources/DrawDefault @@ -59,33 +59,30 @@ if { [file isdirectory $dir] } { } # set default testing environment -if {[array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != ""} { - if {[file isdirectory $env(OCCT_SHARE_PATH)/tests]} { - if { ! [info exists env(CSF_TestScriptsPath)] } { - set env(CSF_TestScriptsPath) $env(OCCT_SHARE_PATH)/tests - } else { - set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(OCCT_SHARE_PATH)/tests - } - } - - if {[file isdirectory $env(OCCT_SHARE_PATH)/data]} { - if { ! [info exists env(CSF_TestDataPath)] } { - set env(CSF_TestDataPath) $env(OCCT_SHARE_PATH)/data - } else { - set env(CSF_TestDataPath) $env(CSF_TestDataPath)[_path_separator]$env(OCCT_SHARE_PATH)/data - } - } -} -if { [info exists env(CASROOT)] && [file isdirectory $env(CASROOT)/tests] } { +if {[info exists ::env(CSF_OCCTTestsPath)] && [file isdirectory $env(CSF_OCCTTestsPath)]} { + if { ! [info exists env(CSF_TestScriptsPath)] } { + set env(CSF_TestScriptsPath) $env(CSF_OCCTTestsPath) + } else { + set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(CSF_OCCTTestsPath) + } +} elseif { [info exists env(CASROOT)] && [file isdirectory $env(CASROOT)/tests] } { if { ! [info exists env(CSF_TestScriptsPath)] } { - set env(CSF_TestScriptsPath) $env(CASROOT)/tests + set env(CSF_TestScriptsPath) $env(CASROOT)/tests + } else { + set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(CASROOT)/tests + } +} +if {[info exists ::env(CSF_OCCTDataPath)] && [file isdirectory $env(CSF_OCCTDataPath)]} { + if { ! [info exists env(CSF_TestDataPath)] } { + set env(CSF_TestDataPath) $env(CSF_OCCTDataPath) } else { - set env(CSF_TestScriptsPath) $env(CSF_TestScriptsPath)[_path_separator]$env(CASROOT)/tests + set env(CSF_TestDataPath) $env(CSF_TestDataPath)[_path_separator]$env(CSF_OCCTDataPath) } +} elseif { [info exists env(CASROOT)] && [file isdirectory $env(CASROOT)/tests] } { if { ! [info exists env(CSF_TestDataPath)] } { - set env(CSF_TestDataPath) $env(CASROOT)/data + set env(CSF_TestDataPath) $env(CASROOT)/data } else { - set env(CSF_TestDataPath) $env(CSF_TestDataPath)[_path_separator]$env(CASROOT)/data + set env(CSF_TestDataPath) $env(CSF_TestDataPath)[_path_separator]$env(CASROOT)/data } } diff --git a/src/DrawResources/DrawTK.tcl b/src/DrawResources/DrawTK.tcl index f205e37777..8a8c68d484 100644 --- a/src/DrawResources/DrawTK.tcl +++ b/src/DrawResources/DrawTK.tcl @@ -29,9 +29,11 @@ if { [info exists tk_library] } { #fills menu "Load" with submenus proc fillloadmenu {} { - set drawplugpath "$::env(CASROOT)/src/DrawResources/DrawPlugin" - if {[array names ::env OCCT_RESOURCE_PATH] != "" && "$::env(OCCT_RESOURCE_PATH)" != "" && [file exists $::env(OCCT_RESOURCE_PATH)/DrawResources/DrawPlugin]} { - set drawplugpath "$::env(OCCT_RESOURCE_PATH)/DrawResources/DrawPlugin" + set drawplugpath "" + if {[array names ::env CSF_OCCTResourcePath] != "" && "$::env(CSF_OCCTResourcePath)" != "" && [file exists $::env(CSF_OCCTResourcePath)/DrawResources/DrawPlugin]} { + set drawplugpath "$::env(CSF_OCCTResourcePath)/DrawResources/DrawPlugin" + } elseif {[array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/src/DrawResources/DrawPlugin]} { + set drawplugpath "$::env(CASROOT)/src/DrawResources/DrawPlugin" } set chan [open [file nativename $drawplugpath]] @@ -236,9 +238,11 @@ proc vsamples {} { #create list {{category} {title} {filename}} set alistofthree "" - set samplespath "$::env(CASROOT)/samples/tcl/" - if { [array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != "" && [file exists $::env(OCCT_SHARE_PATH)/samples/tcl/]} { - set samplespath "$::env(OCCT_SHARE_PATH)/samples/tcl/" + set samplespath "" + if { [array names ::env CSF_OCCTSamplesPath] != "" && "$::env(CSF_OCCTSamplesPath)" != "" && [file exists $::env(CSF_OCCTSamplesPath)/tcl/]} { + set samplespath "$::env(CSF_OCCTSamplesPath)/tcl/" + } elseif { [array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/samples/tcl/]} { + set samplespath "$::env(CASROOT)/samples/tcl/" } foreach fname [glob -path "${samplespath}" *.tcl] { @@ -406,9 +410,11 @@ proc about {} { set screenwidth [expr {int([winfo screenwidth .]*0.5-200)}] wm geometry .about 400x200+$screenwidth+$screenheight - set logopath "$::env(CASROOT)/src/DrawResources/OCC_logo.png" - if {[array names ::env OCCT_RESOURCE_PATH] != "" && "$::env(OCCT_RESOURCE_PATH)" != "" && [file exists $::env(OCCT_RESOURCE_PATH)/DrawResources/OCC_logo.png]} { - set logopath "$::env(OCCT_RESOURCE_PATH)/DrawResources/OCC_logo.png" + set logopath "" + if {[array names ::env CSF_OCCTResourcePath] != "" && "$::env(CSF_OCCTResourcePath)" != "" && [file exists $::env(CSF_OCCTResourcePath)/DrawResources/OCC_logo.png]} { + set logopath "$::env(CSF_OCCTResourcePath)/DrawResources/OCC_logo.png" + } elseif {[array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/src/DrawResources/OCC_logo.png]} { + set logopath "$::env(CASROOT)/src/DrawResources/OCC_logo.png" } image create photo occlogo -file $logopath -format png @@ -462,13 +468,13 @@ proc _launchBrowser {url} { # Else opens a site with this guide ################################################################ proc openuserguide {} { - if { [array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != "" && [file exists $::env(OCCT_SHARE_PATH)/doc/pdf/user_guides/occt_test_harness.pdf]} { - _launchBrowser $::env(OCCT_SHARE_PATH)/doc/pdf/user_guides/occt_test_harness.pdf - } elseif { [array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != "" && [file exists $::env(OCCT_SHARE_PATH)/doc/overview/html/occt_user_guides__test_harness.html]} { - _launchBrowser $::env(OCCT_SHARE_PATH)/doc/overview/html/occt_user_guides__test_harness.html - } elseif [file exists $::env(CASROOT)/doc/pdf/user_guides/occt_test_harness.pdf] { + if { [array names ::env CSF_OCCTDocPath] != "" && "$::env(CSF_OCCTDocPath)" != "" && [file exists $::env(CSF_OCCTDocPath)/pdf/user_guides/occt_test_harness.pdf]} { + _launchBrowser $::env(CSF_OCCTDocPath)/pdf/user_guides/occt_test_harness.pdf + } elseif { [array names ::env CSF_OCCTDocPath] != "" && "$::env(CSF_OCCTDocPath)" != "" && [file exists $::env(CSF_OCCTDocPath)/overview/html/occt_user_guides__test_harness.html]} { + _launchBrowser $::env(CSF_OCCTDocPath)/overview/html/occt_user_guides__test_harness.html + } elseif { [array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/doc/pdf/user_guides/occt_test_harness.pdf]} { _launchBrowser $::env(CASROOT)/doc/pdf/user_guides/occt_test_harness.pdf - } elseif [file exists $::env(CASROOT)/doc/overview/html/occt_user_guides__test_harness.html] { + } elseif { [array names ::env CASROOT] != "" && "$::env(CASROOT)" != "" && [file exists $::env(CASROOT)/doc/overview/html/occt_user_guides__test_harness.html]} { _launchBrowser $::env(CASROOT)/doc/overview/html/occt_user_guides__test_harness.html } else { launchBrowser {http://dev.opencascade.org/doc/overview/html/occt_user_guides__test_harness.html} diff --git a/src/DrawResources/TKTopTest.tcl b/src/DrawResources/TKTopTest.tcl index 43b701e0ec..064ab3c1a6 100644 --- a/src/DrawResources/TKTopTest.tcl +++ b/src/DrawResources/TKTopTest.tcl @@ -13,14 +13,14 @@ set Draw_GEOMETRY 1 -if {[array names ::env OCCT_RESOURCE_PATH] != "" && "$::env(OCCT_RESOURCE_PATH)" != "" && [file exists $::env(OCCT_RESOURCE_PATH)/DrawResources/CURVES.tcl]} { - source $env(OCCT_RESOURCE_PATH)/DrawResources/CURVES.tcl +if {[array names ::env CSF_OCCTResourcePath] != "" && "$::env(CSF_OCCTResourcePath)" != "" && [file exists $::env(CSF_OCCTResourcePath)/DrawResources/CURVES.tcl]} { + source $env(CSF_OCCTResourcePath)/DrawResources/CURVES.tcl } else { source $env(CASROOT)/src/DrawResources/CURVES.tcl } -if {[array names ::env OCCT_RESOURCE_PATH] != "" && "$::env(OCCT_RESOURCE_PATH)" != "" && [file exists $::env(OCCT_RESOURCE_PATH)/DrawResources/SURFACES.tcl]} { - source $env(OCCT_RESOURCE_PATH)/DrawResources/SURFACES.tcl +if {[array names ::env CSF_OCCTResourcePath] != "" && "$::env(CSF_OCCTResourcePath)" != "" && [file exists $::env(CSF_OCCTResourcePath)/DrawResources/SURFACES.tcl]} { + source $env(CSF_OCCTResourcePath)/DrawResources/SURFACES.tcl } else { source $env(CASROOT)/src/DrawResources/SURFACES.tcl } diff --git a/src/DrawResources/TestCommands.tcl b/src/DrawResources/TestCommands.tcl index defdfd7b2b..62707dae64 100644 --- a/src/DrawResources/TestCommands.tcl +++ b/src/DrawResources/TestCommands.tcl @@ -269,10 +269,6 @@ proc testgrid {args} { } set logdir "results/${prefix}[clock format [clock seconds] -format {%Y-%m-%dT%H%M}]" - if { [array names ::env OCCT_SHARE_PATH] != "" && "$::env(OCCT_SHARE_PATH)" != ""} { - set logdir "$::env(OCCT_SHARE_PATH)/${logdir}" - } - set logdir [file normalize $logdir] } if { [file isdirectory $logdir] && ! $overwrite && ! [catch {glob -directory $logdir *}] } { diff --git a/src/OS/Visualization.tcl b/src/OS/Visualization.tcl index a817f4ce3e..71885b3ccf 100644 --- a/src/OS/Visualization.tcl +++ b/src/OS/Visualization.tcl @@ -25,8 +25,10 @@ proc Visualization:toolkits { } { } if { "$::tcl_platform(platform)" == "windows" } { - if { [info exists ::env(HAVE_D3D)] && "$::env(HAVE_D3D)" == "true" } { - lappend aResult "TKD3DHost" + if { [info exists ::env(HAVE_D3D)] } { + if { "$::env(HAVE_D3D)" == "true" } { + lappend aResult "TKD3DHost" + } } elseif { [info exists ::env(VCVER)] && "$::env(VCVER)" != "vc8" && "$::env(VCVER)" != "vc9" && "$::env(VCVER)" != "vc10" } { lappend aResult "TKD3DHost" } diff --git a/src/TKIVtkDraw/EXTERNLIB b/src/TKIVtkDraw/EXTERNLIB index 5a5e364553..a895f2d994 100644 --- a/src/TKIVtkDraw/EXTERNLIB +++ b/src/TKIVtkDraw/EXTERNLIB @@ -19,3 +19,5 @@ TKIVtk vtkIOImage vtkImagingCore vtkInteractionStyle +vtkRenderingOpenGL +vtkRenderingFreeTypeOpenGL diff --git a/tests/bugs/begin b/tests/bugs/begin index 24cdf412b1..e4474d9aaa 100755 --- a/tests/bugs/begin +++ b/tests/bugs/begin @@ -3,9 +3,6 @@ if { [array get Draw_Groups "TOPOLOGY Check commands"] == "" } { pload TOPTEST pload VISUALIZATION -# set env(CSF_DrawPluginQADefaults) $env(CASROOT)/src/DrawResources/. -# pload QAcommands -# pload -DrawPluginQA QAcommands } # to prevent loops limit to 16 minutes diff --git a/tests/bugs/vis/bug26719_1 b/tests/bugs/vis/bug26719_1 index cf1ca3e1c8..00c5afd051 100644 --- a/tests/bugs/vis/bug26719_1 +++ b/tests/bugs/vis/bug26719_1 @@ -12,7 +12,7 @@ pload VISUALIZATION MODELING vinit vsetdispmode 1 -restore $env(CASROOT)/data/occ/face1.brep f +restore [locate_data_file face1.brep] f vdisplay f box b1 50 50 50 vdisplay b1 -trsfPers zoom -trsfPersPos 0 0 0 diff --git a/tests/demo/samples/anc101 b/tests/demo/samples/anc101 index b19aedd1ea..ca46ff8e3a 100644 --- a/tests/demo/samples/anc101 +++ b/tests/demo/samples/anc101 @@ -1,5 +1,5 @@ # test for creation of ANC101 shape -source $env(CASROOT)/samples/tcl/ANC101.tcl +source $env(CSF_OCCTSamplesPath)/tcl/ANC101.tcl # check result for validity and make a snapshot checkshape result diff --git a/tests/demo/samples/bottle b/tests/demo/samples/bottle index e61d00df36..45cfd6c62f 100644 --- a/tests/demo/samples/bottle +++ b/tests/demo/samples/bottle @@ -1,5 +1,5 @@ # test for creation of bottle as in tutorial (script is in samples) -source $env(CASROOT)/samples/tcl/bottle.tcl +source $env(CSF_OCCTSamplesPath)/tcl/bottle.tcl # check result for validity and make a snapshot checkshape bottle diff --git a/tests/demo/samples/cad b/tests/demo/samples/cad index a2ec5f68bd..bafeb480bf 100644 --- a/tests/demo/samples/cad +++ b/tests/demo/samples/cad @@ -1,5 +1,5 @@ # test for generating funny shape -source $env(CASROOT)/samples/tcl/cad.tcl +source $env(CSF_OCCTSamplesPath)/tcl/cad.tcl # check shape validity and make a snapshot checkshape res diff --git a/tests/demo/samples/cpu b/tests/demo/samples/cpu index c5b15000ee..5251c5578e 100644 --- a/tests/demo/samples/cpu +++ b/tests/demo/samples/cpu @@ -1,5 +1,5 @@ # test for CPU sample -source $env(CASROOT)/samples/tcl/cpu.tcl +source $env(CSF_OCCTSamplesPath)/tcl/cpu.tcl # make a snapshot vdump $imagedir/${test_image}.png diff --git a/tests/demo/samples/cutter b/tests/demo/samples/cutter index 3549d1cc9a..dca60105b5 100644 --- a/tests/demo/samples/cutter +++ b/tests/demo/samples/cutter @@ -1,5 +1,5 @@ # test for creation of cutter shape -source $env(CASROOT)/samples/tcl/cutter.tcl +source $env(CSF_OCCTSamplesPath)/tcl/cutter.tcl # make a snapshot vdump $imagedir/${test_image}.png diff --git a/tests/demo/samples/dimensions b/tests/demo/samples/dimensions index 235b098a14..b218d2fb15 100644 --- a/tests/demo/samples/dimensions +++ b/tests/demo/samples/dimensions @@ -1,4 +1,4 @@ -source $env(CASROOT)/samples/tcl/dimensions.tcl +source $env(CSF_OCCTSamplesPath)/tcl/dimensions.tcl vdump $imagedir/${test_image}.png puts "TEST COMPLETED" diff --git a/tests/demo/samples/dimensionsglsl b/tests/demo/samples/dimensionsglsl index 4c6446bece..606389de8e 100644 --- a/tests/demo/samples/dimensionsglsl +++ b/tests/demo/samples/dimensionsglsl @@ -1,4 +1,4 @@ -source $env(CASROOT)/samples/tcl/dimensions.tcl +source $env(CSF_OCCTSamplesPath)/tcl/dimensions.tcl vcaps -ffp 0 vdump $imagedir/${test_image}.png diff --git a/tests/demo/samples/drill b/tests/demo/samples/drill index 02eb21122c..8cd416b39e 100644 --- a/tests/demo/samples/drill +++ b/tests/demo/samples/drill @@ -1,5 +1,5 @@ # test for creation of drill shape -source $env(CASROOT)/samples/tcl/drill.tcl +source $env(CSF_OCCTSamplesPath)/tcl/drill.tcl # make a snapshot vdump $imagedir/${test_image}.png diff --git a/tests/demo/samples/gehause b/tests/demo/samples/gehause index bed036bc18..0a64ab14ee 100644 --- a/tests/demo/samples/gehause +++ b/tests/demo/samples/gehause @@ -1,5 +1,5 @@ # test for creation of MBBGehauseRohteil shape -source $env(CASROOT)/samples/tcl/MBBGehauseRohteil.tcl +source $env(CSF_OCCTSamplesPath)/tcl/MBBGehauseRohteil.tcl # check result for validity and make a snapshot checkshape result diff --git a/tests/demo/samples/materials b/tests/demo/samples/materials index 7ef5cda061..197389c00d 100644 --- a/tests/demo/samples/materials +++ b/tests/demo/samples/materials @@ -1,5 +1,5 @@ # test for visual properties of materials in 3d viewer -source $env(CASROOT)/samples/tcl/materials.tcl +source $env(CSF_OCCTSamplesPath)/tcl/materials.tcl # make a snapshot vdump $imagedir/${test_image}.png diff --git a/tests/demo/samples/pencil b/tests/demo/samples/pencil index e6d2800afb..60e7d06d89 100644 --- a/tests/demo/samples/pencil +++ b/tests/demo/samples/pencil @@ -1,5 +1,5 @@ # test for generating funny shape -source $env(CASROOT)/samples/tcl/pencil.tcl +source $env(CSF_OCCTSamplesPath)/tcl/pencil.tcl # check shape validity and make a snapshot XGetOneShape res D diff --git a/tests/demo/samples/penrose b/tests/demo/samples/penrose index ccb0d98cfa..617060c5bf 100644 --- a/tests/demo/samples/penrose +++ b/tests/demo/samples/penrose @@ -1,5 +1,5 @@ # test for generating funny shape -source $env(CASROOT)/samples/tcl/Penrose.tcl +source $env(CSF_OCCTSamplesPath)/tcl/Penrose.tcl # make a snapshot vdump $imagedir/${test_image}.png diff --git a/tests/demo/samples/raytrace b/tests/demo/samples/raytrace index a98b952cff..19c90cfc33 100644 --- a/tests/demo/samples/raytrace +++ b/tests/demo/samples/raytrace @@ -1,4 +1,4 @@ -source $env(CASROOT)/samples/tcl/raytrace.tcl +source $env(CSF_OCCTSamplesPath)/tcl/raytrace.tcl vdump $imagedir/${test_image}.png puts "TEST COMPLETED" diff --git a/tests/demo/samples/snowflake b/tests/demo/samples/snowflake index 8a977da56e..ddc462e585 100644 --- a/tests/demo/samples/snowflake +++ b/tests/demo/samples/snowflake @@ -1,5 +1,5 @@ # test for generating funny shape -source $env(CASROOT)/samples/tcl/snowflake.tcl +source $env(CSF_OCCTSamplesPath)/tcl/snowflake.tcl # make a snapshot vdump $imagedir/${test_image}.png diff --git a/tests/demo/samples/xde b/tests/demo/samples/xde index 72c2d74002..e306ae3247 100644 --- a/tests/demo/samples/xde +++ b/tests/demo/samples/xde @@ -1,5 +1,5 @@ # test for XDE sample -source $env(CASROOT)/samples/tcl/xde.tcl +source $env(CSF_OCCTSamplesPath)/tcl/xde.tcl # make a snapshot vdump $imagedir/${test_image}.png diff --git a/tests/v3d/materials/bug24855 b/tests/v3d/materials/bug24855 index 6ed0babcfd..7ae32e91eb 100644 --- a/tests/v3d/materials/bug24855 +++ b/tests/v3d/materials/bug24855 @@ -39,4 +39,4 @@ testmat $imagedir ${casename}_rt vclear vrenderparams -rasterization vtextureenv off -source $env(CASROOT)/samples/tcl/materials.tcl +source $env(CSF_OCCTSamplesPath)/tcl/materials.tcl diff --git a/tests/v3d/materials/bug24872_1 b/tests/v3d/materials/bug24872_1 index 20ce1d01aa..9b5d29c183 100644 --- a/tests/v3d/materials/bug24872_1 +++ b/tests/v3d/materials/bug24872_1 @@ -6,5 +6,5 @@ puts "" # Support of emission color in Phong shader and ray-tracing ########################################################### -source $env(CASROOT)/samples/tcl/materials.tcl +source $env(CSF_OCCTSamplesPath)/tcl/materials.tcl vshaderprog phong diff --git a/tests/v3d/materials/bug24872_2 b/tests/v3d/materials/bug24872_2 index 26ccadd600..8f3624c7fe 100644 --- a/tests/v3d/materials/bug24872_2 +++ b/tests/v3d/materials/bug24872_2 @@ -6,5 +6,5 @@ puts "" # Support of emission color in Phong shader and ray-tracing ########################################################### -source $env(CASROOT)/samples/tcl/materials.tcl +source $env(CSF_OCCTSamplesPath)/tcl/materials.tcl vrenderparams -raytrace diff --git a/tests/xml/ocaf_xml/begin b/tests/xml/ocaf_xml/begin index dc553b8a28..cdd997c926 100755 --- a/tests/xml/ocaf_xml/begin +++ b/tests/xml/ocaf_xml/begin @@ -1,4 +1,5 @@ -set SchemaFile [file join $env(CASROOT) src XmlOcafResource XmlOcaf.xsd] +# Note: we use CSF_OCCTResourcePath and not CSF_XmlOcafResource to allow running from Visual Studio in CMake build +set SchemaFile [file join $env(CSF_OCCTResourcePath) XmlOcafResource XmlOcaf.xsd] set FileSuffix "xml" # Create a new document and set UndoLimit diff --git a/tests/xml/xcaf_xml/begin b/tests/xml/xcaf_xml/begin index 4279c686e6..91f69c7891 100755 --- a/tests/xml/xcaf_xml/begin +++ b/tests/xml/xcaf_xml/begin @@ -1,4 +1,5 @@ -set SchemaFile [file join $env(CASROOT) src XmlOcafResource XmlXcaf.xsd] +# Note: we use CSF_OCCTResourcePath and not CSF_XmlOcafResource to allow running from Visual Studio in CMake build +set SchemaFile [file join $env(CSF_OCCTResourcePath) XmlOcafResource XmlXcaf.xsd] pload XDE set FileSuffix "xml" -- 2.20.1