0029684: Configuration: modification of build Inspector tool standalo…

…ne on occt

- samples/tools/TStandalone is removed, to build Inspector out of OCCT, CMake should use tools/CMakeLists.txt fileName
- samples/tools/TInspectorEXE is moved to tools/TInspectorEXE
- TInspectorAPI_Version.hxx provides compilation inspector with earlier version of OCCT.

CMakeLists.txt

@@ -805,6 +805,8 @@ endif()
 # list <TOOLNAME>_TOOLKITS is created foreach tool and contains its toolkits
 # list <OCCT_TOOLS> will contain all tools
 if (BUILD_Inspector)
+  add_definitions (-DHAVE_Inspector)
+
   OCCT_MODULES_AND_TOOLKITS (TOOLS "TOOL_TOOLKITS" OCCT_TOOLS)
   foreach (OCCT_TOOL ${OCCT_TOOLS})
     list (APPEND BUILD_TOOL_TOOLKITS ${${OCCT_TOOL}_TOOL_TOOLKITS})
@@ -1028,11 +1030,6 @@ if (BUILD_Inspector OR BUILD_MODULE_QtSamples)
     message (STATUS "Info: qt samples excluded due to BUILD_MODULE_QtSamples is disabled")
   endif()
 
-  if (NOT BUILD_Inspector)
-    list (REMOVE_ITEM OCCT_SAMPLES tools)
-    message (STATUS "Info: TInspectorEXE sample excluded due to BUILD_Inspector is disabled")
-  endif()
-
   foreach (OCCT_SAMPLE ${OCCT_SAMPLES})
     list (APPEND BUILD_SAMPLE_TOOLKITS ${${OCCT_SAMPLE}_SAMPLES_TOOLKITS})
 
@@ -1061,8 +1058,9 @@ if (BUILD_TOOL_TOOLKITS)
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
   endif()
 
+  set (OpenCASCADE_BINARY_DIR "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
   # patch TInspectorEXE
-  OCCT_CONFIGURE ("adm/templates/TInspectorEXE.vcxproj.user.in" "${CMAKE_BINARY_DIR}/samples/tools/TInspectorEXE/TInspectorEXE.vcxproj.user")
+  OCCT_CONFIGURE ("adm/templates/TInspectorEXE.vcxproj.user.in" "${CMAKE_BINARY_DIR}/tools/TInspectorEXE/TInspectorEXE.vcxproj.user")
 endif()
 
 # Prepare variables for configuration of OpenCASCADE cmake config file

adm/SAMPLES

@@ -1,2 +1 @@
-qt AndroidQt FuncDemo IESample Tutorial
-tools TInspectorEXE
+qt AndroidQt FuncDemo IESample Tutorial

adm/TOOLS

@@ -1,4 +1,4 @@
 TModelingData TKShapeView
 TVisualization TKView TKVInspector
 TApplicationFramework TKTreeModel TKTInspectorAPI TKDFBrowser
-TTool TKTInspector TKToolsDraw
+TTool TKTInspector TKToolsDraw TInspectorEXE

adm/templates/TInspectorEXE.vcxproj.user.in

@@ -4,7 +4,7 @@
   <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
 CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
 QTDIR=@3RDPARTY_QT_DIR@
-PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
+PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@;%PATH%
  </LocalDebuggerEnvironment>
  <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
  <LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
@@ -13,7 +13,7 @@ PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
   <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
 CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
 QTDIR=@3RDPARTY_QT_DIR@
-PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
+PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@i;%PATH%
  </LocalDebuggerEnvironment>
  <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
  <LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>
@@ -22,7 +22,7 @@ PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
   <LocalDebuggerEnvironment>CASROOT=@CMAKE_SOURCE_DIR@
 CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data
 QTDIR=@3RDPARTY_QT_DIR@
-PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;%PATH%
+PATH=@3RDPARTY_DLL_DIRS_FOR_PATH@;@OpenCASCADE_BINARY_DIR@d;%PATH%
  </LocalDebuggerEnvironment>
  <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
  <LocalDebuggerWorkingDirectory>@CMAKE_BINARY_DIR@</LocalDebuggerWorkingDirectory>