0031777: Visualization - improve SelectMgr_EntityOwner to process selection scheme

The selection scheme has been propagated to Owner object interface, and the
AIS_Selection::Select() method has been replaced to unify the logic.

.tgitconfig

@@ -1,3 +1,3 @@
-[bugtraq]
+[bugtraq]
-	url = https://tracker.dev.opencascade.org/view.php?id=%BUGID%
+	url = https://tracker.dev.opencascade.org/view.php?id=%BUGID%
-	logregex = "(\\s)(00|#)\\d+(?!\\w)\n(\\d+)"
+	logregex = "(\\s)(00|#)\\d+(?!\\w)\n(\\d+)"

adm/CMPLRS

@@ -1,18 +1,18 @@
-wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
+wnt WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
-lin WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
+lin WOKSteps_exec_link DRAWEXE #WOKStep_EXELink(exec.tks)
-
+
-wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
-wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_cxx b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
-wnt cmplrs_cxx Aspect (wnt cmplrs_cxx b) -D_AFXDLL
+wnt cmplrs_cxx Aspect (wnt cmplrs_cxx b) -D_AFXDLL
-wnt cmplrs_cxx (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL
+wnt cmplrs_cxx (wnt cmplrs_cxx b) -D_AFXDLL -D_AFXDLL
-
+
-wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c f -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
-wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+wnt cmplrs_c b -D_CRT_SECURE_NO_DEPRECATE -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
-wnt cmplrs_c NIS (wnt cmplrs_c b) -DSILGL -DSILGL_VRS=50
+wnt cmplrs_c NIS (wnt cmplrs_c b) -DSILGL -DSILGL_VRS=50
-
+
-lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+lin cmplrs_cxx f -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
-lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
+lin cmplrs_cxx b -DOCC_CONVERT_SIGNALS -D_GNU_SOURCE=1 -DHAVE_FREEIMAGE -DHAVE_TBB -DHAVE_OPENCL
-
+
-lin cmplrs_c f -D_GNU_SOURCE=1 -fexceptions
+lin cmplrs_c f -D_GNU_SOURCE=1 -fexceptions
-lin cmplrs_c b -D_GNU_SOURCE=1 -fexceptions
+lin cmplrs_c b -D_GNU_SOURCE=1 -fexceptions
-
+

adm/MODULES

@@ -1,7 +1,7 @@
-FoundationClasses TKernel TKMath
+FoundationClasses TKernel TKMath
-ModelingData TKG2d TKG3d TKGeomBase TKBRep
+ModelingData TKG2d TKG3d TKGeomBase TKBRep
-ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
+ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
-Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
+Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
-ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
+ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe
+DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe
-Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
+Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE

adm/RESOURCES

@@ -1,12 +1,12 @@
-DrawResources
+DrawResources
-StdResource
+StdResource
-SHMessage
+SHMessage
-Textures
+Textures
-Shaders
+Shaders
-XRResources
+XRResources
-XSMessage
+XSMessage
-XSTEPResource
+XSTEPResource
-XmlOcafResource
+XmlOcafResource
-UnitsAPI/Units.dat
+UnitsAPI/Units.dat
-TObj/TObj.msg
+TObj/TObj.msg
-BOPAlgo/BOPAlgo.msg
+BOPAlgo/BOPAlgo.msg

adm/SAMPLES_RESOURCES

@@ -1,3 +1,3 @@
-qt/Common/res/
+qt/Common/res/
-qt/Tutorial/res/
+qt/Tutorial/res/
 qt/OCCTOverview/res/

adm/TOOLS

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

adm/cmake/3rdparty_macro.cmake

@@ -1,365 +1,365 @@
-##
+##
-
+
-if(3RDPARTY_MACRO_ALREADY_INCLUDED)
+if(3RDPARTY_MACRO_ALREADY_INCLUDED)
-  return()
+  return()
-endif()
+endif()
-set(3RDPARTY_MACRO_ALREADY_INCLUDED 1)
+set(3RDPARTY_MACRO_ALREADY_INCLUDED 1)
-
+
-
+
-macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME_DEBUG_SUFFIX)
+macro (THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_CSF_NAME LIBRARY_NAME_DEBUG_SUFFIX)
-
+
-  if (NOT DEFINED INSTALL_${PRODUCT_NAME} AND BUILD_SHARED_LIBS)
+  if (NOT DEFINED INSTALL_${PRODUCT_NAME} AND BUILD_SHARED_LIBS)
-    set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "${INSTALL_${PRODUCT_NAME}_DESCR}")
+    set (INSTALL_${PRODUCT_NAME} OFF CACHE BOOL "${INSTALL_${PRODUCT_NAME}_DESCR}")
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DIR)
+  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}")
+    set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}")
-  endif()
+  endif()
-
+
-  # include occt macros. compiler_bitness, os_wiht_bit, compiler
+  # include occt macros. compiler_bitness, os_wiht_bit, compiler
-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
+
-  # specify product folder in connectin with 3RDPARTY_DIR
+  # specify product folder in connectin with 3RDPARTY_DIR
-  if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+  if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-    #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_${PRODUCT_NAME}_DIR PATH "The directory containing ${PRODUCT_NAME}")
+    #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_${PRODUCT_NAME}_DIR PATH "The directory containing ${PRODUCT_NAME}")
-
+
-    if (NOT 3RDPARTY_${PRODUCT_NAME}_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+    if (NOT 3RDPARTY_${PRODUCT_NAME}_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" ${PRODUCT_NAME} ${PRODUCT_NAME}_DIR_NAME)
+      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" ${PRODUCT_NAME} ${PRODUCT_NAME}_DIR_NAME)
-      if (${PRODUCT_NAME}_DIR_NAME)
+      if (${PRODUCT_NAME}_DIR_NAME)
-        set (3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
+        set (3RDPARTY_${PRODUCT_NAME}_DIR "${3RDPARTY_DIR}/${${PRODUCT_NAME}_DIR_NAME}" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-  else()
+  else()
-    #set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
+    #set (3RDPARTY_${PRODUCT_NAME}_DIR "" CACHE PATH "The directory containing ${PRODUCT_NAME}" FORCE)
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
+  if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR           "" CACHE PATH "the path of ${HEADER_NAME}")
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR           "" CACHE PATH "the path of ${HEADER_NAME}")
-  endif()
+  endif()
-
+
-  separate_arguments (${LIBRARY_CSF_NAME})
+  separate_arguments (${LIBRARY_CSF_NAME})
-  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-    string (REPLACE "." "" LIBRARY_NAME "${LIBRARY_NAME}")
+    string (REPLACE "." "" LIBRARY_NAME "${LIBRARY_NAME}")
-    if (BUILD_SHARED_LIBS)
+    if (BUILD_SHARED_LIBS)
-      if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} OR NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}")
+      if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} OR NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}")
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}               "" CACHE FILEPATH "${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}               "" CACHE FILEPATH "${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-      endif()
+      endif()
-
+
-      if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME})
+      if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME})
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}           "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}           "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
-      endif()
+      endif()
-
+
-      if (WIN32)
+      if (WIN32)
-        if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} OR NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}")
+        if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} OR NOT 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}")
-          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}                 "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}                 "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-        endif()
+        endif()
-      endif()
+      endif()
-
+
-      if (WIN32)
+      if (WIN32)
-        if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME})
+        if (NOT DEFINED 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME})
-          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}             "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}             "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
-        endif()
+        endif()
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
+    # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
-    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR PATH "the path to ${PRODUCT_NAME}")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR PATH "the path to ${PRODUCT_NAME}")
-      if (BUILD_SHARED_LIBS)
+      if (BUILD_SHARED_LIBS)
-        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} FILEPATH "the path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
+        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} FILEPATH "the path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
-
+
-        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}}")
+        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}}")
-          get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}}" PATH)
+          get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME}}" PATH)
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-        else()
+        else()
-          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
+          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"")
-        endif()
+        endif()
-
+
-        if (WIN32)
+        if (WIN32)
-          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} FILEPATH "the path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
+          CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} FILEPATH "the path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
-
+
-          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}}")
+          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}}")
-            get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}}" PATH)
+            get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME}}" PATH)
-            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-          else()
+          else()
-            CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
+            CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_${PRODUCT_NAME}_DIR 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"")
-          endif()
+          endif()
-        endif()
+        endif()
-      endif()
+      endif()
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-  # header
+  # header
-  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+  if (NOT 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-
+
-    # set 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR
+    # set 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to ${HEADER_NAME}" FORCE)
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to ${HEADER_NAME}" FORCE)
-
+
-    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
+    if (3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}")
-      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
+      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
-                                                      PATHS ${3RDPARTY_${PRODUCT_NAME}_DIR}
+                                                      PATHS ${3RDPARTY_${PRODUCT_NAME}_DIR}
-                                                      PATH_SUFFIXES include inc headers
+                                                      PATH_SUFFIXES include inc headers
-                                                      CMAKE_FIND_ROOT_PATH_BOTH
+                                                      CMAKE_FIND_ROOT_PATH_BOTH
-                                                      NO_DEFAULT_PATH)
+                                                      NO_DEFAULT_PATH)
-    else()
+    else()
-      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
+      find_path (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR NAMES ${HEADER_NAME}
-                                                      PATH_SUFFIXES include inc headers
+                                                      PATH_SUFFIXES include inc headers
-                                                      CMAKE_FIND_ROOT_PATH_BOTH)
+                                                      CMAKE_FIND_ROOT_PATH_BOTH)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+  if (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
+    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}")
-  else()
+  else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR)
-
+
-    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "" CACHE FILEPATH "The path to ${HEADER_NAME}" FORCE)
+    set (3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "" CACHE FILEPATH "The path to ${HEADER_NAME}" FORCE)
-  endif()
+  endif()
-
+
-  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+  foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-    string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+    string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
-#    if (BUILD_SHARED_LIBS)
+#    if (BUILD_SHARED_LIBS)
-      # library
+      # library
-      if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
+      if (NOT 3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
-        set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+        set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
-
+
-        set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
+        set (${PRODUCT_NAME}_PATH_SUFFIXES lib)
-        if (WIN32)
+        if (WIN32)
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} win${COMPILER_BITNESS}/${COMPILER}/lib)
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} win${COMPILER_BITNESS}/${COMPILER}/lib)
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/win${COMPILER_BITNESS})
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/win${COMPILER_BITNESS})
-        endif()
+        endif()
-        if (ANDROID)
+        if (ANDROID)
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} libs/${ANDROID_ABI})
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} libs/${ANDROID_ABI})
-        endif()
+        endif()
-        if(UNIX AND NOT APPLE AND NOT ANDROID)
+        if(UNIX AND NOT APPLE AND NOT ANDROID)
-          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/linux${COMPILER_BITNESS})
+          set (${PRODUCT_NAME}_PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES} lib/linux${COMPILER_BITNESS})
-        endif()
+        endif()
-
+
-        # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
+        # set 3RDPARTY_${PRODUCT_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_LIBRARY
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-
+
-        if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}"))
+        if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}"))
-          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
+          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
-                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                                PATHS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
+                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                                                CMAKE_FIND_ROOT_PATH_BOTH
+                                                                                CMAKE_FIND_ROOT_PATH_BOTH
-                                                                                NO_DEFAULT_PATH)
+                                                                                NO_DEFAULT_PATH)
-          if ("${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
+          if ("${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
-            # find directory recursive
+            # find directory recursive
-            FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} "${${PRODUCT_NAME}_PATH_SUFFIXES}" SUBDIR_NAME)
+            FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} "${${PRODUCT_NAME}_PATH_SUFFIXES}" SUBDIR_NAME)
-            if (NOT "${SUBDIR_NAME}" STREQUAL "")
+            if (NOT "${SUBDIR_NAME}" STREQUAL "")
-              find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
+              find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
-                                                           PATHS "${SUBDIR_NAME}"
+                                                           PATHS "${SUBDIR_NAME}"
-                                                           PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
+                                                           PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                           CMAKE_FIND_ROOT_PATH_BOTH
+                                                           CMAKE_FIND_ROOT_PATH_BOTH
-                                                           NO_DEFAULT_PATH)
+                                                           NO_DEFAULT_PATH)
-            endif()
+            endif()
-          endif()
+          endif()
-        else()
+        else()
-          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
+          find_library (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME}
-                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
+                                                                                PATH_SUFFIXES ${${PRODUCT_NAME}_PATH_SUFFIXES}
-                                                                                CMAKE_FIND_ROOT_PATH_BOTH)
+                                                                                CMAKE_FIND_ROOT_PATH_BOTH)
-        endif()
+        endif()
-
+
-        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
+        if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}")
-          get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" PATH)
+          get_filename_component (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}}" PATH)
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-        else()
+        else()
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-        endif()
+        endif()
-      endif()
+      endif()
-
+
-      if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
+      if (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
-        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
+        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
-      else()
+      else()
-        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX})
+        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX})
-
+
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "The path to ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-      endif()
+      endif()
-
+
-      # shared library
+      # shared library
-      if (WIN32)
+      if (WIN32)
-        if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}")
+        if (NOT 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} OR NOT EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}")
-
+
-          set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
+          set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-
+
-          # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
+          # set 3RDPARTY_${PRODUCT_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${PRODUCT_NAME}_DLL
-          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND" CACHE FILEPATH "The path to ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-
+
-          if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
+          if ((3RDPARTY_${PRODUCT_NAME}_DIR AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DIR}") OR (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}"))
-            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
+            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}  NAMES ${LIBRARY_NAME}
-                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
+                                                                               PATHS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME}}" "${3RDPARTY_${PRODUCT_NAME}_DIR}"
-                                                                               PATH_SUFFIXES bin win${COMPILER_BITNESS}/${COMPILER}/bin bin/win${COMPILER_BITNESS}
+                                                                               PATH_SUFFIXES bin win${COMPILER_BITNESS}/${COMPILER}/bin bin/win${COMPILER_BITNESS}
-                                                                               NO_DEFAULT_PATH)
+                                                                               NO_DEFAULT_PATH)
-            if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
+            if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} STREQUAL "3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}-NOTFOUND")
-              # find directory recursive
+              # find directory recursive
-              FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} bin SUBDIR_NAME)
+              FIND_SUBDIRECTORY (${3RDPARTY_${PRODUCT_NAME}_DIR} bin SUBDIR_NAME)
-              if (NOT "${SUBDIR_NAME}" STREQUAL "")
+              if (NOT "${SUBDIR_NAME}" STREQUAL "")
-                find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
+                find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME_SUFFIX}
-                                                             PATHS "${SUBDIR_NAME}"
+                                                             PATHS "${SUBDIR_NAME}"
-                                                             PATH_SUFFIXES bin
+                                                             PATH_SUFFIXES bin
-                                                             NO_DEFAULT_PATH)
+                                                             NO_DEFAULT_PATH)
-              endif()
+              endif()
-            endif()
+            endif()
-          else()
+          else()
-            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME} PATH_SUFFIXES bin)
+            find_library (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} NAMES ${LIBRARY_NAME} PATH_SUFFIXES bin)
-          endif()
+          endif()
-
+
-          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}")
+          if (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} AND EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}")
-            get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" PATH)
+            get_filename_component (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" PATH)
-            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
+            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}" CACHE PATH "The directory containing ${PRODUCT_NAME} library \"${LIBRARY_NAME}\"" FORCE)
-          else()
+          else()
-            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+            set (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} "" CACHE PATH "The directory containing ${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-
+
-            set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
+            set (3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX} "" CACHE FILEPATH "${PRODUCT_NAME} shared library \"${LIBRARY_NAME}\"" FORCE)
-          endif()
+          endif()
-        endif()
+        endif()
-
+
-        if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
+        if (3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX} OR EXISTS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
-          list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
+          list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}}")
-        else()
+        else()
-          list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX})
+          list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX})
-        endif()
+        endif()
-      endif()
+      endif()
-
+
-      if (WIN32)
+      if (WIN32)
-        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS "")
+        set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS "")
-      else()
+      else()
-        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "")
+        set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "")
-      endif()
+      endif()
-
+
-      foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+      foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-        string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+        string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
-        if (WIN32)
+        if (WIN32)
-          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${3RDPARTY_${PRODUCT_NAME}_DLL_DIRS}")
+          set (3RDPARTY_${PRODUCT_NAME}_DLL_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${3RDPARTY_${PRODUCT_NAME}_DLL_DIRS}")
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}")
-        else()
+        else()
-          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS}")
+          set (3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIRS}")
-        endif()
+        endif()
-      endforeach()
+      endforeach()
-
+
-      set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "")
+      set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "")
-
+
-      if (INSTALL_${PRODUCT_NAME})
+      if (INSTALL_${PRODUCT_NAME})
-        OCCT_MAKE_OS_WITH_BITNESS()
+        OCCT_MAKE_OS_WITH_BITNESS()
-        OCCT_MAKE_COMPILER_SHORT_NAME()
+        OCCT_MAKE_COMPILER_SHORT_NAME()
-        set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
+        set (USED_3RDPARTY_${PRODUCT_NAME}_DIR "")
-
+
-        if (WIN32)
+        if (WIN32)
-          if (SINGLE_GENERATOR)
+          if (SINGLE_GENERATOR)
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" DESTINATION "${INSTALL_DIR_BIN}")
+            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}" DESTINATION "${INSTALL_DIR_BIN}")
-          else()
+          else()
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
+            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
-                     CONFIGURATIONS Release
+                     CONFIGURATIONS Release
-                     DESTINATION "${INSTALL_DIR_BIN}")
+                     DESTINATION "${INSTALL_DIR_BIN}")
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
+            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
-                     CONFIGURATIONS RelWithDebInfo
+                     CONFIGURATIONS RelWithDebInfo
-                     DESTINATION "${INSTALL_DIR_BIN}i")
+                     DESTINATION "${INSTALL_DIR_BIN}i")
-            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
+            install (FILES "${3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX}}"
-                     CONFIGURATIONS Debug
+                     CONFIGURATIONS Debug
-                     DESTINATION "${INSTALL_DIR_BIN}d")
+                     DESTINATION "${INSTALL_DIR_BIN}d")
-          endif()
+          endif()
-        else()
+        else()
-          get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} REALPATH)
+          get_filename_component(ABS_PATH ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} REALPATH)
-
+
-          if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
+          if ("${PRODUCT_NAME}" STREQUAL "FREEIMAGE")
-            get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} NAME)
+            get_filename_component(FREEIMLIB ${3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX}} NAME)
-
+
-            if (SINGLE_GENERATOR)
+            if (SINGLE_GENERATOR)
-              install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${FREEIMLIB}.3)
+              install (FILES "${ABS_PATH}" DESTINATION "${INSTALL_DIR_LIB}" RENAME ${FREEIMLIB}.3)
-            else()
+            else()
-              install (FILES "${ABS_PATH}"
+              install (FILES "${ABS_PATH}"
-                       CONFIGURATIONS Release
+                       CONFIGURATIONS Release
-                       DESTINATION "${INSTALL_DIR_LIB}"
+                       DESTINATION "${INSTALL_DIR_LIB}"
-                       RENAME ${FREEIMLIB}.3)
+                       RENAME ${FREEIMLIB}.3)
-              install (FILES "${ABS_PATH}"
+              install (FILES "${ABS_PATH}"
-                       CONFIGURATIONS RelWithDebInfo
+                       CONFIGURATIONS RelWithDebInfo
-                       DESTINATION "${INSTALL_DIR_LIB}i"
+                       DESTINATION "${INSTALL_DIR_LIB}i"
-                       RENAME ${FREEIMLIB}.3)
+                       RENAME ${FREEIMLIB}.3)
-              install (FILES "${ABS_PATH}"
+              install (FILES "${ABS_PATH}"
-                       CONFIGURATIONS Debug
+                       CONFIGURATIONS Debug
-                       DESTINATION "${INSTALL_DIR_LIB}d"
+                       DESTINATION "${INSTALL_DIR_LIB}d"
-                       RENAME ${FREEIMLIB}.3)
+                       RENAME ${FREEIMLIB}.3)
-            endif()
+            endif()
-          endif()
+          endif()
-
+
-        endif()
+        endif()
-      else()
+      else()
-        # the library directory for using by the executable
+        # the library directory for using by the executable
-        foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
+        foreach (LIBRARY_NAME ${${LIBRARY_CSF_NAME}})
-          string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
+          string (REPLACE "." "" LIBRARY_NAME_SUFFIX "${LIBRARY_NAME}")
-          if (WIN32)
+          if (WIN32)
-            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
+            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}};${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
-          else()
+          else()
-            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
+            set (USED_3RDPARTY_${PRODUCT_NAME}_DIRS "${3RDPARTY_${PRODUCT_NAME}_LIBRARY_DIR_${LIBRARY_NAME_SUFFIX}}:${USED_3RDPARTY_${PRODUCT_NAME}_DIRS}")
-          endif()
+          endif()
-        endforeach()
+        endforeach()
-        if (WIN32)
+        if (WIN32)
-          set (USED_3RDPARTY_${PRODUCT_NAME}_DIR ${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}})
+          set (USED_3RDPARTY_${PRODUCT_NAME}_DIR ${3RDPARTY_${PRODUCT_NAME}_DLL_DIR_${LIBRARY_NAME_SUFFIX}})
-        endif()
+        endif()
-      endif()
+      endif()
-
+
-      mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})
+      mark_as_advanced (3RDPARTY_${PRODUCT_NAME}_LIBRARY_${LIBRARY_NAME_SUFFIX} 3RDPARTY_${PRODUCT_NAME}_DLL_${LIBRARY_NAME_SUFFIX})
-#    endif()
+#    endif()
-  endforeach()
+  endforeach()
-endmacro()
+endmacro()
-
+
-macro (COMPLIANCE_PRODUCT_CONSISTENCY LIBNAME)
+macro (COMPLIANCE_PRODUCT_CONSISTENCY LIBNAME)
-  if (3RDPARTY_${LIBNAME}_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DIR}")
+  if (3RDPARTY_${LIBNAME}_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DIR}")
-    # include dir
+    # include dir
-    set (DOES_PATH_CONTAIN FALSE)
+    set (DOES_PATH_CONTAIN FALSE)
-    if (3RDPARTY_${LIBNAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
+    if (3RDPARTY_${LIBNAME}_INCLUDE_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
-      string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
+      string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_INCLUDE_DIR}")
-    endif()
+    endif()
-    if (NOT DOES_PATH_CONTAIN)
+    if (NOT DOES_PATH_CONTAIN)
-      set (3RDPARTY_${LIBNAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of ${LIBNAME}" FORCE)
+      set (3RDPARTY_${LIBNAME}_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of ${LIBNAME}" FORCE)
-    endif()
+    endif()
-
+
-    if (BUILD_SHARED_LIBS)
+    if (BUILD_SHARED_LIBS)
-      # library dir
+      # library dir
-      set (DOES_PATH_CONTAIN FALSE)
+      set (DOES_PATH_CONTAIN FALSE)
-      if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+      if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
-        string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+        string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
-      endif()
+      endif()
-      if (NOT DOES_PATH_CONTAIN)
+      if (NOT DOES_PATH_CONTAIN)
-        set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
+        set (3RDPARTY_${LIBNAME}_LIBRARY_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} library" FORCE)
-      endif()
+      endif()
-
+
-      # shared library dir
+      # shared library dir
-      if (WIN32)
+      if (WIN32)
-        set (DOES_PATH_CONTAIN FALSE)
+        set (DOES_PATH_CONTAIN FALSE)
-        if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+        if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
-          string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+          string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL_DIR}")
-        endif()
+        endif()
-        if (NOT DOES_PATH_CONTAIN)
+        if (NOT DOES_PATH_CONTAIN)
-          set (3RDPARTY_${LIBNAME}_DLL_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} shared library" FORCE)
+          set (3RDPARTY_${LIBNAME}_DLL_DIR "" CACHE FILEPATH "The directory containing ${LIBNAME} shared library" FORCE)
-        endif()
+        endif()
-      endif()
+      endif()
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (BUILD_SHARED_LIBS)
+  if (BUILD_SHARED_LIBS)
-    # check library
+    # check library
-    set (DOES_PATH_CONTAIN FALSE)
+    set (DOES_PATH_CONTAIN FALSE)
-    if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
+    if (3RDPARTY_${LIBNAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}")
-      if (3RDPARTY_${LIBNAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
+      if (3RDPARTY_${LIBNAME}_LIBRARY AND EXISTS "${3RDPARTY_${LIBNAME}_LIBRARY}")
-        string (REGEX MATCH "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY}")
+        string (REGEX MATCH "${3RDPARTY_${LIBNAME}_LIBRARY_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_LIBRARY}")
-      endif()
+      endif()
-    endif()
+    endif()
-    if (NOT DOES_PATH_CONTAIN)
+    if (NOT DOES_PATH_CONTAIN)
-      set (3RDPARTY_${LIBNAME}_LIBRARY "" CACHE FILEPATH "${LIBNAME} library" FORCE)
+      set (3RDPARTY_${LIBNAME}_LIBRARY "" CACHE FILEPATH "${LIBNAME} library" FORCE)
-    endif()
+    endif()
-
+
-    # check shared library
+    # check shared library
-    if (WIN32)
+    if (WIN32)
-      set (DOES_PATH_CONTAIN FALSE)
+      set (DOES_PATH_CONTAIN FALSE)
-      if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
+      if (3RDPARTY_${LIBNAME}_DLL_DIR AND EXISTS "${3RDPARTY_${LIBNAME}_DLL_DIR}")
-        if (3RDPARTY_${LIBNAME}_DLL AND EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
+        if (3RDPARTY_${LIBNAME}_DLL AND EXISTS "${3RDPARTY_${LIBNAME}_DLL}")
-          string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DLL_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL}")
+          string (REGEX MATCH "${3RDPARTY_${LIBNAME}_DLL_DIR}" DOES_PATH_CONTAIN "${3RDPARTY_${LIBNAME}_DLL}")
-        endif()
+        endif()
-      endif()
+      endif()
-      if (NOT DOES_PATH_CONTAIN)
+      if (NOT DOES_PATH_CONTAIN)
-        set (3RDPARTY_${LIBNAME}_DLL "" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
+        set (3RDPARTY_${LIBNAME}_DLL "" CACHE FILEPATH "${LIBNAME} shared library" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-  endif()
+  endif()
-endmacro()
+endmacro()

adm/cmake/bison.cmake

@@ -1,25 +1,25 @@
-# bison
+# bison
-
+
-# execute FindBISON script by "find_package (Bison)" is required to define BISON_TARGET macro
+# execute FindBISON script by "find_package (Bison)" is required to define BISON_TARGET macro
-
+
-# delete obsolete 3RDPARTY_BISON_EXECUTABLE cache variable (not used anymore)
+# delete obsolete 3RDPARTY_BISON_EXECUTABLE cache variable (not used anymore)
-unset (3RDPARTY_BISON_EXECUTABLE CACHE)
+unset (3RDPARTY_BISON_EXECUTABLE CACHE)
-
+
-# delete BISON_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
+# delete BISON_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
-# without reasonable diagnostic
+# without reasonable diagnostic
-if (NOT BISON_EXECUTABLE OR NOT EXISTS "${BISON_EXECUTABLE}")
+if (NOT BISON_EXECUTABLE OR NOT EXISTS "${BISON_EXECUTABLE}")
-  unset (BISON_EXECUTABLE CACHE)
+  unset (BISON_EXECUTABLE CACHE)
-endif()
+endif()
-
+
-# Add paths to 3rdparty subfolders containing name "bison" to CMAKE_PROGRAM_PATH variable to make
+# Add paths to 3rdparty subfolders containing name "bison" to CMAKE_PROGRAM_PATH variable to make
-# these paths searhed by find_package
+# these paths searhed by find_package
-if (3RDPARTY_DIR)
+if (3RDPARTY_DIR)
-  file (GLOB BISON_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*bison*/")
+  file (GLOB BISON_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*bison*/")
-  foreach (candidate_path ${BISON_PATHS})
+  foreach (candidate_path ${BISON_PATHS})
-    if (IS_DIRECTORY ${candidate_path})
+    if (IS_DIRECTORY ${candidate_path})
-      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
+      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-endif()
+endif()
- 
+ 
-find_package (BISON 3.7.4)
+find_package (BISON 3.7.4)

adm/cmake/doxygen.cmake

@@ -1,62 +1,62 @@
-# doxygen
+# doxygen
-set (DOXYGEN_MINIMUM_VERSION 1.8.4)
+set (DOXYGEN_MINIMUM_VERSION 1.8.4)
-
+
-if (DO_ONLY_CHECK_FOR_DOXYGEN)
+if (DO_ONLY_CHECK_FOR_DOXYGEN)
-  message (STATUS "Info. Detecting doxygen")
+  message (STATUS "Info. Detecting doxygen")
-  set (DOXYGEN_SKIP_DOT ON)
+  set (DOXYGEN_SKIP_DOT ON)
-  find_package (Doxygen ${DOXYGEN_MINIMUM_VERSION})
+  find_package (Doxygen ${DOXYGEN_MINIMUM_VERSION})
-
+
-  set (CAN_DOXYGEN_BE_USED OFF)
+  set (CAN_DOXYGEN_BE_USED OFF)
-  if (DOXYGEN_EXECUTABLE)
+  if (DOXYGEN_EXECUTABLE)
-    set (CAN_DOXYGEN_BE_USED ON)
+    set (CAN_DOXYGEN_BE_USED ON)
-    message (STATUS "Info. Doxygen is found and can be used")
+    message (STATUS "Info. Doxygen is found and can be used")
-  endif()
+  endif()
-else()
+else()
-  set (3RDPARTY_DOT_EXECUTABLE_DESCR       "The path to the 'dot' tool producing layered drawings of directed graphs.\nThis tool used by doxygen")
+  set (3RDPARTY_DOT_EXECUTABLE_DESCR       "The path to the 'dot' tool producing layered drawings of directed graphs.\nThis tool used by doxygen")
-  set (3RDPARTY_DOXYGEN_EXECUTABLE_DESCR   "The path to the doxygen command")
+  set (3RDPARTY_DOXYGEN_EXECUTABLE_DESCR   "The path to the doxygen command")
-
+
-  if (NOT DEFINED 3RDPARTY_DOXYGEN_EXECUTABLE)
+  if (NOT DEFINED 3RDPARTY_DOXYGEN_EXECUTABLE)
-    set (3RDPARTY_DOXYGEN_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}")
+    set (3RDPARTY_DOXYGEN_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}")
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_DOT_EXECUTABLE)
+  if (NOT DEFINED 3RDPARTY_DOT_EXECUTABLE)
-    set (3RDPARTY_DOT_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}")
+    set (3RDPARTY_DOT_EXECUTABLE "" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}")
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_SKIP_DOT_EXECUTABLE)
+  if (NOT DEFINED 3RDPARTY_SKIP_DOT_EXECUTABLE)
-    set (3RDPARTY_SKIP_DOT_EXECUTABLE ON CACHE BOOL "Skip trying to find Dot")
+    set (3RDPARTY_SKIP_DOT_EXECUTABLE ON CACHE BOOL "Skip trying to find Dot")
-  endif()
+  endif()
-
+
-  if (3RDPARTY_SKIP_DOT_EXECUTABLE)
+  if (3RDPARTY_SKIP_DOT_EXECUTABLE)
-    OCCT_CHECK_AND_UNSET (3RDPARTY_DOT_EXECUTABLE)
+    OCCT_CHECK_AND_UNSET (3RDPARTY_DOT_EXECUTABLE)
-  endif()
+  endif()
-
+
-  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE))
+  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE))
-
+
-    set (DOXYGEN_SKIP_DOT ${3RDPARTY_SKIP_DOT_EXECUTABLE})
+    set (DOXYGEN_SKIP_DOT ${3RDPARTY_SKIP_DOT_EXECUTABLE})
-    find_package (Doxygen ${DOXYGEN_MINIMUM_VERSION})
+    find_package (Doxygen ${DOXYGEN_MINIMUM_VERSION})
-    
+    
-    if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE AND DOXYGEN_EXECUTABLE)
+    if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE AND DOXYGEN_EXECUTABLE)
-      set (3RDPARTY_DOXYGEN_EXECUTABLE "${DOXYGEN_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}" FORCE)
+      set (3RDPARTY_DOXYGEN_EXECUTABLE "${DOXYGEN_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOXYGEN_EXECUTABLE_DESCR}" FORCE)
-    endif()
+    endif()
-    
+    
-    if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE AND DOXYGEN_DOT_EXECUTABLE)
+    if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE AND NOT 3RDPARTY_DOT_EXECUTABLE AND DOXYGEN_DOT_EXECUTABLE)
-      set (3RDPARTY_DOT_EXECUTABLE "${DOXYGEN_DOT_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}" FORCE)
+      set (3RDPARTY_DOT_EXECUTABLE "${DOXYGEN_DOT_EXECUTABLE}" CACHE FILEPATH "${3RDPARTY_DOT_EXECUTABLE_DESCR}" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOXYGEN_EXECUTABLE}")
+  if (NOT 3RDPARTY_DOXYGEN_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOXYGEN_EXECUTABLE}")
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOXYGEN_EXECUTABLE)
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOXYGEN_EXECUTABLE)
-  endif()
+  endif()
-
+
-  if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE)
+  if (NOT 3RDPARTY_SKIP_DOT_EXECUTABLE)
-    if (NOT 3RDPARTY_DOT_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOT_EXECUTABLE}")
+    if (NOT 3RDPARTY_DOT_EXECUTABLE OR NOT EXISTS "${3RDPARTY_DOT_EXECUTABLE}")
-      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOT_EXECUTABLE)
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DOT_EXECUTABLE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# unset all redundant variables
+# unset all redundant variables
-OCCT_CHECK_AND_UNSET (DOXYGEN_SKIP_DOT)
+OCCT_CHECK_AND_UNSET (DOXYGEN_SKIP_DOT)
-OCCT_CHECK_AND_UNSET (DOXYGEN_EXECUTABLE)
+OCCT_CHECK_AND_UNSET (DOXYGEN_EXECUTABLE)
-OCCT_CHECK_AND_UNSET (DOXYGEN_DOT_EXECUTABLE)
+OCCT_CHECK_AND_UNSET (DOXYGEN_DOT_EXECUTABLE)

adm/cmake/draco.cmake

@@ -1,96 +1,93 @@
-# Draco - a library for a lossy vertex data compression, used as extension to glTF format.
+# Draco - a library for a lossy vertex data compression, used as extension to glTF format.
-# https://github.com/google/draco
+# https://github.com/google/draco
-
+
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
+
-if (NOT DEFINED INSTALL_DRACO)
+if (NOT DEFINED 3RDPARTY_DRACO_DIR)
-  set (INSTALL_DRACO OFF CACHE BOOL "${INSTALL_DRACO_DESCR}")
+  set (3RDPARTY_DRACO_DIR "" CACHE PATH "The directory containing Draco")
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_DRACO_DIR)
+if (NOT DEFINED 3RDPARTY_DRACO_INCLUDE_DIR)
-  set (3RDPARTY_DRACO_DIR "" CACHE PATH "The directory containing Draco")
+  set (3RDPARTY_DRACO_INCLUDE_DIR  "" CACHE PATH "The directory containing headers of the Draco")
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_DRACO_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY)
-  set (3RDPARTY_DRACO_INCLUDE_DIR  "" CACHE PATH "The directory containing headers of the Draco")
+  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library")
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY OR NOT 3RDPARTY_DRACO_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR)
-  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library"  FORCE)
+  set (3RDPARTY_DRACO_LIBRARY_DIR "" CACHE PATH "The directory containing Draco library")
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR)
+if (WIN32)
-  set (3RDPARTY_DRACO_LIBRARY_DIR "" CACHE PATH "The directory containing Draco library")
+  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DEBUG)
-endif()
+    set (3RDPARTY_DRACO_LIBRARY_DEBUG "" CACHE FILEPATH "Draco debug library")
-
+  endif()
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+  
-  if (NOT 3RDPARTY_DRACO_DIR OR NOT EXISTS "${3RDPARTY_DRACO_DIR}")
+  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR_DEBUG)
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" draco DRACO_DIR_NAME)
+    set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "" CACHE PATH "The directory containing Draco debug library")
-    if (DRACO_DIR_NAME)
+  endif()
-      set (3RDPARTY_DRACO_DIR "${3RDPARTY_DIR}/${DRACO_DIR_NAME}" CACHE PATH "The directory containing Draco" FORCE)
+endif()
-    endif()
+
-  endif()
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-endif()
+  if (NOT 3RDPARTY_DRACO_DIR OR NOT EXISTS "${3RDPARTY_DRACO_DIR}")
-
+    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" draco DRACO_DIR_NAME)
-if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
+    if (DRACO_DIR_NAME)
-  set (DRACO_INCLUDE_PATH "${3RDPARTY_DRACO_DIR}/include")
+      set (3RDPARTY_DRACO_DIR "${3RDPARTY_DIR}/${DRACO_DIR_NAME}" CACHE PATH "The directory containing Draco" FORCE)
-  set (DRACO_LIBRARY_PATH "${3RDPARTY_DRACO_DIR}/lib")
+    endif()
-endif()
+  endif()
-
+endif()
-if (NOT 3RDPARTY_DRACO_INCLUDE_DIR)
+
-  if (DRACO_INCLUDE_PATH AND EXISTS "${DRACO_INCLUDE_PATH}")
+# header
-    set (3RDPARTY_DRACO_INCLUDE_DIR "${DRACO_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of DRACO" FORCE)
+if (NOT 3RDPARTY_DRACO_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-  endif()
+  set (HEADER_NAMES draco)
-endif()
+
-
+  # set 3RDPARTY_DRACO_INCLUDE_DIR as notfound, otherwise find_path can't assign a new value to 3RDPARTY_DRACO_INCLUDE_DIR
-if (NOT 3RDPARTY_DRACO_LIBRARY_DIR)
+  set (3RDPARTY_DRACO_INCLUDE_DIR "3RDPARTY_DRACO_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing headers of the Draco" FORCE)
-  if (DRACO_LIBRARY_PATH AND EXISTS "${DRACO_LIBRARY_PATH}")
+
-    set (3RDPARTY_DRACO_LIBRARY_DIR "${DRACO_LIBRARY_PATH}" CACHE FILEPATH "The directory containing DRACO library" FORCE)
+  if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-  endif()
+    find_path (3RDPARTY_DRACO_INCLUDE_DIR NAMES ${HEADER_NAMES}
-endif()
+                                                 PATHS ${3RDPARTY_DRACO_DIR}
-
+                                                 PATH_SUFFIXES "include"
-if (3RDPARTY_DRACO_INCLUDE_DIR AND EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
+                                                 CMAKE_FIND_ROOT_PATH_BOTH
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_DRACO_INCLUDE_DIR}")
+                                                 NO_DEFAULT_PATH)
-else()
+  endif()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DRACO_INCLUDE_DIR)
+endif()
-endif()
+
-
+if (3RDPARTY_DRACO_INCLUDE_DIR AND EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-  if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
+else()
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_DRACO_INCLUDE_DIR)
-    set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
+endif()
-
+
-    find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
+if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-                                         PATHS "${3RDPARTY_DRACO_LIBRARY_DIR}"
+  if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-                                         PATH_SUFFIXES lib
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-                                         CMAKE_FIND_ROOT_PATH_BOTH
+    set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)
-                                         NO_DEFAULT_PATH)
+
-    if (3RDPARTY_DRACO_LIBRARY AND EXISTS "${3RDPARTY_DRACO_LIBRARY}")
+    find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
-      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY}" PATH)
+                                         PATHS "${3RDPARTY_DRACO_DIR}"
-      set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
+                                         PATH_SUFFIXES lib
-    endif()
+                                         CMAKE_FIND_ROOT_PATH_BOTH
-  endif()
+                                         NO_DEFAULT_PATH)
-endif()
+    if (3RDPARTY_DRACO_LIBRARY AND EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-
+      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY}" PATH)
-if (3RDPARTY_DRACO_LIBRARY_DIR AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+      set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
-  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+    endif()
-else()
+  endif()
-  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_DRACO_LIBRARY_DIR)
+
-endif()
+  if (WIN32 AND (NOT 3RDPARTY_DRACO_LIBRARY_DEBUG OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}"))
-
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-if (INSTALL_DRACO)
+    set (3RDPARTY_DRACO_LIBRARY_DEBUG "3RDPARTY_DRACO_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The path to debug Draco library" FORCE)
-  get_filename_component(3RDPARTY_DRACO_LIBRARY_REALPATH ${3RDPARTY_DRACO_LIBRARY} REALPATH)
+
-  if (SINGLE_GENERATOR)
+    find_library (3RDPARTY_DRACO_LIBRARY_DEBUG NAMES ${CSF_Draco}
-    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
+                                         PATHS "${3RDPARTY_DRACO_DIR}"
-  else()
+                                         PATH_SUFFIXES libd
-    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+                                         CMAKE_FIND_ROOT_PATH_BOTH
-             CONFIGURATIONS Release
+                                         NO_DEFAULT_PATH)
-             DESTINATION "${INSTALL_DIR_LIB}")
+    if (3RDPARTY_DRACO_LIBRARY_DEBUG AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}")
-    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DEBUG}" PATH)
-             CONFIGURATIONS RelWithDebInfo
+      set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DIR_DEBUG}" CACHE FILEPATH "The directory containing debug Draco library" FORCE)
-             DESTINATION "${INSTALL_DIR_LIB}i")
+    endif()
-    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+  endif()
-             CONFIGURATIONS Debug
+endif()
-             DESTINATION "${INSTALL_DIR_LIB}d")
-  endif()
-endif()

adm/cmake/egl.cmake

@@ -1,3 +1,3 @@
-# EGL
+# EGL
-
+
-THIRDPARTY_PRODUCT("EGL" "EGL/egl.h" "CSF_OpenGlesLibs" "")
+THIRDPARTY_PRODUCT("EGL" "EGL/egl.h" "CSF_OpenGlesLibs" "")

adm/cmake/eigen.cmake

@@ -1,87 +1,87 @@
-# eigen
+# eigen
-
+
-if (NOT DEFINED INSTALL_EIGEN)
+if (NOT DEFINED INSTALL_EIGEN)
-  set (INSTALL_EIGEN OFF CACHE BOOL "${INSTALL_EIGEN_DESCR}")
+  set (INSTALL_EIGEN OFF CACHE BOOL "${INSTALL_EIGEN_DESCR}")
-endif()
+endif()
-
+
-# eigen directory
+# eigen directory
-if (NOT DEFINED 3RDPARTY_EIGEN_DIR)
+if (NOT DEFINED 3RDPARTY_EIGEN_DIR)
-  set (3RDPARTY_EIGEN_DIR "" CACHE PATH "The directory containing eigen")
+  set (3RDPARTY_EIGEN_DIR "" CACHE PATH "The directory containing eigen")
-endif()
+endif()
-
+
-# search for eigen in user defined directory
+# search for eigen in user defined directory
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  if (NOT 3RDPARTY_EIGEN_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_DIR}")
+  if (NOT 3RDPARTY_EIGEN_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_DIR}")
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" Eigen EIGEN_DIR_NAME)
+    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" Eigen EIGEN_DIR_NAME)
-    if (EIGEN_DIR_NAME)
+    if (EIGEN_DIR_NAME)
-      set (3RDPARTY_EIGEN_DIR "${3RDPARTY_DIR}/${EIGEN_DIR_NAME}" CACHE PATH "The directory containing eigen" FORCE)
+      set (3RDPARTY_EIGEN_DIR "${3RDPARTY_DIR}/${EIGEN_DIR_NAME}" CACHE PATH "The directory containing eigen" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_EIGEN_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_EIGEN_INCLUDE_DIR)
-  set (3RDPARTY_EIGEN_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the EIGEN")
+  set (3RDPARTY_EIGEN_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the EIGEN")
-endif()
+endif()
-
+
-if (NOT 3RDPARTY_EIGEN_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
+if (NOT 3RDPARTY_EIGEN_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
-
+
-  set (HEADER_NAMES Eigen)
+  set (HEADER_NAMES Eigen)
-
+
-  set (3RDPARTY_EIGEN_INCLUDE_DIR "3RDPARTY_EIGEN_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to Eigen header file" FORCE)
+  set (3RDPARTY_EIGEN_INCLUDE_DIR "3RDPARTY_EIGEN_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to Eigen header file" FORCE)
-
+
-  if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
+  if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
-    find_path (3RDPARTY_EIGEN_INCLUDE_DIR NAMES ${HEADER_NAMES}
+    find_path (3RDPARTY_EIGEN_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATHS ${3RDPARTY_EIGEN_DIR}
+                                              PATHS ${3RDPARTY_EIGEN_DIR}
-                                              PATH_SUFFIXES include eigen3 include/eigen3
+                                              PATH_SUFFIXES include eigen3 include/eigen3
-                                              CMAKE_FIND_ROOT_PATH_BOTH
+                                              CMAKE_FIND_ROOT_PATH_BOTH
-                                              NO_DEFAULT_PATH)
+                                              NO_DEFAULT_PATH)
-  else()
+  else()
-    find_path (3RDPARTY_EIGEN_INCLUDE_DIR NAMES ${HEADER_NAMES}
+    find_path (3RDPARTY_EIGEN_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATH_SUFFIXES include eigen3 include/eigen3
+                                              PATH_SUFFIXES include eigen3 include/eigen3
-                                              CMAKE_FIND_ROOT_PATH_BOTH)
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
+  endif()
-
+
-  # use default (CMake) EIGEN search
+  # use default (CMake) EIGEN search
-  if (NOT 3RDPARTY_EIGEN_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
+  if (NOT 3RDPARTY_EIGEN_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
-    # use 3RDPARTY_EIGEN_DIR if it is specified for eigen search
+    # use 3RDPARTY_EIGEN_DIR if it is specified for eigen search
-    if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
+    if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
-      set (CACHED_EIGEN_DIR $ENV{Eigen3_DIR})
+      set (CACHED_EIGEN_DIR $ENV{Eigen3_DIR})
-      set (ENV{Eigen3_DIR} "${3RDPARTY_EIGEN_DIR}")
+      set (ENV{Eigen3_DIR} "${3RDPARTY_EIGEN_DIR}")
-    endif()
+    endif()
-
+
-    find_package(Eigen3 QUIET)
+    find_package(Eigen3 QUIET)
-
+
-    # restore ENV{Eigen3_DIR}
+    # restore ENV{Eigen3_DIR}
-    if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
+    if (3RDPARTY_EIGEN_DIR AND EXISTS "${3RDPARTY_EIGEN_DIR}")
-      set (ENV{Eigen3_DIR} ${CACHED_EIGEN_DIR})
+      set (ENV{Eigen3_DIR} ${CACHED_EIGEN_DIR})
-    endif()
+    endif()
-
+
-    if (${EIGEN3_FOUND})
+    if (${EIGEN3_FOUND})
-      set (3RDPARTY_EIGEN_INCLUDE_DIR "${EIGEN3_INCLUDE_DIR}" CACHE PATH "the path to Eigen header file" FORCE)
+      set (3RDPARTY_EIGEN_INCLUDE_DIR "${EIGEN3_INCLUDE_DIR}" CACHE PATH "the path to Eigen header file" FORCE)
-      set (3RDPARTY_EIGEN_DIR "${EIGEN3_ROOT_DIR}"    CACHE PATH "The directory containing eigen" FORCE)
+      set (3RDPARTY_EIGEN_DIR "${EIGEN3_ROOT_DIR}"    CACHE PATH "The directory containing eigen" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (3RDPARTY_EIGEN_INCLUDE_DIR AND EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
+if (3RDPARTY_EIGEN_INCLUDE_DIR AND EXISTS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}")
-
+
-  # Install header files
+  # Install header files
-  if (INSTALL_EIGEN)
+  if (INSTALL_EIGEN)
-    file(GLOB EIGEN_SUBDIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}/*")
+    file(GLOB EIGEN_SUBDIRS "${3RDPARTY_EIGEN_INCLUDE_DIR}/*")
-    foreach(SUBDIR ${EIGEN_SUBDIRS})
+    foreach(SUBDIR ${EIGEN_SUBDIRS})
-      if(IS_DIRECTORY "${SUBDIR}")
+      if(IS_DIRECTORY "${SUBDIR}")
-        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      else()
+      else()
-        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      endif()
+      endif()
-    endforeach()
+    endforeach()
-  endif()
+  endif()
-else()
+else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_EIGEN_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_EIGEN_INCLUDE_DIR)
-
+
-  set (3RDPARTY_EIGEN_INCLUDE_DIR "" CACHE PATH "the path to Eigen header file" FORCE)
+  set (3RDPARTY_EIGEN_INCLUDE_DIR "" CACHE PATH "the path to Eigen header file" FORCE)
-endif()
+endif()
-
+
-# unset all redundant variables
+# unset all redundant variables
-OCCT_CHECK_AND_UNSET(Eigen3_DIR)
+OCCT_CHECK_AND_UNSET(Eigen3_DIR)

adm/cmake/ffmpeg.cmake

@@ -1,242 +1,242 @@
-# FFmpeg
+# FFmpeg
-
+
-if (NOT DEFINED INSTALL_FFMPEG)
+if (NOT DEFINED INSTALL_FFMPEG)
-  set (INSTALL_FFMPEG OFF CACHE BOOL "${INSTALL_FFMPEG_DESCR}")
+  set (INSTALL_FFMPEG OFF CACHE BOOL "${INSTALL_FFMPEG_DESCR}")
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_FFMPEG_DIR)
+if (NOT DEFINED 3RDPARTY_FFMPEG_DIR)
-  set (3RDPARTY_FFMPEG_DIR "" CACHE PATH "The directory containing FFmpeg")
+  set (3RDPARTY_FFMPEG_DIR "" CACHE PATH "The directory containing FFmpeg")
-endif()
+endif()
-
+
-# include occt macros. compiler_bitness, os_with_bit, compiler
+# include occt macros. compiler_bitness, os_with_bit, compiler
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
+
-# specify FFMPEG folder in connection with 3RDPARTY_DIR
+# specify FFMPEG folder in connection with 3RDPARTY_DIR
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  if (NOT 3RDPARTY_FFMPEG_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_DIR}")
+  if (NOT 3RDPARTY_FFMPEG_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_DIR}")
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FFMPEG FFMPEG_DIR_NAME)
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FFMPEG FFMPEG_DIR_NAME)
-    if (FFMPEG_DIR_NAME)
+    if (FFMPEG_DIR_NAME)
-      set (3RDPARTY_FFMPEG_DIR "${3RDPARTY_DIR}/${FFMPEG_DIR_NAME}" CACHE PATH "The directory containing FFmpeg" FORCE)
+      set (3RDPARTY_FFMPEG_DIR "${3RDPARTY_DIR}/${FFMPEG_DIR_NAME}" CACHE PATH "The directory containing FFmpeg" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-else()
+else()
-endif()
+endif()
-
+
-# define required FFMPEG variables
+# define required FFMPEG variables
-if (NOT DEFINED 3RDPARTY_FFMPEG_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_FFMPEG_INCLUDE_DIR)
-  set (3RDPARTY_FFMPEG_INCLUDE_DIR  "" CACHE PATH "the path of headers directory")
+  set (3RDPARTY_FFMPEG_INCLUDE_DIR  "" CACHE PATH "the path of headers directory")
-endif()
+endif()
-
+
-separate_arguments (CSF_FFmpeg)
+separate_arguments (CSF_FFmpeg)
-foreach (LIBRARY_NAME ${CSF_FFmpeg})
+foreach (LIBRARY_NAME ${CSF_FFmpeg})
-  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
+  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
-    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}               "" CACHE FILEPATH "FFmpeg framework (${LIBRARY_NAME})" FORCE)
+    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}               "" CACHE FILEPATH "FFmpeg framework (${LIBRARY_NAME})" FORCE)
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
+  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
-    set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}           "" CACHE PATH "The directory containing FFmpeg framework (${LIBRARY_NAME})")
+    set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}           "" CACHE PATH "The directory containing FFmpeg framework (${LIBRARY_NAME})")
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR)
+  if (NOT DEFINED 3RDPARTY_FFMPEG_LIBRARY_DIR)
-    set (3RDPARTY_FFMPEG_LIBRARY_DIR                           "" CACHE PATH "The directory containing FFmpeg libraries")
+    set (3RDPARTY_FFMPEG_LIBRARY_DIR                           "" CACHE PATH "The directory containing FFmpeg libraries")
-  endif()
+  endif()
-
+
-  if (WIN32)
+  if (WIN32)
-    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
+    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
-      set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}                 "" CACHE FILEPATH "FFmpeg shared libraries (${LIBRARY_NAME})" FORCE)
+      set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}                 "" CACHE FILEPATH "FFmpeg shared libraries (${LIBRARY_NAME})" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (WIN32)
+  if (WIN32)
-    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
+    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
-      set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}               "" CACHE PATH "The directory containing FFmpeg shared libraries (${LIBRARY_NAME})")
+      set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}               "" CACHE PATH "The directory containing FFmpeg shared libraries (${LIBRARY_NAME})")
-    endif()
+    endif()
-    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR)
+    if (NOT DEFINED 3RDPARTY_FFMPEG_DLL_DIR)
-      set (3RDPARTY_FFMPEG_DLL_DIR                               "" CACHE PATH "The directory containing FFmpeg shared libraries")
+      set (3RDPARTY_FFMPEG_DLL_DIR                               "" CACHE PATH "The directory containing FFmpeg shared libraries")
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
+  # check 3RDPARTY_${PRODUCT_NAME}_ paths for consistency with specified 3RDPARTY_${PRODUCT_NAME}_DIR
-  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
+  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_INCLUDE_DIR PATH "the path to FFmpeg")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_INCLUDE_DIR PATH "the path to FFmpeg")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} FILEPATH "the path to FFmpeg framework (${LIBRARY_NAME})")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} FILEPATH "the path to FFmpeg framework (${LIBRARY_NAME})")
-
+
-    if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
+    if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
-      get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
+      get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
-      set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg libraries" FORCE)
+      set (3RDPARTY_FFMPEG_LIBRARY_DIR "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg libraries" FORCE)
-      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
+      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
-    else()
+    else()
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg library (${LIBRARY_NAME})")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg library (${LIBRARY_NAME})")
-    endif()
+    endif()
-
+
-    if (WIN32)
+    if (WIN32)
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} FILEPATH "the path to FFmpeg shared library (${LIBRARY_NAME})")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} FILEPATH "the path to FFmpeg shared library (${LIBRARY_NAME})")
-
+
-      if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
+      if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
-        get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
+        get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
-        set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared libraries" FORCE)
+        set (3RDPARTY_FFMPEG_DLL_DIR "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared libraries" FORCE)
-        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
+        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
-      else()
+      else()
-        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})")
+        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FFMPEG_DIR 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})")
-      endif()
+      endif()
-    endif()
+    endif()
-  endif()
+  endif()
-endforeach()
+endforeach()
-
+
-# header
+# header
-if (NOT 3RDPARTY_FFMPEG_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
+if (NOT 3RDPARTY_FFMPEG_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
-  set (HEADER_NAMES avutil.h libavutil/avutil.h)
+  set (HEADER_NAMES avutil.h libavutil/avutil.h)
-
+
-  # set 3RDPARTY_FFMPEG_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_INCLUDE_DIR
+  # set 3RDPARTY_FFMPEG_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_INCLUDE_DIR
-  set (3RDPARTY_FFMPEG_INCLUDE_DIR "3RDPARTY_FFMPEG_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to header directory" FORCE)
+  set (3RDPARTY_FFMPEG_INCLUDE_DIR "3RDPARTY_FFMPEG_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "the path to header directory" FORCE)
-
+
-  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
+  if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
-    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
+    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                                 PATHS ${3RDPARTY_FFMPEG_DIR}
+                                                 PATHS ${3RDPARTY_FFMPEG_DIR}
-                                                 PATH_SUFFIXES include
+                                                 PATH_SUFFIXES include
-                                                 CMAKE_FIND_ROOT_PATH_BOTH
+                                                 CMAKE_FIND_ROOT_PATH_BOTH
-                                                 NO_DEFAULT_PATH)
+                                                 NO_DEFAULT_PATH)
-  else()
+  else()
-    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
+    find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                                 PATH_SUFFIXES include
+                                                 PATH_SUFFIXES include
-                                                 CMAKE_FIND_ROOT_PATH_BOTH)
+                                                 CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (3RDPARTY_FFMPEG_INCLUDE_DIR AND EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
+if (3RDPARTY_FFMPEG_INCLUDE_DIR AND EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FFMPEG_INCLUDE_DIR}")
-else()
+else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FFMPEG_INCLUDE_DIR)
-
+
-  set (3RDPARTY_FFMPEG_INCLUDE_DIR "" CACHE FILEPATH "the path to avutil.h" FORCE)
+  set (3RDPARTY_FFMPEG_INCLUDE_DIR "" CACHE FILEPATH "the path to avutil.h" FORCE)
-endif()
+endif()
-
+
-# libraries
+# libraries
-foreach (LIBRARY_NAME ${CSF_FFmpeg})
+foreach (LIBRARY_NAME ${CSF_FFmpeg})
-  if (NOT 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
+  if (NOT 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
-
+
-    set (FFMPEG_PATH_SUFFIXES lib)
+    set (FFMPEG_PATH_SUFFIXES lib)
-    if (ANDROID)
+    if (ANDROID)
-      set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} libs/${ANDROID_ABI})
+      set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} libs/${ANDROID_ABI})
-    elseif(APPLE)
+    elseif(APPLE)
-      set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} Frameworks)
+      set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} Frameworks)
-    endif()
+    endif()
-
+
-    # set 3RDPARTY_FFMPEG_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_LIBRARY
+    # set 3RDPARTY_FFMPEG_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FFMPEG_LIBRARY
-    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
+    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
-
+
-    if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
+    if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
-      find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
+      find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
-                    PATHS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_FFMPEG_DIR}"
+                    PATHS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" "${3RDPARTY_FFMPEG_DIR}"
-                    PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
+                    PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
-                    CMAKE_FIND_ROOT_PATH_BOTH
+                    CMAKE_FIND_ROOT_PATH_BOTH
-                    NO_DEFAULT_PATH)
+                    NO_DEFAULT_PATH)
-    else()
+    else()
-      find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
+      find_library (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} NAMES ${LIBRARY_NAME}
-                    PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
+                    PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES}
-                    CMAKE_FIND_ROOT_PATH_BOTH)
+                    CMAKE_FIND_ROOT_PATH_BOTH)
-    endif()
+    endif()
-
+
-    if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
+    if (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
-      get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
+      get_filename_component (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}" PATH)
-      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
+      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
-    else()
+    else()
-      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
+      set (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
+  if (3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}}")
-  else()
+  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME})
-
+
-    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
+    set (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} "" CACHE FILEPATH "The path to FFmpeg library (${LIBRARY_NAME})" FORCE)
-  endif()
+  endif()
-
+
-  # shared library
+  # shared library
-  if (WIN32)
+  if (WIN32)
-    if (NOT 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
+    if (NOT 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
-
+
-      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-      set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg shared library (${LIBRARY_NAME})" FORCE)
+      set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}-NOTFOUND" CACHE FILEPATH "The path to FFmpeg shared library (${LIBRARY_NAME})" FORCE)
-
+
-      # find FFmpeg shared library
+      # find FFmpeg shared library
-      file (GLOB 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DIR}/bin/${LIBRARY_NAME}[-][0-9]*")
+      file (GLOB 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DIR}/bin/${LIBRARY_NAME}[-][0-9]*")
-
+
-      if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
+      if (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} AND EXISTS "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}")
-        set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" CACHE FILEPATH "FFmpeg shared library (${LIBRARY_NAME})" FORCE)
+        set (3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" CACHE FILEPATH "FFmpeg shared library (${LIBRARY_NAME})" FORCE)
-        get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
+        get_filename_component (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" PATH)
-        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
+        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}" CACHE PATH "The directory containing FFmpeg library (${LIBRARY_NAME})" FORCE)
-      else()
+      else()
-        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
+        set (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} "" CACHE PATH "The directory containing FFmpeg shared library (${LIBRARY_NAME})" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    if (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
+    if (3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME} OR EXISTS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
-      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}}")
-    else()
+    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME})
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  # install instructions
+  # install instructions
-  if (INSTALL_FFMPEG)
+  if (INSTALL_FFMPEG)
-    OCCT_MAKE_OS_WITH_BITNESS()
+    OCCT_MAKE_OS_WITH_BITNESS()
-    OCCT_MAKE_COMPILER_SHORT_NAME()
+    OCCT_MAKE_COMPILER_SHORT_NAME()
-
+
-    if (WIN32)
+    if (WIN32)
-      if (DEFINED INSTALL_BIN_DIR)
+      if (DEFINED INSTALL_BIN_DIR)
-        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" DESTINATION "${INSTALL_BIN_DIR}")
+        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}" DESTINATION "${INSTALL_BIN_DIR}")
-      else()
+      else()
-        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
+        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
-                 CONFIGURATIONS Release
+                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}")
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}")
-        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
+        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
-                 CONFIGURATIONS RelWithDebInfo
+                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}i")
-        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
+        install (FILES "${3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME}}"
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${INSTALL_DIR_BIN}d")
-      endif()
+      endif()
-    else()
+    else()
-      get_filename_component(3RDPARTY_FFMPEG_LIBRARY_ABS ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} REALPATH)
+      get_filename_component(3RDPARTY_FFMPEG_LIBRARY_ABS ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} REALPATH)
-      get_filename_component(3RDPARTY_FFMPEG_LIBRARY_NAME ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} NAME)
+      get_filename_component(3RDPARTY_FFMPEG_LIBRARY_NAME ${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}} NAME)
-
+
-      if (DEFINED INSTALL_LIB_DIR)
+      if (DEFINED INSTALL_LIB_DIR)
-        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-                 DESTINATION "${INSTALL_LIB_DIR}"
+                 DESTINATION "${INSTALL_LIB_DIR}"
-                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
+                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-      else()
+      else()
-        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-                 CONFIGURATIONS Release
+                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib"
-                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
+                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-                 CONFIGURATIONS RelWithDebInfo
+                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libi"
-                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
+                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_FFMPEG_LIBRARY_ABS}"
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
+                 DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/libd"
-                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
+                 RENAME ${3RDPARTY_FFMPEG_LIBRARY_NAME}.6)
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    set (USED_3RDPARTY_FFMPEG_DIR "")
+    set (USED_3RDPARTY_FFMPEG_DIR "")
-  else()
+  else()
-    # the library directory for using by the executable
+    # the library directory for using by the executable
-    if (WIN32)
+    if (WIN32)
-      set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}})
+      set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_DLL_DIR_${LIBRARY_NAME}})
-    else()
+    else()
-      set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}})
+      set (USED_3RDPARTY_FFMPEG_DIR ${3RDPARTY_FFMPEG_LIBRARY_DIR_${LIBRARY_NAME}})
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  mark_as_advanced (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME})
+  mark_as_advanced (3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} 3RDPARTY_FFMPEG_DLL_${LIBRARY_NAME})
-endforeach()
+endforeach()
-
+
-# unset all redundant variables
+# unset all redundant variables
-OCCT_CHECK_AND_UNSET (FFMPEG_INCLUDE_DIRS)
+OCCT_CHECK_AND_UNSET (FFMPEG_INCLUDE_DIRS)
-OCCT_CHECK_AND_UNSET (FFMPEG_LIBRARY_DIRS)
+OCCT_CHECK_AND_UNSET (FFMPEG_LIBRARY_DIRS)
-OCCT_CHECK_AND_UNSET (FFMPEG_DIR)
+OCCT_CHECK_AND_UNSET (FFMPEG_DIR)

adm/cmake/flex.cmake

@@ -1,33 +1,33 @@
-# flex
+# flex
-
+
-# execute FindFLEX script by "find_package (Flex)" is required to define FLEX_TARGET macro
+# execute FindFLEX script by "find_package (Flex)" is required to define FLEX_TARGET macro
-
+
-# delete obsolete 3RDPARTY_FLEX_EXECUTABLE cache variable (not used anymore)
+# delete obsolete 3RDPARTY_FLEX_EXECUTABLE cache variable (not used anymore)
-unset (3RDPARTY_FLEX_EXECUTABLE CACHE)
+unset (3RDPARTY_FLEX_EXECUTABLE CACHE)
-
+
-# delete FLEX_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
+# delete FLEX_EXECUTABLE cache variable if it is empty, otherwise find_package will fail
-# without reasonable diagnostic
+# without reasonable diagnostic
-if (NOT FLEX_EXECUTABLE OR NOT EXISTS "${FLEX_EXECUTABLE}")
+if (NOT FLEX_EXECUTABLE OR NOT EXISTS "${FLEX_EXECUTABLE}")
-  unset (FLEX_EXECUTABLE CACHE)
+  unset (FLEX_EXECUTABLE CACHE)
-endif()
+endif()
-if (NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}")
+if (NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}")
-  unset (FLEX_INCLUDE_DIR CACHE)
+  unset (FLEX_INCLUDE_DIR CACHE)
-endif()
+endif()
-
+
-# Add paths to 3rdparty subfolders containing name "flex" to CMAKE_PROGRAM_PATH and 
+# Add paths to 3rdparty subfolders containing name "flex" to CMAKE_PROGRAM_PATH and 
-# CMAKE_INCLUDE_PATH variables to make these paths searhed by find_package
+# CMAKE_INCLUDE_PATH variables to make these paths searhed by find_package
-if (3RDPARTY_DIR)
+if (3RDPARTY_DIR)
-  file (GLOB FLEX_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*flex*")
+  file (GLOB FLEX_PATHS LIST_DIRECTORIES true "${3RDPARTY_DIR}/*flex*")
-  foreach (candidate_path ${FLEX_PATHS})
+  foreach (candidate_path ${FLEX_PATHS})
-    if (IS_DIRECTORY ${candidate_path})
+    if (IS_DIRECTORY ${candidate_path})
-      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
+      list (APPEND CMAKE_PROGRAM_PATH ${candidate_path})
-      list (APPEND CMAKE_INCLUDE_PATH ${candidate_path})
+      list (APPEND CMAKE_INCLUDE_PATH ${candidate_path})
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-endif()
+endif()
- 
+ 
-find_package (FLEX 2.6.4)
+find_package (FLEX 2.6.4)
-
+
-if (NOT FLEX_FOUND OR NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
+if (NOT FLEX_FOUND OR NOT FLEX_INCLUDE_DIR OR NOT EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
-  list (APPEND 3RDPARTY_NOT_INCLUDED FLEX_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED FLEX_INCLUDE_DIR)
-endif()
+endif()

adm/cmake/freeimage.cmake

@@ -1,3 +1,3 @@
-#freeimage
+#freeimage
-
+
-THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "CSF_FreeImagePlus" "d")
+THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "CSF_FreeImagePlus" "d")

adm/cmake/freetype.cmake

@@ -1,384 +1,384 @@
-# freetype
+# freetype
-
+
-if (NOT DEFINED INSTALL_FREETYPE AND BUILD_SHARED_LIBS)
+if (NOT DEFINED INSTALL_FREETYPE AND BUILD_SHARED_LIBS)
-  set (INSTALL_FREETYPE OFF CACHE BOOL "${INSTALL_FREETYPE_DESCR}")
+  set (INSTALL_FREETYPE OFF CACHE BOOL "${INSTALL_FREETYPE_DESCR}")
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_FREETYPE_DIR)
+if (NOT DEFINED 3RDPARTY_FREETYPE_DIR)
-  set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype")
+  set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype")
-endif()
+endif()
-
+
-# include occt macros. compiler_bitness, os_wiht_bit, compiler
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
+
-OCCT_MAKE_COMPILER_SHORT_NAME()
+OCCT_MAKE_COMPILER_SHORT_NAME()
-OCCT_MAKE_COMPILER_BITNESS()
+OCCT_MAKE_COMPILER_BITNESS()
-
+
-# specify freetype folder in connectin with 3RDPARTY_DIR
+# specify freetype folder in connectin with 3RDPARTY_DIR
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_FREETYPE_DIR PATH "The directory containing freetype")
+  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_FREETYPE_DIR PATH "The directory containing freetype")
-
+
-  if (NOT 3RDPARTY_FREETYPE_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DIR}")
+  if (NOT 3RDPARTY_FREETYPE_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FREETYPE FREETYPE_DIR_NAME)
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" FREETYPE FREETYPE_DIR_NAME)
-    if (FREETYPE_DIR_NAME)
+    if (FREETYPE_DIR_NAME)
-      set (3RDPARTY_FREETYPE_DIR "${3RDPARTY_DIR}/${FREETYPE_DIR_NAME}" CACHE PATH "The directory containing freetype" FORCE)
+      set (3RDPARTY_FREETYPE_DIR "${3RDPARTY_DIR}/${FREETYPE_DIR_NAME}" CACHE PATH "The directory containing freetype" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-else()
+else()
-  #set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype" FORCE)
+  #set (3RDPARTY_FREETYPE_DIR "" CACHE PATH "The directory containing freetype" FORCE)
-endif()
+endif()
-
+
-# define required freetype variables
+# define required freetype variables
-if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
+if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "" CACHE FILEPATH "the path of ft2build.h")
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "" CACHE FILEPATH "the path of ft2build.h")
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
+if (NOT DEFINED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "the path of freetype2")
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "the path of freetype2")
-endif()
+endif()
-
+
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
-  if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY OR NOT 3RDPARTY_FREETYPE_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
+  if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY OR NOT 3RDPARTY_FREETYPE_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-    set (3RDPARTY_FREETYPE_LIBRARY               "" CACHE FILEPATH "freetype library" FORCE)
+    set (3RDPARTY_FREETYPE_LIBRARY               "" CACHE FILEPATH "freetype library" FORCE)
-  endif()
+  endif()
-
+
-  if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY_DIR)
+  if (NOT DEFINED 3RDPARTY_FREETYPE_LIBRARY_DIR)
-    set (3RDPARTY_FREETYPE_LIBRARY_DIR           "" CACHE PATH "The directory containing freetype library")
+    set (3RDPARTY_FREETYPE_LIBRARY_DIR           "" CACHE PATH "The directory containing freetype library")
-  endif()
+  endif()
-
+
-  if (WIN32)
+  if (WIN32)
-    if (NOT DEFINED 3RDPARTY_FREETYPE_DLL OR NOT 3RDPARTY_FREETYPE_DLL_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
+    if (NOT DEFINED 3RDPARTY_FREETYPE_DLL OR NOT 3RDPARTY_FREETYPE_DLL_DIR OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
-      set (3RDPARTY_FREETYPE_DLL                 "" CACHE FILEPATH "freetype shared library" FORCE)
+      set (3RDPARTY_FREETYPE_DLL                 "" CACHE FILEPATH "freetype shared library" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (WIN32)
+  if (WIN32)
-    if (NOT DEFINED 3RDPARTY_FREETYPE_DLL_DIR)
+    if (NOT DEFINED 3RDPARTY_FREETYPE_DLL_DIR)
-      set (3RDPARTY_FREETYPE_DLL_DIR               "" CACHE PATH "The directory containing freetype shared library")
+      set (3RDPARTY_FREETYPE_DLL_DIR               "" CACHE PATH "The directory containing freetype shared library")
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# check 3RDPARTY_FREETYPE_ paths for consistency with specified 3RDPARTY_FREETYPE_DIR
+# check 3RDPARTY_FREETYPE_ paths for consistency with specified 3RDPARTY_FREETYPE_DIR
-if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
-  if (BUILD_SHARED_LIBS)
+  if (BUILD_SHARED_LIBS)
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY FILEPATH "the path to freetype library")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY FILEPATH "the path to freetype library")
-
+
-    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
+      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-    else()
+    else()
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY_DIR PATH "The directory containing freetype library")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_LIBRARY_DIR PATH "The directory containing freetype library")
-    endif()
+    endif()
-
+
-    if (WIN32)
+    if (WIN32)
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL FILEPATH "the path to freetype shared library")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL FILEPATH "the path to freetype shared library")
-
+
-      if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
+      if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
-        get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
+        get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
-        set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype shared library" FORCE)
+        set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype shared library" FORCE)
-      else()
+      else()
-        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL_DIR PATH "The directory containing freetype shared library")
+        CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR 3RDPARTY_FREETYPE_DLL_DIR PATH "The directory containing freetype shared library")
-      endif()
+      endif()
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# the FIRST step in search for freetype library and header folders (built-in search engine)
+# the FIRST step in search for freetype library and header folders (built-in search engine)
-
+
-# execute built-in search engine to seek freetype
+# execute built-in search engine to seek freetype
-set (IS_BUILTIN_SEARCH_REQUIRED OFF)
+set (IS_BUILTIN_SEARCH_REQUIRED OFF)
-if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-  set (IS_BUILTIN_SEARCH_REQUIRED ON)
+  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-elseif (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+elseif (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-  set (IS_BUILTIN_SEARCH_REQUIRED ON)
+  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-elseif (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+elseif (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-  set (IS_BUILTIN_SEARCH_REQUIRED ON)
+  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-#elseif (WIN32)
+#elseif (WIN32)
-  #if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
+  #if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
-  #  set (IS_BUILTIN_SEARCH_REQUIRED ON)
+  #  set (IS_BUILTIN_SEARCH_REQUIRED ON)
-  #endif()
+  #endif()
-endif()
+endif()
-
+
-if (IS_BUILTIN_SEARCH_REQUIRED)
+if (IS_BUILTIN_SEARCH_REQUIRED)
-
+
-  # use 3RDPARTY_FREETYPE_DIR if it is specified for freetype search
+  # use 3RDPARTY_FREETYPE_DIR if it is specified for freetype search
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    set (CACHED_FREETYPE_DIR $ENV{FREETYPE_DIR})
+    set (CACHED_FREETYPE_DIR $ENV{FREETYPE_DIR})
-    set (ENV{FREETYPE_DIR} "${3RDPARTY_FREETYPE_DIR}")
+    set (ENV{FREETYPE_DIR} "${3RDPARTY_FREETYPE_DIR}")
-  endif()
+  endif()
-
+
-  unset (FREETYPE_LIBRARY_RELEASE)
+  unset (FREETYPE_LIBRARY_RELEASE)
-  find_package(Freetype)
+  find_package(Freetype)
-
+
-  # Only for UNIX (not APPLE)
+  # Only for UNIX (not APPLE)
-  if ((NOT WIN32) AND (NOT APPLE))
+  if ((NOT WIN32) AND (NOT APPLE))
-    # To avoid linker error on Ubuntu 18.04 and others linux distributives we should
+    # To avoid linker error on Ubuntu 18.04 and others linux distributives we should
-    # link with freetype library, compiled as Position Independent Code (PIC),
+    # link with freetype library, compiled as Position Independent Code (PIC),
-    # for example, with shared object.
+    # for example, with shared object.
-    if ((DEFINED FREETYPE_LIBRARY_RELEASE) AND (NOT "${FREETYPE_LIBRARY_RELEASE}" STREQUAL "") AND (EXISTS "${FREETYPE_LIBRARY_RELEASE}"))
+    if ((DEFINED FREETYPE_LIBRARY_RELEASE) AND (NOT "${FREETYPE_LIBRARY_RELEASE}" STREQUAL "") AND (EXISTS "${FREETYPE_LIBRARY_RELEASE}"))
-      string (REPLACE "\.a" "\.so" FREETYPE_LIBRARY_RELEASE "${FREETYPE_LIBRARY_RELEASE}")
+      string (REPLACE "\.a" "\.so" FREETYPE_LIBRARY_RELEASE "${FREETYPE_LIBRARY_RELEASE}")
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  # restore ENV{FREETYPE_DIR}
+  # restore ENV{FREETYPE_DIR}
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    set (ENV{FREETYPE_DIR} ${CACHED_FREETYPE_DIR})
+    set (ENV{FREETYPE_DIR} ${CACHED_FREETYPE_DIR})
-  endif()
+  endif()
-
+
-  # check the found paths for consistency with specified 3RDPARTY_FREETYPE_DIR
+  # check the found paths for consistency with specified 3RDPARTY_FREETYPE_DIR
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
-    if (BUILD_SHARED_LIBS)
+    if (BUILD_SHARED_LIBS)
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY_RELEASE FILEPATH "freetype library")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY_RELEASE FILEPATH "freetype library")
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  # assign the found paths to corresponding 3RDPARTY_FREETYPE_ variables
+  # assign the found paths to corresponding 3RDPARTY_FREETYPE_ variables
-  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-    if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
+    if (FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${FREETYPE_INCLUDE_DIR_ft2build}")
-      set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
+      set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build  "${FREETYPE_INCLUDE_DIR_ft2build}" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+  if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-    if (FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
+    if (FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}")
-      set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2  "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
+      set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2  "${FREETYPE_INCLUDE_DIR_freetype2}" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (BUILD_SHARED_LIBS)
+  if (BUILD_SHARED_LIBS)
-    if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+    if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-      if (FREETYPE_LIBRARY_RELEASE AND EXISTS "${FREETYPE_LIBRARY_RELEASE}")
+      if (FREETYPE_LIBRARY_RELEASE AND EXISTS "${FREETYPE_LIBRARY_RELEASE}")
-        set (3RDPARTY_FREETYPE_LIBRARY  "${FREETYPE_LIBRARY_RELEASE}" CACHE FILEPATH "The path to freetype library" FORCE)
+        set (3RDPARTY_FREETYPE_LIBRARY  "${FREETYPE_LIBRARY_RELEASE}" CACHE FILEPATH "The path to freetype library" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
+      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-    else()
+    else()
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# the SECOND step in search for freetype library and header folders (additional search algorithms)
+# the SECOND step in search for freetype library and header folders (additional search algorithms)
-
+
-# ft2build.h
+# ft2build.h
-if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-  set (FT2BUILD_NAMES ft2build.h config/ft2build.h freetype/config/ft2build.h)
+  set (FT2BUILD_NAMES ft2build.h config/ft2build.h freetype/config/ft2build.h)
-
+
-  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build
+  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build-NOTFOUND" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build-NOTFOUND" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
-
+
-  # cmake (version < 3.0) doesn't find ft2build.h of freetype (version is >= 2.5.1)
+  # cmake (version < 3.0) doesn't find ft2build.h of freetype (version is >= 2.5.1)
-  # do search taking into account freetype structure of 2.5.1 version
+  # do search taking into account freetype structure of 2.5.1 version
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
+    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
-                                                      PATHS ${3RDPARTY_FREETYPE_DIR}
+                                                      PATHS ${3RDPARTY_FREETYPE_DIR}
-                                                      PATH_SUFFIXES include freetype2 include/freetype2
+                                                      PATH_SUFFIXES include freetype2 include/freetype2
-                                                      CMAKE_FIND_ROOT_PATH_BOTH
+                                                      CMAKE_FIND_ROOT_PATH_BOTH
-                                                      NO_DEFAULT_PATH)
+                                                      NO_DEFAULT_PATH)
-  else()
+  else()
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
+    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build NAMES ${FT2BUILD_NAMES}
-                                                      PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
+                                                      PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
-                                                      PATH_SUFFIXES include/freetype2 include freetype2
+                                                      PATH_SUFFIXES include/freetype2 include freetype2
-                                                      CMAKE_FIND_ROOT_PATH_BOTH)
+                                                      CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+if (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build}")
-else()
+else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build)
-
+
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build "" CACHE FILEPATH "The directory containing ft2build.h header" FORCE)
-endif()
+endif()
-
+
-# ftheader.h
+# ftheader.h
-if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+if (NOT 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 OR NOT EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-  set (FTHEADER_NAMES ftheader.h config/ftheader.h freetype/config/ftheader.h)
+  set (FTHEADER_NAMES ftheader.h config/ftheader.h freetype/config/ftheader.h)
-
+
-  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2
+  # set 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2-NOTFOUND" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2-NOTFOUND" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
-
+
-  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
+    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
-                                                       HINTS ${3RDPARTY_FREETYPE_DIR}
+                                                       HINTS ${3RDPARTY_FREETYPE_DIR}
-                                                       PATH_SUFFIXES include/freetype2 include freetype2
+                                                       PATH_SUFFIXES include/freetype2 include freetype2
-                                                       CMAKE_FIND_ROOT_PATH_BOTH
+                                                       CMAKE_FIND_ROOT_PATH_BOTH
-                                                       NO_DEFAULT_PATH)
+                                                       NO_DEFAULT_PATH)
-  else()
+  else()
-    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
+    find_path (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 NAMES ${FTHEADER_NAMES}
-                                                       PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
+                                                       PATHS /usr/X11R6 /usr/local/X11R6 /usr/local/X11 /usr/freeware
-                                                       PATH_SUFFIXES include/freetype2 include freetype2
+                                                       PATH_SUFFIXES include/freetype2 include freetype2
-                                                       CMAKE_FIND_ROOT_PATH_BOTH)
+                                                       CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+if (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2}")
-else()
+else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2)
-
+
-  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
+  set (3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2 "" CACHE FILEPATH "The directory containing ftheader.h header" FORCE)
-endif()
+endif()
-
+
-# freetype library
+# freetype library
-#if (BUILD_SHARED_LIBS)
+#if (BUILD_SHARED_LIBS)
-  if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+  if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
-
+
-    set (FREETYPE_PATH_SUFFIXES lib)
+    set (FREETYPE_PATH_SUFFIXES lib)
-    if (ANDROID)
+    if (ANDROID)
-      set (FREETYPE_PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES} libs/${ANDROID_ABI})
+      set (FREETYPE_PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES} libs/${ANDROID_ABI})
-    endif()
+    endif()
-
+
-    # set 3RDPARTY_FREETYPE_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_LIBRARY
+    # set 3RDPARTY_FREETYPE_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_LIBRARY
-    set (3RDPARTY_FREETYPE_LIBRARY "3RDPARTY_FREETYPE_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to freetype library" FORCE)
+    set (3RDPARTY_FREETYPE_LIBRARY "3RDPARTY_FREETYPE_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to freetype library" FORCE)
-
+
-    if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+    if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-      find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE}
+      find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE}
-                                              PATHS "${3RDPARTY_FREETYPE_LIBRARY_DIR}" "${3RDPARTY_FREETYPE_DIR}"
+                                              PATHS "${3RDPARTY_FREETYPE_LIBRARY_DIR}" "${3RDPARTY_FREETYPE_DIR}"
-                                              PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
+                                              PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
-                                              CMAKE_FIND_ROOT_PATH_BOTH
+                                              CMAKE_FIND_ROOT_PATH_BOTH
-                                              NO_DEFAULT_PATH)
+                                              NO_DEFAULT_PATH)
-    else()
+    else()
-      find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE}
+      find_library (3RDPARTY_FREETYPE_LIBRARY ${CSF_FREETYPE}
-                                              PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
+                                              PATH_SUFFIXES ${FREETYPE_PATH_SUFFIXES}
-                                              CMAKE_FIND_ROOT_PATH_BOTH)
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
-    endif()
+    endif()
-
+
-    # Only for UNIX (not APPLE)
+    # Only for UNIX (not APPLE)
-    if ((NOT WIN32) AND (NOT APPLE))
+    if ((NOT WIN32) AND (NOT APPLE))
-      # To avoid linker error on Ubuntu 18.04 and some others linux distributives we should
+      # To avoid linker error on Ubuntu 18.04 and some others linux distributives we should
-      # link with freetype library, compiled as Position Independent Code (PIC),
+      # link with freetype library, compiled as Position Independent Code (PIC),
-      # for example, with shared object.
+      # for example, with shared object.
-      if ((DEFINED 3RDPARTY_FREETYPE_LIBRARY) AND (NOT "${3RDPARTY_FREETYPE_LIBRARY}" STREQUAL "") AND (EXISTS "${3RDPARTY_FREETYPE_LIBRARY}"))
+      if ((DEFINED 3RDPARTY_FREETYPE_LIBRARY) AND (NOT "${3RDPARTY_FREETYPE_LIBRARY}" STREQUAL "") AND (EXISTS "${3RDPARTY_FREETYPE_LIBRARY}"))
-        string (REPLACE "\.a" "\.so" 3RDPARTY_FREETYPE_LIBRARY "${3RDPARTY_FREETYPE_LIBRARY}")
+        string (REPLACE "\.a" "\.so" 3RDPARTY_FREETYPE_LIBRARY "${3RDPARTY_FREETYPE_LIBRARY}")
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
+    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
+      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-    else()
+    else()
-      set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
+      set (3RDPARTY_FREETYPE_LIBRARY_DIR "" CACHE PATH "The directory containing freetype library" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (3RDPARTY_FREETYPE_LIBRARY_DIR AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
+  if (3RDPARTY_FREETYPE_LIBRARY_DIR AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_FREETYPE_LIBRARY_DIR}")
-  else()
+  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FREETYPE_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_FREETYPE_LIBRARY_DIR)
-
+
-    set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE)
+    set (3RDPARTY_FREETYPE_LIBRARY "" CACHE FILEPATH "The path to freetype library" FORCE)
-  endif()
+  endif()
-
+
-  # freetype shared library
+  # freetype shared library
-  if (WIN32)
+  if (WIN32)
-    if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
+    if (NOT 3RDPARTY_FREETYPE_DLL OR NOT EXISTS "${3RDPARTY_FREETYPE_DLL}")
-
+
-      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
-
+
-      # set 3RDPARTY_FREETYPE_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_DLL
+      # set 3RDPARTY_FREETYPE_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_FREETYPE_DLL
-      set (3RDPARTY_FREETYPE_DLL "3RDPARTY_FREETYPE_DLL-NOTFOUND" CACHE FILEPATH "The path to freetype shared library" FORCE)
+      set (3RDPARTY_FREETYPE_DLL "3RDPARTY_FREETYPE_DLL-NOTFOUND" CACHE FILEPATH "The path to freetype shared library" FORCE)
-
+
-      if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
+      if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
-        find_library (3RDPARTY_FREETYPE_DLL ${CSF_FREETYPE}
+        find_library (3RDPARTY_FREETYPE_DLL ${CSF_FREETYPE}
-                                            PATHS "${3RDPARTY_FREETYPE_DIR}"
+                                            PATHS "${3RDPARTY_FREETYPE_DIR}"
-                                            PATH_SUFFIXES bin
+                                            PATH_SUFFIXES bin
-                                            NO_DEFAULT_PATH)
+                                            NO_DEFAULT_PATH)
-      else()
+      else()
-        find_library (3RDPARTY_FREETYPE_DLL ${CSF_FREETYPE}
+        find_library (3RDPARTY_FREETYPE_DLL ${CSF_FREETYPE}
-                                            PATH_SUFFIXES bin)
+                                            PATH_SUFFIXES bin)
-      endif()
+      endif()
-
+
-      if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
+      if (3RDPARTY_FREETYPE_DLL AND EXISTS "${3RDPARTY_FREETYPE_DLL}")
-        get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
+        get_filename_component (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL}" PATH)
-        set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
+        set (3RDPARTY_FREETYPE_DLL_DIR "${3RDPARTY_FREETYPE_DLL_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
-      else()
+      else()
-        set (3RDPARTY_FREETYPE_DLL_DIR "" CACHE PATH "The directory containing freetype shared library" FORCE)
+        set (3RDPARTY_FREETYPE_DLL_DIR "" CACHE PATH "The directory containing freetype shared library" FORCE)
-
+
-        set (3RDPARTY_FREETYPE_DLL "" CACHE FILEPATH "freetype shared library" FORCE)
+        set (3RDPARTY_FREETYPE_DLL "" CACHE FILEPATH "freetype shared library" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    if (3RDPARTY_FREETYPE_DLL_DIR OR EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
+    if (3RDPARTY_FREETYPE_DLL_DIR OR EXISTS "${3RDPARTY_FREETYPE_DLL_DIR}")
-      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FREETYPE_DLL_DIR}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_FREETYPE_DLL_DIR}")
-    else()
+    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FREETYPE_DLL_DIR)
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_FREETYPE_DLL_DIR)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  # install instructions
+  # install instructions
-  if (INSTALL_FREETYPE)
+  if (INSTALL_FREETYPE)
-    OCCT_MAKE_OS_WITH_BITNESS()
+    OCCT_MAKE_OS_WITH_BITNESS()
-
+
-    if (WIN32)
+    if (WIN32)
-      if (SINGLE_GENERATOR)
+      if (SINGLE_GENERATOR)
-        install (FILES "${3RDPARTY_FREETYPE_DLL}" DESTINATION "${INSTALL_DIR_BIN}")
+        install (FILES "${3RDPARTY_FREETYPE_DLL}" DESTINATION "${INSTALL_DIR_BIN}")
-      else()
+      else()
-        install (FILES "${3RDPARTY_FREETYPE_DLL}"
+        install (FILES "${3RDPARTY_FREETYPE_DLL}"
-                 CONFIGURATIONS Release
+                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR_BIN}")
+                 DESTINATION "${INSTALL_DIR_BIN}")
-        install (FILES "${3RDPARTY_FREETYPE_DLL}"
+        install (FILES "${3RDPARTY_FREETYPE_DLL}"
-                 CONFIGURATIONS RelWithDebInfo
+                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_DIR_BIN}i")
-        install (FILES "${3RDPARTY_FREETYPE_DLL}"
+        install (FILES "${3RDPARTY_FREETYPE_DLL}"
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR_BIN}d")
-      endif()
+      endif()
-    else()
+    else()
-      get_filename_component(3RDPARTY_FREETYPE_LIBRARY_ABS ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
+      get_filename_component(3RDPARTY_FREETYPE_LIBRARY_ABS ${3RDPARTY_FREETYPE_LIBRARY} REALPATH)
-      get_filename_component(3RDPARTY_FREETYPE_LIBRARY_NAME ${3RDPARTY_FREETYPE_LIBRARY} NAME)
+      get_filename_component(3RDPARTY_FREETYPE_LIBRARY_NAME ${3RDPARTY_FREETYPE_LIBRARY} NAME)
-
+
-      if (SINGLE_GENERATOR)
+      if (SINGLE_GENERATOR)
-        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-                 DESTINATION "${INSTALL_DIR_LIB}"
+                 DESTINATION "${INSTALL_DIR_LIB}"
-                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-      else()
+      else()
-        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-                 CONFIGURATIONS Release
+                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR_LIB}"
+                 DESTINATION "${INSTALL_DIR_LIB}"
-                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-                 CONFIGURATIONS RelWithDebInfo
+                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR_LIB}i"
+                 DESTINATION "${INSTALL_DIR_LIB}i"
-                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_FREETYPE_LIBRARY_ABS}"
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR_LIB}d"
+                 DESTINATION "${INSTALL_DIR_LIB}d"
-                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
+                 RENAME ${3RDPARTY_FREETYPE_LIBRARY_NAME}.6)
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    set (USED_3RDPARTY_FREETYPE_DIR "")
+    set (USED_3RDPARTY_FREETYPE_DIR "")
-  else()
+  else()
-    # the library directory for using by the executable
+    # the library directory for using by the executable
-    if (WIN32)
+    if (WIN32)
-      set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_DLL_DIR})
+      set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_DLL_DIR})
-    else()
+    else()
-      set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_LIBRARY_DIR})
+      set (USED_3RDPARTY_FREETYPE_DIR ${3RDPARTY_FREETYPE_LIBRARY_DIR})
-    endif()
+    endif()
-  endif()
+  endif()
-#endif()
+#endif()
-
+
-# unset all redundant variables
+# unset all redundant variables
-OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
+OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
-OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_freetype2)
+OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_freetype2)
-OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY_RELEASE)
+OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY_RELEASE)
-
+
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
-  mark_as_advanced (3RDPARTY_FREETYPE_LIBRARY 3RDPARTY_FREETYPE_DLL)
+  mark_as_advanced (3RDPARTY_FREETYPE_LIBRARY 3RDPARTY_FREETYPE_DLL)
-else()
+else()
-  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_DLL)
+  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_DLL)
-  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_DLL_DIR)
+  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_DLL_DIR)
-  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_LIBRARY)
+  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_LIBRARY)
-  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_LIBRARY_DIR)
+  OCCT_CHECK_AND_UNSET(3RDPARTY_FREETYPE_LIBRARY_DIR)
-  OCCT_CHECK_AND_UNSET(INSTALL_FREETYPE)
+  OCCT_CHECK_AND_UNSET(INSTALL_FREETYPE)
-endif()
+endif()

adm/cmake/gles2.cmake

@@ -1,3 +1,3 @@
-# OpenGL ES 2.0
+# OpenGL ES 2.0
-
+
-THIRDPARTY_PRODUCT("GLES2" "GLES2/gl2.h" "CSF_OpenGlesLibs" "")
+THIRDPARTY_PRODUCT("GLES2" "GLES2/gl2.h" "CSF_OpenGlesLibs" "")

adm/cmake/glx.cmake

@@ -1,4 +1,4 @@
-# glx
+# glx
-
+
-separate_arguments (CSF_OpenGlLibs)
+separate_arguments (CSF_OpenGlLibs)
-THIRDPARTY_PRODUCT("GLX" "GL/glx.h" "CSF_OpenGlLibs" "d")
+THIRDPARTY_PRODUCT("GLX" "GL/glx.h" "CSF_OpenGlLibs" "d")

adm/cmake/occt_csf.cmake

@@ -1,150 +1,150 @@
-# CSF variables definition
+# CSF variables definition
-
+
-if(CSFS_ALREADY_INCLUDED)
+if(CSFS_ALREADY_INCLUDED)
-  return()
+  return()
-endif()
+endif()
-set(CSFS_ALREADY_INCLUDED 1)
+set(CSFS_ALREADY_INCLUDED 1)
-
+
-
+
-if (NOT DEFINED USE_TCL)
+if (NOT DEFINED USE_TCL)
-  OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
+  OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
-endif()
+endif()
-
+
-# TBB
+# TBB
-if (USE_TBB)
+if (USE_TBB)
-  set (CSF_TBB "tbb tbbmalloc")
+  set (CSF_TBB "tbb tbbmalloc")
-else()
+else()
-  set (CSF_TBB)
+  set (CSF_TBB)
-endif()
+endif()
-
+
-# FREETYPE
+# FREETYPE
-if (USE_FREETYPE)
+if (USE_FREETYPE)
-  set (CSF_FREETYPE "freetype")
+  set (CSF_FREETYPE "freetype")
-else()
+else()
-  set (CSF_FREETYPE)
+  set (CSF_FREETYPE)
-endif()
+endif()
-
+
-# FFmpeg
+# FFmpeg
-if (USE_FFMPEG)
+if (USE_FFMPEG)
-  set (CSF_FFmpeg "avcodec avformat swscale avutil")
+  set (CSF_FFmpeg "avcodec avformat swscale avutil")
-else()
+else()
-  set (CSF_FFmpeg)
+  set (CSF_FFmpeg)
-endif()
+endif()
-
+
-# FREEIMAGE
+# FREEIMAGE
-if (USE_FREEIMAGE)
+if (USE_FREEIMAGE)
-  set (CSF_FreeImagePlus "freeimage")
+  set (CSF_FreeImagePlus "freeimage")
-else()
+else()
-  if (WIN32)
+  if (WIN32)
-    set (CSF_FreeImagePlus "windowscodecs")
+    set (CSF_FreeImagePlus "windowscodecs")
-  else()
+  else()
-    set (CSF_FreeImagePlus)
+    set (CSF_FreeImagePlus)
-  endif()
+  endif()
-endif()
+endif()
-
+
-# OpenVR
+# OpenVR
-if (USE_OPENVR)
+if (USE_OPENVR)
-  set (CSF_OpenVR "openvr_api")
+  set (CSF_OpenVR "openvr_api")
-else()
+else()
-  set (CSF_OpenVR)
+  set (CSF_OpenVR)
-endif()
+endif()
-
+
-# TCL
+# TCL
-if (USE_TCL)
+if (USE_TCL)
-  if (WIN32)
+  if (WIN32)
-    set (CSF_TclLibs     "tcl86")
+    set (CSF_TclLibs     "tcl86")
-  else()
+  else()
-    if(APPLE)
+    if(APPLE)
-      set (CSF_TclLibs   Tcl)
+      set (CSF_TclLibs   Tcl)
-    elseif(UNIX)
+    elseif(UNIX)
-      set (CSF_TclLibs   "tcl8.6")
+      set (CSF_TclLibs   "tcl8.6")
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# TK
+# TK
-if (USE_TK)
+if (USE_TK)
-  if (WIN32)
+  if (WIN32)
-    set (CSF_TclTkLibs   "tk86")
+    set (CSF_TclTkLibs   "tk86")
-  else()
+  else()
-    if(APPLE)
+    if(APPLE)
-      set (CSF_TclTkLibs Tk)
+      set (CSF_TclTkLibs Tk)
-    elseif(UNIX)
+    elseif(UNIX)
-      set (CSF_TclTkLibs "tk8.6")
+      set (CSF_TclTkLibs "tk8.6")
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# Draco
+# Draco
-if (USE_DRACO)
+if (USE_DRACO)
-  set (CSF_Draco "draco")
+  set (CSF_Draco "draco")
-else()
+else()
-  set (CSF_Draco)
+  set (CSF_Draco)
-endif()
+endif()
-
+
-if (WIN32)
+if (WIN32)
-  set (CSF_advapi32      "advapi32.lib")
+  set (CSF_advapi32      "advapi32.lib")
-  set (CSF_gdi32         "gdi32.lib")
+  set (CSF_gdi32         "gdi32.lib")
-  set (CSF_user32        "user32.lib")
+  set (CSF_user32        "user32.lib")
-  set (CSF_shell32       "shell32.lib")
+  set (CSF_shell32       "shell32.lib")
-  set (CSF_wsock32       "wsock32.lib")
+  set (CSF_wsock32       "wsock32.lib")
-  set (CSF_psapi         "psapi.lib")
+  set (CSF_psapi         "psapi.lib")
-  set (CSF_winmm         "winmm.lib")
+  set (CSF_winmm         "winmm.lib")
-  set (CSF_d3d9          "D3D9.lib")
+  set (CSF_d3d9          "D3D9.lib")
-  set (CSF_OpenGlLibs    "opengl32.lib")
+  set (CSF_OpenGlLibs    "opengl32.lib")
-  set (CSF_OpenGlesLibs  "libEGL libGLESv2")
+  set (CSF_OpenGlesLibs  "libEGL libGLESv2")
-else()
+else()
-
+
-  if (APPLE)
+  if (APPLE)
-    set (CSF_objc        "objc")
+    set (CSF_objc        "objc")
-
+
-    # frameworks
+    # frameworks
-    if (IOS)
+    if (IOS)
-      find_library (Appkit_LIB NAMES UIKit)
+      find_library (Appkit_LIB NAMES UIKit)
-      set (CSF_Appkit ${Appkit_LIB})
+      set (CSF_Appkit ${Appkit_LIB})
-    else()
+    else()
-      find_library (Appkit_LIB NAMES AppKit)
+      find_library (Appkit_LIB NAMES AppKit)
-      set (CSF_Appkit ${Appkit_LIB})
+      set (CSF_Appkit ${Appkit_LIB})
-    endif()
+    endif()
-    OCCT_CHECK_AND_UNSET (Appkit_LIB)
+    OCCT_CHECK_AND_UNSET (Appkit_LIB)
-
+
-    find_library (IOKit_LIB NAMES IOKit)
+    find_library (IOKit_LIB NAMES IOKit)
-    set (CSF_IOKit ${IOKit_LIB})
+    set (CSF_IOKit ${IOKit_LIB})
-    OCCT_CHECK_AND_UNSET (IOKit_LIB)
+    OCCT_CHECK_AND_UNSET (IOKit_LIB)
-
+
-    if (IOS)
+    if (IOS)
-      find_library (OpenGlesLibs_LIB NAMES OpenGLES)
+      find_library (OpenGlesLibs_LIB NAMES OpenGLES)
-      set (CSF_OpenGlesLibs ${OpenGlesLibs_LIB})
+      set (CSF_OpenGlesLibs ${OpenGlesLibs_LIB})
-      OCCT_CHECK_AND_UNSET (OpenGlesLibs_LIB)
+      OCCT_CHECK_AND_UNSET (OpenGlesLibs_LIB)
-    elseif (USE_XLIB)
+    elseif (USE_XLIB)
-      set (CSF_OpenGlLibs "GL")
+      set (CSF_OpenGlLibs "GL")
-      set (CSF_XwLibs     "X11")
+      set (CSF_XwLibs     "X11")
-    else()
+    else()
-      find_library (OpenGlLibs_LIB NAMES OpenGL)
+      find_library (OpenGlLibs_LIB NAMES OpenGL)
-      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
+      set (CSF_OpenGlLibs ${OpenGlLibs_LIB})
-      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
+      OCCT_CHECK_AND_UNSET (OpenGlLibs_LIB)
-    endif()
+    endif()
-
+
-  elseif (EMSCRIPTEN)
+  elseif (EMSCRIPTEN)
-    set (CSF_ThreadLibs   "pthread rt stdc++")
+    set (CSF_ThreadLibs   "pthread rt stdc++")
-    set (CSF_OpenGlesLibs "EGL GLESv2")
+    set (CSF_OpenGlesLibs "EGL GLESv2")
-    set (CSF_dl           "dl")
+    set (CSF_dl           "dl")
-  elseif (ANDROID)
+  elseif (ANDROID)
-    set (CSF_ThreadLibs  "c")
+    set (CSF_ThreadLibs  "c")
-    set (CSF_OpenGlesLibs "EGL GLESv2")
+    set (CSF_OpenGlesLibs "EGL GLESv2")
-    set (CSF_androidlog  "log")
+    set (CSF_androidlog  "log")
-  elseif (UNIX)
+  elseif (UNIX)
-    set (CSF_ThreadLibs  "pthread rt stdc++")
+    set (CSF_ThreadLibs  "pthread rt stdc++")
-    if (USE_XLIB)
+    if (USE_XLIB)
-      set (CSF_OpenGlLibs "GL")
+      set (CSF_OpenGlLibs "GL")
-      set (CSF_XwLibs     "X11")
+      set (CSF_XwLibs     "X11")
-    else()
+    else()
-      set (CSF_OpenGlLibs "GL EGL")
+      set (CSF_OpenGlLibs "GL EGL")
-    endif()
+    endif()
-    set (CSF_OpenGlesLibs "EGL GLESv2")
+    set (CSF_OpenGlesLibs "EGL GLESv2")
-    set (CSF_dl          "dl")
+    set (CSF_dl          "dl")
-    if (USE_FREETYPE)
+    if (USE_FREETYPE)
-      set (CSF_fontconfig "fontconfig")
+      set (CSF_fontconfig "fontconfig")
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()

adm/cmake/occt_defs_flags.cmake

@@ -1,159 +1,159 @@
-##
+##
-
+
-if(FLAGS_ALREADY_INCLUDED)
+if(FLAGS_ALREADY_INCLUDED)
-  return()
+  return()
-endif()
+endif()
-set(FLAGS_ALREADY_INCLUDED 1)
+set(FLAGS_ALREADY_INCLUDED 1)
-
+
-# force option /fp:precise for Visual Studio projects.
+# force option /fp:precise for Visual Studio projects.
-#
+#
-# Note that while this option is default for MSVC compiler, Visual Studio
+# Note that while this option is default for MSVC compiler, Visual Studio
-# project can be switched later to use Intel Compiler (ICC).
+# project can be switched later to use Intel Compiler (ICC).
-# Enforcing -fp:precise ensures that in such case ICC will use correct
+# Enforcing -fp:precise ensures that in such case ICC will use correct
-# option instead of its default -fp:fast which is harmful for OCCT.
+# option instead of its default -fp:fast which is harmful for OCCT.
-if (MSVC)
+if (MSVC)
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise")
-  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /fp:precise")
+  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /fp:precise")
-endif()
+endif()
-
+
-# add SSE2 option for old MSVC compilers (VS 2005 - 2010, 32 bit only)
+# add SSE2 option for old MSVC compilers (VS 2005 - 2010, 32 bit only)
-if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
+if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
-  if (MSVC AND ((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION EQUAL 1500) OR (MSVC_VERSION EQUAL 1600)))
+  if (MSVC AND ((MSVC_VERSION EQUAL 1400) OR (MSVC_VERSION EQUAL 1500) OR (MSVC_VERSION EQUAL 1600)))
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
-    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /arch:SSE2")
+    set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   /arch:SSE2")
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (MSVC)
+if (MSVC)
-  # suppress C26812 on VS2019/C++20 (prefer 'enum class' over 'enum')
+  # suppress C26812 on VS2019/C++20 (prefer 'enum class' over 'enum')
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /wd\"26812\"")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /wd\"26812\"")
-  # suppress warning on using portable non-secure functions in favor of non-portable secure ones
+  # suppress warning on using portable non-secure functions in favor of non-portable secure ones
-  add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
+  add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
-else()
+else()
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -fPIC")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -fPIC")
-  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fexceptions -fPIC")
+  set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fexceptions -fPIC")
-  add_definitions(-DOCC_CONVERT_SIGNALS)
+  add_definitions(-DOCC_CONVERT_SIGNALS)
-endif()
+endif()
-
+
-# enable structured exceptions for MSVC
+# enable structured exceptions for MSVC
-string (REGEX MATCH "EHsc" ISFLAG "${CMAKE_CXX_FLAGS}")
+string (REGEX MATCH "EHsc" ISFLAG "${CMAKE_CXX_FLAGS}")
-if (ISFLAG)
+if (ISFLAG)
-  string (REGEX REPLACE "EHsc" "EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  string (REGEX REPLACE "EHsc" "EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-elseif (MSVC)
+elseif (MSVC)
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHa")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHa")
-endif()
+endif()
-
+
-if (MSVC)
+if (MSVC)
-  # string pooling (GF), function-level linking (Gy)
+  # string pooling (GF), function-level linking (Gy)
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GF /Gy")
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GF /Gy")
-  set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GF /Gy")
+  set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GF /Gy")
-  if (BUILD_FORCE_RelWithDebInfo)
+  if (BUILD_FORCE_RelWithDebInfo)
-    # generate debug info (Zi), inline expansion level (Ob1)
+    # generate debug info (Zi), inline expansion level (Ob1)
-    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /Ob1")
+    set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /Ob1")
-    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /Zi /Ob1")
+    set (CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /Zi /Ob1")
-    # generate debug info (debug), OptimizeReferences=true (OPT:REF), EnableCOMDATFolding=true (OPT:ICF)
+    # generate debug info (debug), OptimizeReferences=true (OPT:REF), EnableCOMDATFolding=true (OPT:ICF)
-    set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /debug /OPT:REF /OPT:ICF")
+    set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /debug /OPT:REF /OPT:ICF")
-  endif()
+  endif()
-endif()
+endif()
-
+
-# remove _WINDOWS flag if it exists
+# remove _WINDOWS flag if it exists
-string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_CXX_FLAGS}")
+string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_CXX_FLAGS}")
-if (IS_WINDOWSFLAG)
+if (IS_WINDOWSFLAG)
-  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_CXX_FLAGS")
+  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_CXX_FLAGS")
-  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-endif()
+endif()
-
+
-# remove WIN32 flag if it exists
+# remove WIN32 flag if it exists
-string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_CXX_FLAGS}")
+string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_CXX_FLAGS}")
-if (IS_WIN32FLAG)
+if (IS_WIN32FLAG)
-  message (STATUS "Info: /DWIN32 has been removed from CMAKE_CXX_FLAGS")
+  message (STATUS "Info: /DWIN32 has been removed from CMAKE_CXX_FLAGS")
-  string (REGEX REPLACE "/DWIN32" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  string (REGEX REPLACE "/DWIN32" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-endif()
+endif()
-
+
-# remove _WINDOWS flag if it exists
+# remove _WINDOWS flag if it exists
-string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_C_FLAGS}")
+string (REGEX MATCH "/D_WINDOWS" IS_WINDOWSFLAG "${CMAKE_C_FLAGS}")
-if (IS_WINDOWSFLAG)
+if (IS_WINDOWSFLAG)
-  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_C_FLAGS")
+  message (STATUS "Info: /D_WINDOWS has been removed from CMAKE_C_FLAGS")
-  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+  string (REGEX REPLACE "/D_WINDOWS" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-endif()
+endif()
-
+
-# remove WIN32 flag if it exists
+# remove WIN32 flag if it exists
-string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_C_FLAGS}")
+string (REGEX MATCH "/DWIN32" IS_WIN32FLAG "${CMAKE_C_FLAGS}")
-if (IS_WIN32FLAG)
+if (IS_WIN32FLAG)
-  message (STATUS "Info: /DWIN32 has been removed from CMAKE_C_FLAGS")
+  message (STATUS "Info: /DWIN32 has been removed from CMAKE_C_FLAGS")
-  string (REGEX REPLACE "/DWIN32" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+  string (REGEX REPLACE "/DWIN32" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-endif()
+endif()
-
+
-# remove DEBUG flag if it exists
+# remove DEBUG flag if it exists
-string (REGEX MATCH "-DDEBUG" IS_DEBUG_CXX "${CMAKE_CXX_FLAGS_DEBUG}")
+string (REGEX MATCH "-DDEBUG" IS_DEBUG_CXX "${CMAKE_CXX_FLAGS_DEBUG}")
-if (IS_DEBUG_CXX)
+if (IS_DEBUG_CXX)
-  message (STATUS "Info: -DDEBUG has been removed from CMAKE_CXX_FLAGS_DEBUG")
+  message (STATUS "Info: -DDEBUG has been removed from CMAKE_CXX_FLAGS_DEBUG")
-  string (REGEX REPLACE "-DDEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+  string (REGEX REPLACE "-DDEBUG" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-endif()
+endif()
-
+
-string (REGEX MATCH "-DDEBUG" IS_DEBUG_C "${CMAKE_C_FLAGS_DEBUG}")
+string (REGEX MATCH "-DDEBUG" IS_DEBUG_C "${CMAKE_C_FLAGS_DEBUG}")
-if (IS_DEBUG_C)
+if (IS_DEBUG_C)
-  message (STATUS "Info: -DDEBUG has been removed from CMAKE_C_FLAGS_DEBUG")
+  message (STATUS "Info: -DDEBUG has been removed from CMAKE_C_FLAGS_DEBUG")
-  string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+  string (REGEX REPLACE "-DDEBUG" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-endif()
+endif()
-# enable parallel compilation on MSVC 9 and above
+# enable parallel compilation on MSVC 9 and above
-if (MSVC AND (MSVC_VERSION GREATER 1400))
+if (MSVC AND (MSVC_VERSION GREATER 1400))
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-endif()
+endif()
-
+
-# generate a single response file which enlist all of the object files
+# generate a single response file which enlist all of the object files
-if (NOT DEFINED CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS)
+if (NOT DEFINED CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS)
-  SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+  SET(CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-endif()
+endif()
-if (NOT DEFINED CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS)
+if (NOT DEFINED CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS)
-  SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+  SET(CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-endif()
+endif()
-
+
-# increase compiler warnings level (-W4 for MSVC, -Wextra for GCC)
+# increase compiler warnings level (-W4 for MSVC, -Wextra for GCC)
-if (MSVC)
+if (MSVC)
-  if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+  if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-    string (REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    string (REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  else()
+  else()
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-  endif()
+  endif()
-elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]"))
+elseif (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]"))
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
-  if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
+  if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
-  endif()
+  endif()
-  if (BUILD_SHARED_LIBS)
+  if (BUILD_SHARED_LIBS)
-    if (APPLE)
+    if (APPLE)
-      set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
+      set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
-    elseif(NOT WIN32)
+    elseif(NOT WIN32)
-      set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
+      set (CMAKE_SHARED_LINKER_FLAGS "-lm ${CMAKE_SHARED_LINKER_FLAGS}")
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
+if (CMAKE_CXX_COMPILER_ID MATCHES "[Cc][Ll][Aa][Nn][Gg]")
-  if (APPLE)
+  if (APPLE)
-    # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.
+    # CLang can be used with both libstdc++ and libc++, however on OS X libstdc++ is outdated.
-    set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
+    set (CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
-  endif()
+  endif()
-  # Optimize size of binaries
+  # Optimize size of binaries
-  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
+  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
-elseif(MINGW)
+elseif(MINGW)
-  add_definitions(-D_WIN32_WINNT=0x0601)
+  add_definitions(-D_WIN32_WINNT=0x0601)
-  # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
+  # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
-  #set (CMAKE_SYSTEM_VERSION "6.1")
+  #set (CMAKE_SYSTEM_VERSION "6.1")
-  # workaround bugs in mingw with vtable export
+  # workaround bugs in mingw with vtable export
-  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")
+  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all-symbols")
-
+
-  # Optimize size of binaries
+  # Optimize size of binaries
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
-elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
-  # Optimize size of binaries
+  # Optimize size of binaries
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
-endif()
+endif()
-
+
-if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
-endif()
+endif()

adm/cmake/occt_resources.cmake

@@ -1,78 +1,78 @@
-# OCCT resource files generation
+# OCCT resource files generation
-
+
-macro (OCCT_GENERATE_CONTENT_ONLY CurrentResource)
+macro (OCCT_GENERATE_CONTENT_ONLY CurrentResource)
-  set (RESOURCE_FILES)
+  set (RESOURCE_FILES)
-  set (isResDirectory FALSE)
+  set (isResDirectory FALSE)
-  if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/src/${CurrentResource}")
+  if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/src/${CurrentResource}")
-    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource}/FILES" RESOURCE_FILES)
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource}/FILES" RESOURCE_FILES)
-    set (CurrentResource_Directory "${CurrentResource}")
+    set (CurrentResource_Directory "${CurrentResource}")
-    set (isResDirectory TRUE)
+    set (isResDirectory TRUE)
-  else()
+  else()
-    get_filename_component (CurrentResource_Name "${CurrentResource}" NAME)
+    get_filename_component (CurrentResource_Name "${CurrentResource}" NAME)
-    list (APPEND RESOURCE_FILES "res:::${CurrentResource_Name}")
+    list (APPEND RESOURCE_FILES "res:::${CurrentResource_Name}")
-    get_filename_component (CurrentResource_Directory "${CurrentResource}" DIRECTORY)
+    get_filename_component (CurrentResource_Directory "${CurrentResource}" DIRECTORY)
-  endif()
+  endif()
-
+
-  # Add current toolkit into RESOURCE_TOOLKITS array to copy it to the BUILD directory
+  # Add current toolkit into RESOURCE_TOOLKITS array to copy it to the BUILD directory
-  list (APPEND RESOURCE_TOOLKITS "${CurrentResource_Directory}")
+  list (APPEND RESOURCE_TOOLKITS "${CurrentResource_Directory}")
-  list (REMOVE_DUPLICATES RESOURCE_TOOLKITS)
+  list (REMOVE_DUPLICATES RESOURCE_TOOLKITS)
-
+
-  if (BUILD_RESOURCES)
+  if (BUILD_RESOURCES)
-    foreach (RESOURCE_FILE ${RESOURCE_FILES})
+    foreach (RESOURCE_FILE ${RESOURCE_FILES})
-      string (REGEX MATCH "^[^:]+:::" IS_RESOURCE "${RESOURCE_FILE}")
+      string (REGEX MATCH "^[^:]+:::" IS_RESOURCE "${RESOURCE_FILE}")
-      if (IS_RESOURCE)
+      if (IS_RESOURCE)
-        string (REGEX REPLACE "[^:]+:+" "" RESOURCE_FILE "${RESOURCE_FILE}")
+        string (REGEX REPLACE "[^:]+:+" "" RESOURCE_FILE "${RESOURCE_FILE}")
-
+
-        get_filename_component (CurrentResource_FileName "${RESOURCE_FILE}" NAME)
+        get_filename_component (CurrentResource_FileName "${RESOURCE_FILE}" NAME)
-        string (REPLACE "." "_" CurrentResource_FileName "${CurrentResource_FileName}")
+        string (REPLACE "." "_" CurrentResource_FileName "${CurrentResource_FileName}")
-        set (HEADER_FILE_NAME "${CurrentResource_Directory}_${CurrentResource_FileName}.pxx")
+        set (HEADER_FILE_NAME "${CurrentResource_Directory}_${CurrentResource_FileName}.pxx")
-
+
-        set (toProcessResFile TRUE)
+        set (toProcessResFile TRUE)
-        if (isResDirectory)
+        if (isResDirectory)
-          list (FIND RESOURCE_FILES "${HEADER_FILE_NAME}" aResIndex)
+          list (FIND RESOURCE_FILES "${HEADER_FILE_NAME}" aResIndex)
-          if ("${aResIndex}" STREQUAL "-1")
+          if ("${aResIndex}" STREQUAL "-1")
-            set (toProcessResFile FALSE)
+            set (toProcessResFile FALSE)
-          endif()
+          endif()
-        endif()
+        endif()
-
+
-        if (toProcessResFile)
+        if (toProcessResFile)
-          message(STATUS "Info. Generating header file from resource file: ${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}")
+          message(STATUS "Info. Generating header file from resource file: ${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}")
-
+
-          # generate content for header file
+          # generate content for header file
-          set (OCCT_HEADER_FILE_CONTENT "// This file has been automatically generated from resource file src/${CurrentResource_Directory}/${RESOURCE_FILE}\n\n")
+          set (OCCT_HEADER_FILE_CONTENT "// This file has been automatically generated from resource file src/${CurrentResource_Directory}/${RESOURCE_FILE}\n\n")
-
+
-          # read resource file
+          # read resource file
-          file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}" RESOURCE_FILE_LINES_LIST)
+          file (STRINGS "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${RESOURCE_FILE}" RESOURCE_FILE_LINES_LIST)
-
+
-          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}static const char ${CurrentResource_Directory}_${CurrentResource_FileName}[] =")
+          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}static const char ${CurrentResource_Directory}_${CurrentResource_FileName}[] =")
-          foreach (line IN LISTS RESOURCE_FILE_LINES_LIST)
+          foreach (line IN LISTS RESOURCE_FILE_LINES_LIST)
-            string (REPLACE "\"" "\\\"" line "${line}")
+            string (REPLACE "\"" "\\\"" line "${line}")
-            set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}\n  \"${line}\\n\"")
+            set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT}\n  \"${line}\\n\"")
-          endforeach()
+          endforeach()
-          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT};")
+          set (OCCT_HEADER_FILE_CONTENT "${OCCT_HEADER_FILE_CONTENT};")
-
+
-          # Save generated content to header file
+          # Save generated content to header file
-          set (HEADER_FILE "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${HEADER_FILE_NAME}")
+          set (HEADER_FILE "${CMAKE_SOURCE_DIR}/src/${CurrentResource_Directory}/${HEADER_FILE_NAME}")
-          if (EXISTS "${HEADER_FILE}")
+          if (EXISTS "${HEADER_FILE}")
-            file (REMOVE "${HEADER_FILE}")
+            file (REMOVE "${HEADER_FILE}")
-          endif()
+          endif()
-          configure_file ("${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${HEADER_FILE}" @ONLY NEWLINE_STYLE LF)
+          configure_file ("${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${HEADER_FILE}" @ONLY NEWLINE_STYLE LF)
-        endif()
+        endif()
-      endif()
+      endif()
-    endforeach()
+    endforeach()
-  endif()
+  endif()
-endmacro()
+endmacro()
-
+
-
+
-FILE_TO_LIST ("adm/RESOURCES" RESOURCES)
+FILE_TO_LIST ("adm/RESOURCES" RESOURCES)
-foreach (CurrentResource ${RESOURCES})
+foreach (CurrentResource ${RESOURCES})
-  get_filename_component (CurrentResource_FileName "${CurrentResource}" NAME)
+  get_filename_component (CurrentResource_FileName "${CurrentResource}" NAME)
-  if ("${CurrentResource_FileName}" STREQUAL TObj.msg OR
+  if ("${CurrentResource_FileName}" STREQUAL TObj.msg OR
-      "${CurrentResource_FileName}" STREQUAL BOPAlgo.msg OR
+      "${CurrentResource_FileName}" STREQUAL BOPAlgo.msg OR
-      "${CurrentResource_FileName}" STREQUAL Units.dat OR
+      "${CurrentResource_FileName}" STREQUAL Units.dat OR
-      "${CurrentResource}" STREQUAL XSMessage OR
+      "${CurrentResource}" STREQUAL XSMessage OR
-      "${CurrentResource}" STREQUAL SHMessage OR
+      "${CurrentResource}" STREQUAL SHMessage OR
-      "${CurrentResource}" STREQUAL Shaders)
+      "${CurrentResource}" STREQUAL Shaders)
-    OCCT_GENERATE_CONTENT_ONLY ("${CurrentResource}")
+    OCCT_GENERATE_CONTENT_ONLY ("${CurrentResource}")
-  endif()
+  endif()
-endforeach()
+endforeach()

adm/cmake/occt_toolkit_prepare_sample.cmake

@@ -1,18 +1,18 @@
-if ("${TARGET_FOLDER}" STREQUAL "")
+if ("${TARGET_FOLDER}" STREQUAL "")
-  set (EXECUTABLE_PROJECT ON)
+  set (EXECUTABLE_PROJECT ON)
-  set (USE_QT ON)
+  set (USE_QT ON)
-
+
-  set (RELATIVE_DIR "samples/qt")
+  set (RELATIVE_DIR "samples/qt")
-  set (MODULES_LIST ${OCCT_SAMPLES})
+  set (MODULES_LIST ${OCCT_SAMPLES})
-  set (TARGET_FOLDER "Samples")
+  set (TARGET_FOLDER "Samples")
-  set (TOOLKITS_NAME_SUFFIX "SAMPLES_TOOLKITS")
+  set (TOOLKITS_NAME_SUFFIX "SAMPLES_TOOLKITS")
-
+
-  include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
+  include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
-else()
+else()
-  unset (USE_QT)
+  unset (USE_QT)
-  unset (RELATIVE_DIR)
+  unset (RELATIVE_DIR)
-  unset (EXECUTABLE_PROJECT)
+  unset (EXECUTABLE_PROJECT)
-  unset (MODULES_LIST)
+  unset (MODULES_LIST)
-  unset (TARGET_FOLDER)
+  unset (TARGET_FOLDER)
-  unset (TOOLKITS_NAME_SUFFIX)
+  unset (TOOLKITS_NAME_SUFFIX)
-endif("${TARGET_FOLDER}" STREQUAL "")
+endif("${TARGET_FOLDER}" STREQUAL "")

adm/cmake/occt_toolkit_prepare_tool.cmake

@@ -1,13 +1,13 @@
-if ("${TARGET_FOLDER}" STREQUAL "")
+if ("${TARGET_FOLDER}" STREQUAL "")
-  set (USE_QT ON)
+  set (USE_QT ON)
-  set (RELATIVE_DIR "tools")
+  set (RELATIVE_DIR "tools")
-  set (MODULES_LIST ${OCCT_TOOLS})
+  set (MODULES_LIST ${OCCT_TOOLS})
-  set (TARGET_FOLDER "Tools")
+  set (TARGET_FOLDER "Tools")
-  set (TOOLKITS_NAME_SUFFIX "TOOL_TOOLKITS")
+  set (TOOLKITS_NAME_SUFFIX "TOOL_TOOLKITS")
-else()
+else()
-  unset (USE_QT)
+  unset (USE_QT)
-  unset (RELATIVE_DIR)
+  unset (RELATIVE_DIR)
-  unset (MODULES_LIST)
+  unset (MODULES_LIST)
-  unset (TARGET_FOLDER)
+  unset (TARGET_FOLDER)
-  unset (TOOLKITS_NAME_SUFFIX)
+  unset (TOOLKITS_NAME_SUFFIX)
-endif("${TARGET_FOLDER}" STREQUAL "")
+endif("${TARGET_FOLDER}" STREQUAL "")

adm/cmake/opencl.cmake

@@ -1,27 +1,27 @@
-#OpenCl
+#OpenCl
-
+
-SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER $ENV{AMDAPPSDKROOT}/include
+SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER $ENV{AMDAPPSDKROOT}/include
-                                                  $ENV{INTELOCLSDKROOT}/include
+                                                  $ENV{INTELOCLSDKROOT}/include
-                                                  $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc
+                                                  $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc
-                                                  $ENV{ATISTREAMSDKROOT}/include)
+                                                  $ENV{ATISTREAMSDKROOT}/include)
-
+
-
+
-IF(${COMPILER_BITNESS} STREQUAL 32)
+IF(${COMPILER_BITNESS} STREQUAL 32)
-  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86
+  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86
-                                               $ENV{INTELOCLSDKROOT}/lib/x86
+                                               $ENV{INTELOCLSDKROOT}/lib/x86
-                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32
+                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32
-                                               $ENV{ATISTREAMSDKROOT}/lib/x86)
+                                               $ENV{ATISTREAMSDKROOT}/lib/x86)
-ELSEIF(${COMPILER_BITNESS} STREQUAL 64)
+ELSEIF(${COMPILER_BITNESS} STREQUAL 64)
-  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86_64
+  SET (3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB $ENV{AMDAPPSDKROOT}/lib/x86_64
-                                               $ENV{INTELOCLSDKROOT}/lib/x64
+                                               $ENV{INTELOCLSDKROOT}/lib/x64
-                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64
+                                               $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64
-                                               $ENV{ATISTREAMSDKROOT}/lib/x86_64)
+                                               $ENV{ATISTREAMSDKROOT}/lib/x86_64)
-ENDIF()
+ENDIF()
-
+
-THIRDPARTY_PRODUCT("OPENCL" "CL/cl.h" "OpenCL" "OpenCLd")
+THIRDPARTY_PRODUCT("OPENCL" "CL/cl.h" "OpenCL" "OpenCLd")
-
+
-# if CL/cl.h isn't found (and 3RDPARTY_OPENCL_INCLUDE_DIR isn't defined)
+# if CL/cl.h isn't found (and 3RDPARTY_OPENCL_INCLUDE_DIR isn't defined)
-# then try to find OpenCL/cl.h (all other variable won't be changed)
+# then try to find OpenCL/cl.h (all other variable won't be changed)
-IF(NOT 3RDPARTY_OPENCL_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_OPENCL_INCLUDE_DIR}")
+IF(NOT 3RDPARTY_OPENCL_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_OPENCL_INCLUDE_DIR}")
-  THIRDPARTY_PRODUCT("OPENCL" "OpenCL/cl.h" "OpenCL" "OpenCLd")
+  THIRDPARTY_PRODUCT("OPENCL" "OpenCL/cl.h" "OpenCL" "OpenCLd")
 ENDIF()

adm/cmake/openvr.cmake

@@ -1,5 +1,5 @@
-# OpenVR SDK
+# OpenVR SDK
-# OpenVR is an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
+# OpenVR is an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
-# https://github.com/ValveSoftware/openvr
+# https://github.com/ValveSoftware/openvr
-
+
-THIRDPARTY_PRODUCT("OPENVR" "openvr.h" "CSF_OpenVR" "")
+THIRDPARTY_PRODUCT("OPENVR" "openvr.h" "CSF_OpenVR" "")

adm/cmake/qt.cmake

@@ -1,41 +1,41 @@
-#qt
+#qt
-
+
-# Qt is searched manually first (just determine root)
+# Qt is searched manually first (just determine root)
-message (STATUS "Processing Qt 3-rd party")
+message (STATUS "Processing Qt 3-rd party")
-
+
-if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
+if (NOT DEFINED ${3RDPARTY_QT_DIR} AND ${3RDPARTY_QT_DIR} STREQUAL "")
-  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
+  FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" Qt 3RDPARTY_QT_DIR_NAME)
-
+
-  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
+  if (NOT DEFINED ${3RDPARTY_QT_DIR_NAME} AND ${3RDPARTY_QT_DIR_NAME} STREQUAL "")
-    set (3RDPARTY_QT_DIR "" CACHE PATH "The directory containing qt")
+    set (3RDPARTY_QT_DIR "" CACHE PATH "The directory containing qt")
-    message (FATAL_ERROR "Could not find used third-party product: 3RDPARTY_QT_DIR")
+    message (FATAL_ERROR "Could not find used third-party product: 3RDPARTY_QT_DIR")
-  endif()
+  endif()
-
+
-  # Combine directory name with absolute path and show in GUI
+  # Combine directory name with absolute path and show in GUI
-  set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
+  set (3RDPARTY_QT_DIR "${3RDPARTY_DIR}/${3RDPARTY_QT_DIR_NAME}" CACHE PATH "The directory containing Qt" FORCE)
-  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
+  message (STATUS "Info: Qt is used from folder: ${3RDPARTY_QT_DIR}")
-endif()
+endif()
-
+
-set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
+set (USED_3RDPARTY_QT_DIR "${3RDPARTY_QT_DIR}")
-
+
-# Now set CMAKE_PREFIX_PATH to point to local Qt installation.
+# Now set CMAKE_PREFIX_PATH to point to local Qt installation.
-# Without this setting find_package() will not work
+# Without this setting find_package() will not work
-set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
+set(CMAKE_PREFIX_PATH ${3RDPARTY_QT_DIR})
-
+
-# Now we can apply standard CMake finder for Qt5. We do this mostly
+# Now we can apply standard CMake finder for Qt5. We do this mostly
-# to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
+# to have qt5_wrap_cpp() function available and Qt5_FOUND variable filled
-find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
+find_package(Qt5 QUIET COMPONENTS Widgets Quick Xml PATHS ${3RDPARTY_QT_DIR} NO_DEFAULT_PATH)
-if (NOT ${Qt5_FOUND})
+if (NOT ${Qt5_FOUND})
-  # Now we can apply standard CMake finder for Qt. We do this mostly
+  # Now we can apply standard CMake finder for Qt. We do this mostly
-  # to have qt4_wrap_cpp() function available
+  # to have qt4_wrap_cpp() function available
-  find_package(Qt4)
+  find_package(Qt4)
-  #message (STATUS "Qt4 cmake configuration")
+  #message (STATUS "Qt4 cmake configuration")
-else()
+else()
-  #message (STATUS "Qt5 cmake configuration")
+  #message (STATUS "Qt5 cmake configuration")
-endif()
+endif()
-
+
-if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}")
+if (3RDPARTY_QT_DIR OR EXISTS "${3RDPARTY_QT_DIR}")
-  list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")
+  list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_QT_DIR}/bin")
-else()
+else()
-  list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_QT_DLL_DIR)
+  list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_QT_DLL_DIR)
-endif()
+endif()

adm/cmake/qt_macro.cmake

@@ -1,117 +1,117 @@
-#qt
+#qt
-
+
-macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
+macro (FIND_QT_PACKAGE PROJECT_LIBRARIES_DEBUG PROJECT_LIBRARIES_RELEASE PROJECT_INCLUDES)
-
+
-  if ("${3RDPARTY_QT_DIR}" STREQUAL "")
+  if ("${3RDPARTY_QT_DIR}" STREQUAL "")
-    message (FATAL_ERROR "Empty Qt dir")
+    message (FATAL_ERROR "Empty Qt dir")
-  endif()
+  endif()
-
+
-  if (${Qt5_FOUND})
+  if (${Qt5_FOUND})
-    #message (STATUS "Qt5 cmake configuration")
+    #message (STATUS "Qt5 cmake configuration")
-
+
-    set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}" "${Qt5Quick_INCLUDE_DIRS}" "${Qt5Xml_INCLUDE_DIRS}")
+    set(PROJECT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS}" "${Qt5Quick_INCLUDE_DIRS}" "${Qt5Xml_INCLUDE_DIRS}")
-    set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
+    set(PROJECT_LIBRARIES_DEBUG "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
-    set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
+    set(PROJECT_LIBRARIES_RELEASE "${Qt5Widgets_LIBRARIES}" "${Qt5Quick_LIBRARIES}" "${Qt5Xml_LIBRARIES}")
-
+
-    # processing *.ts files to generate *.qm
+    # processing *.ts files to generate *.qm
-    find_package(Qt5LinguistTools)
+    find_package(Qt5LinguistTools)
-    get_target_property(QT_LRELEASE_EXECUTABLE Qt5::lrelease LOCATION)
+    get_target_property(QT_LRELEASE_EXECUTABLE Qt5::lrelease LOCATION)
-    mark_as_advanced(QT_LRELEASE_EXECUTABLE)
+    mark_as_advanced(QT_LRELEASE_EXECUTABLE)
-
+
-    GET_FILENAME_COMPONENT(QT_BINARY_DIR ${QT_LRELEASE_EXECUTABLE} DIRECTORY)
+    GET_FILENAME_COMPONENT(QT_BINARY_DIR ${QT_LRELEASE_EXECUTABLE} DIRECTORY)
-    MARK_AS_ADVANCED(QT_BINARY_DIR)
+    MARK_AS_ADVANCED(QT_BINARY_DIR)
-  else()
+  else()
-    #message (STATUS "Qt4 cmake configuration")
+    #message (STATUS "Qt4 cmake configuration")
-    set(PROJECT_INCLUDES ${QT_INCLUDES})
+    set(PROJECT_INCLUDES ${QT_INCLUDES})
-    if (WIN32)
+    if (WIN32)
-      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib;${3RDPARTY_QT_DIR}/lib/QtXmld4.lib")
+      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/QtCored4.lib;${3RDPARTY_QT_DIR}/lib/QtGuid4.lib;${3RDPARTY_QT_DIR}/lib/QtXmld4.lib")
-      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib;${3RDPARTY_QT_DIR}/lib/QtXml4.lib")
+      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/QtCore4.lib;${3RDPARTY_QT_DIR}/lib/QtGui4.lib;${3RDPARTY_QT_DIR}/lib/QtXml4.lib")
-    else()
+    else()
-      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
+      set(PROJECT_LIBRARIES_DEBUG "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
-      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
+      set(PROJECT_LIBRARIES_RELEASE "${3RDPARTY_QT_DIR}/lib/libQtCore.so;${3RDPARTY_QT_DIR}/lib/libQtGui.so;${3RDPARTY_QT_DIR}/lib/libQtXml.so")
-    endif(WIN32)
+    endif(WIN32)
-    find_program(QT_LRELEASE_EXECUTABLE lrelease)
+    find_program(QT_LRELEASE_EXECUTABLE lrelease)
-  endif()
+  endif()
-endmacro()
+endmacro()
-
+
-
+
-macro (FIND_AND_WRAP_MOC_FILES HEADER_FILES GENERATED_MOC_FILES)
+macro (FIND_AND_WRAP_MOC_FILES HEADER_FILES GENERATED_MOC_FILES)
-  set (GENERATED_MOC_FILES "")
+  set (GENERATED_MOC_FILES "")
-  foreach (FILE ${HEADER_FILES})
+  foreach (FILE ${HEADER_FILES})
-    # processing only files where Q_OBJECT exists
+    # processing only files where Q_OBJECT exists
-    file(STRINGS "${FILE}" LINES REGEX "Q_OBJECT")
+    file(STRINGS "${FILE}" LINES REGEX "Q_OBJECT")
-    if(LINES)
+    if(LINES)
-      unset (MOC_FILE)
+      unset (MOC_FILE)
-      if (${Qt5_FOUND})
+      if (${Qt5_FOUND})
-        qt5_wrap_cpp(MOC_FILE ${FILE})
+        qt5_wrap_cpp(MOC_FILE ${FILE})
-      else()
+      else()
-        qt4_wrap_cpp(MOC_FILE ${FILE})
+        qt4_wrap_cpp(MOC_FILE ${FILE})
-      endif()
+      endif()
-      #message (STATUS "... Info: next MOC file ${MOC_FILE}")
+      #message (STATUS "... Info: next MOC file ${MOC_FILE}")
-      list(APPEND ${GENERATED_MOC_FILES} ${MOC_FILE})
+      list(APPEND ${GENERATED_MOC_FILES} ${MOC_FILE})
-     endif(LINES)
+     endif(LINES)
-  endforeach (FILE)
+  endforeach (FILE)
-
+
-endmacro()
+endmacro()
-
+
-macro (FIND_AND_WRAP_RESOURCE_FILE RESOURCE_FILE_NAME RCC_FILES)
+macro (FIND_AND_WRAP_RESOURCE_FILE RESOURCE_FILE_NAME RCC_FILES)
-  if(EXISTS "${RESOURCE_FILE_NAME}")
+  if(EXISTS "${RESOURCE_FILE_NAME}")
-    if (${Qt5_FOUND})
+    if (${Qt5_FOUND})
-      qt5_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
+      qt5_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
-    else()
+    else()
-      qt4_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
+      qt4_add_resources(RCC_FILES "${RESOURCE_FILE_NAME}")
-      # suppress some GCC warnings coming from source files generated from .qrc resources
+      # suppress some GCC warnings coming from source files generated from .qrc resources
-      if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+      if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
-      endif()
+      endif()
-    endif()
+    endif()
-  endif()
+  endif()
-endmacro()
+endmacro()
-
+
-macro (FIND_AND_WRAP_TS_FILE RESOURCE_FILE_NAME TARGET_FOLDER QM_FILES)
+macro (FIND_AND_WRAP_TS_FILE RESOURCE_FILE_NAME TARGET_FOLDER QM_FILES)
-  if(EXISTS "${RESOURCE_FILE_NAME}")
+  if(EXISTS "${RESOURCE_FILE_NAME}")
-    if (${Qt5_FOUND})
+    if (${Qt5_FOUND})
-      qt5_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
+      qt5_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
-    else()
+    else()
-      qt4_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
+      qt4_add_translation(QM_FILES "${RESOURCE_FILE_NAME}")
-    endif()
+    endif()
-  endif()
+  endif()
-endmacro()
+endmacro()
-
+
-macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
+macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
-  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   TS_FILES   REGEX ".+[.]ts")
+  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   TS_FILES   REGEX ".+[.]ts")
-  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   QRC_FILES  REGEX ".+[.]qrc")
+  file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   QRC_FILES  REGEX ".+[.]qrc")
-
+
-  string (FIND "${OCCT_PACKAGE}" "/" _index)
+  string (FIND "${OCCT_PACKAGE}" "/" _index)
-  if (_index GREATER -1)
+  if (_index GREATER -1)
-    math (EXPR _index "${_index}")
+    math (EXPR _index "${_index}")
-    string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
+    string (SUBSTRING "${OCCT_PACKAGE}" 0 ${_index} OCCT_PACKAGE_NAME)
-  else()
+  else()
-    set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
+    set (OCCT_PACKAGE_NAME "${OCCT_PACKAGE}")
-  endif(_index GREATER -1)
+  endif(_index GREATER -1)
-
+
-  #message("QRC files are: ${QRC_FILES} in ${OCCT_PACKAGE}")
+  #message("QRC files are: ${QRC_FILES} in ${OCCT_PACKAGE}")
-  foreach (QRC_FILE ${QRC_FILES})
+  foreach (QRC_FILE ${QRC_FILES})
-    set (QRC_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${QRC_FILE}")
+    set (QRC_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${QRC_FILE}")
-    if (EXISTS ${QRC_FILE_RELATIVE})
+    if (EXISTS ${QRC_FILE_RELATIVE})
-      FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE_RELATIVE} RCC_FILES)
+      FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE_RELATIVE} RCC_FILES)
-      list (APPEND ${RESOURCE_FILES} "${RCC_FILES}")
+      list (APPEND ${RESOURCE_FILES} "${RCC_FILES}")
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-
+
-  #message("TS files are: ${TS_FILES} in ${OCCT_PACKAGE}")
+  #message("TS files are: ${TS_FILES} in ${OCCT_PACKAGE}")
-  foreach (TS_FILE ${TS_FILES})
+  foreach (TS_FILE ${TS_FILES})
-    set (TS_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${TS_FILE}")
+    set (TS_FILE_RELATIVE "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${TS_FILE}")
-    FIND_AND_WRAP_TS_FILE(${TS_FILE_RELATIVE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES)
+    FIND_AND_WRAP_TS_FILE(${TS_FILE_RELATIVE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES)
-    if (EXISTS ${TS_FILE_RELATIVE})
+    if (EXISTS ${TS_FILE_RELATIVE})
-      list (APPEND ${RESOURCE_FILES} "${TS_FILE_RELATIVE}")
+      list (APPEND ${RESOURCE_FILES} "${TS_FILE_RELATIVE}")
-      list (APPEND ${RESOURCE_FILES} "${QM_FILES}")
+      list (APPEND ${RESOURCE_FILES} "${QM_FILES}")
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-
+
-  foreach (QM_FILE ${QM_FILES})
+  foreach (QM_FILE ${QM_FILES})
-    INSTALL(FILES ${QM_FILE} DESTINATION "${INSTALL_DIR_RESOURCE}/samples")
+    INSTALL(FILES ${QM_FILE} DESTINATION "${INSTALL_DIR_RESOURCE}/samples")
-    #message("install *.qm files (${QM_FILE}) to: ${INSTALL_DIR_RESOURCE}/samples")
+    #message("install *.qm files (${QM_FILE}) to: ${INSTALL_DIR_RESOURCE}/samples")
-  endforeach (QM_FILE ${QM_FILES})
+  endforeach (QM_FILE ${QM_FILES})
-endmacro()
+endmacro()
-
+

adm/cmake/rapidjson.cmake

@@ -1,86 +1,86 @@
-# RapidJSON
+# RapidJSON
-
+
-if (NOT DEFINED INSTALL_RAPIDJSON)
+if (NOT DEFINED INSTALL_RAPIDJSON)
-  set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
+  set (INSTALL_RAPIDJSON OFF CACHE BOOL "${INSTALL_RAPIDJSON_DESCR}")
-endif()
+endif()
-
+
-# RapidJSON directory
+# RapidJSON directory
-if (NOT DEFINED 3RDPARTY_RAPIDJSON_DIR)
+if (NOT DEFINED 3RDPARTY_RAPIDJSON_DIR)
-  set (3RDPARTY_RAPIDJSON_DIR "" CACHE PATH "The directory containing RapidJSON")
+  set (3RDPARTY_RAPIDJSON_DIR "" CACHE PATH "The directory containing RapidJSON")
-endif()
+endif()
-
+
-# search for RapidJSON in user defined directory
+# search for RapidJSON in user defined directory
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  if (NOT 3RDPARTY_RAPIDJSON_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+  if (NOT 3RDPARTY_RAPIDJSON_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" RapidJSON RAPIDJSON_DIR_NAME)
+    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" RapidJSON RAPIDJSON_DIR_NAME)
-    if (RAPIDJSON_DIR_NAME)
+    if (RAPIDJSON_DIR_NAME)
-      set (3RDPARTY_RAPIDJSON_DIR "${3RDPARTY_DIR}/${RAPIDJSON_DIR_NAME}" CACHE PATH "The directory containing RapidJSON" FORCE)
+      set (3RDPARTY_RAPIDJSON_DIR "${3RDPARTY_DIR}/${RAPIDJSON_DIR_NAME}" CACHE PATH "The directory containing RapidJSON" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (NOT DEFINED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the RAPIDJSON")
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR  "" CACHE FILEPATH "The directory containing headers of the RAPIDJSON")
-endif()
+endif()
-
+
-if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-
+
-  set (HEADER_NAMES rapidjson/rapidjson.h)
+  set (HEADER_NAMES rapidjson/rapidjson.h)
-
+
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "3RDPARTY_RAPIDJSON_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to RapidJSON header file" FORCE)
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "3RDPARTY_RAPIDJSON_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to RapidJSON header file" FORCE)
-
+
-  if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+  if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
+    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATHS ${3RDPARTY_RAPIDJSON_DIR}
+                                              PATHS ${3RDPARTY_RAPIDJSON_DIR}
-                                              PATH_SUFFIXES include rapidjson
+                                              PATH_SUFFIXES include rapidjson
-                                              CMAKE_FIND_ROOT_PATH_BOTH
+                                              CMAKE_FIND_ROOT_PATH_BOTH
-                                              NO_DEFAULT_PATH)
+                                              NO_DEFAULT_PATH)
-  else()
+  else()
-    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
+    find_path (3RDPARTY_RAPIDJSON_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                              PATH_SUFFIXES include rapidjson
+                                              PATH_SUFFIXES include rapidjson
-                                              CMAKE_FIND_ROOT_PATH_BOTH)
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
-  endif()
+  endif()
-
+
-  # use default (CMake) RapidJSON search
+  # use default (CMake) RapidJSON search
-  if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+  if (NOT 3RDPARTY_RAPIDJSON_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-      set (CACHED_RAPIDJSON_DIR $ENV{RapidJSON_DIR})
+      set (CACHED_RAPIDJSON_DIR $ENV{RapidJSON_DIR})
-      set (ENV{RapidJSON_DIR} "${3RDPARTY_RAPIDJSON_DIR}")
+      set (ENV{RapidJSON_DIR} "${3RDPARTY_RAPIDJSON_DIR}")
-    endif()
+    endif()
-
+
-    find_package(RapidJSON QUIET)
+    find_package(RapidJSON QUIET)
-
+
-    # restore ENV{RapidJSON_DIR}
+    # restore ENV{RapidJSON_DIR}
-    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
+    if (3RDPARTY_RAPIDJSON_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_DIR}")
-      set (ENV{RapidJSON_DIR} ${CACHED_RAPIDJSON_DIR})
+      set (ENV{RapidJSON_DIR} ${CACHED_RAPIDJSON_DIR})
-    endif()
+    endif()
-
+
-    if (${RAPIDJSON_FOUND})
+    if (${RAPIDJSON_FOUND})
-      set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_INCLUDE_DIR}" CACHE PATH "the path to RapidJSON header file" FORCE)
+      set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "${RAPIDJSON_INCLUDE_DIR}" CACHE PATH "the path to RapidJSON header file" FORCE)
-      set (3RDPARTY_RAPIDJSON_DIR         "${RAPIDJSON_ROOT_DIR}"    CACHE PATH "The directory containing RapidJSON" FORCE)
+      set (3RDPARTY_RAPIDJSON_DIR         "${RAPIDJSON_ROOT_DIR}"    CACHE PATH "The directory containing RapidJSON" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (3RDPARTY_RAPIDJSON_INCLUDE_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+if (3RDPARTY_RAPIDJSON_INCLUDE_DIR AND EXISTS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}")
-
+
-  # Install header files
+  # Install header files
-  if (INSTALL_RAPIDJSON)
+  if (INSTALL_RAPIDJSON)
-    file(GLOB RAPIDJSON_SUBDIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}/*")
+    file(GLOB RAPIDJSON_SUBDIRS "${3RDPARTY_RAPIDJSON_INCLUDE_DIR}/*")
-    foreach(SUBDIR ${RAPIDJSON_SUBDIRS})
+    foreach(SUBDIR ${RAPIDJSON_SUBDIRS})
-      if(IS_DIRECTORY "${SUBDIR}")
+      if(IS_DIRECTORY "${SUBDIR}")
-        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+        install (DIRECTORY "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      else()
+      else()
-        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
+        install (FILES "${SUBDIR}" DESTINATION "${INSTALL_DIR_INCLUDE}")
-      endif()
+      endif()
-    endforeach()
+    endforeach()
-  endif()
+  endif()
-else()
+else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_RAPIDJSON_INCLUDE_DIR)
-
+
-  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
+  set (3RDPARTY_RAPIDJSON_INCLUDE_DIR "" CACHE PATH "the path to RapidJSON header file" FORCE)
-endif()
+endif()
-
+
-# unset all redundant variables
+# unset all redundant variables
-OCCT_CHECK_AND_UNSET(RapidJSON_DIR)
+OCCT_CHECK_AND_UNSET(RapidJSON_DIR)

adm/cmake/tbb.cmake

@@ -1,240 +1,240 @@
-# tbb
+# tbb
-
+
-if (MSVC AND BUILD_SHARED_LIBS)
+if (MSVC AND BUILD_SHARED_LIBS)
-  add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
+  add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
-  add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
+  add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
-endif()
+endif()
-
+
-if (NOT DEFINED INSTALL_TBB AND BUILD_SHARED_LIBS)
+if (NOT DEFINED INSTALL_TBB AND BUILD_SHARED_LIBS)
-  set (INSTALL_TBB OFF CACHE BOOL "${INSTALL_TBB_DESCR}")
+  set (INSTALL_TBB OFF CACHE BOOL "${INSTALL_TBB_DESCR}")
-endif()
+endif()
-
+
-# Initialize tbb directory.
+# Initialize tbb directory.
-if (NOT DEFINED 3RDPARTY_TBB_DIR)
+if (NOT DEFINED 3RDPARTY_TBB_DIR)
-  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
+  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
-endif()
+endif()
-
+
-if (WIN32)
+if (WIN32)
-  if (NOT DEFINED 3RDPARTY_DIR)
+  if (NOT DEFINED 3RDPARTY_DIR)
-    message (FATAL_ERROR "3RDPARTY_DIR is not defined.")
+    message (FATAL_ERROR "3RDPARTY_DIR is not defined.")
-  endif()
+  endif()
-  if ("${3RDPARTY_DIR}" STREQUAL "")
+  if ("${3RDPARTY_DIR}" STREQUAL "")
-    message (FATAL_ERROR "3RDPARTY_DIR is empty string.")
+    message (FATAL_ERROR "3RDPARTY_DIR is empty string.")
-  endif()
+  endif()
-  if (NOT EXISTS "${3RDPARTY_DIR}")
+  if (NOT EXISTS "${3RDPARTY_DIR}")
-    message (FATAL_ERROR "3RDPARTY_DIR is not exist.")
+    message (FATAL_ERROR "3RDPARTY_DIR is not exist.")
-  endif()
+  endif()
-
+
-  # Below, we have correct 3RDPARTY_DIR.
+  # Below, we have correct 3RDPARTY_DIR.
-
+
-  # Initialize TBB folder in connectin with 3RDPARTY_DIR.
+  # Initialize TBB folder in connectin with 3RDPARTY_DIR.
-  if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
+  if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
-    if (TBB_DIR_NAME)
+    if (TBB_DIR_NAME)
-      set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
+      set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  # Here we have full path name to installation directory of TBB.
+  # Here we have full path name to installation directory of TBB.
-  # Employ it.
+  # Employ it.
-  if (EXISTS "${3RDPARTY_TBB_DIR}")
+  if (EXISTS "${3RDPARTY_TBB_DIR}")
-    find_package (
+    find_package (
-      TBB 2021.5
+      TBB 2021.5
-      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
+      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
-      REQUIRED
+      REQUIRED
-      CONFIG)
+      CONFIG)
-
+
-    # Achive include directory
+    # Achive include directory
-    get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
+    get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
-    if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
+    if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-      set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
+      set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
-    endif()
+    endif()
-    if (EXISTS "${TBB_INCLUDE_DIR}")
+    if (EXISTS "${TBB_INCLUDE_DIR}")
-      set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
+      set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
-      list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
+      list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
-    else()
+    else()
-      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-    endif()
+    endif()
-
+
-    separate_arguments (CSF_TBB)
+    separate_arguments (CSF_TBB)
-    foreach (LIB IN LISTS CSF_TBB)
+    foreach (LIB IN LISTS CSF_TBB)
-      string(TOLOWER "${LIB}" LIB_LOWER)
+      string(TOLOWER "${LIB}" LIB_LOWER)
-      string(TOUPPER "${LIB}" LIB_UPPER)
+      string(TOUPPER "${LIB}" LIB_UPPER)
-
+
-      # Achive *.lib files and directory containing it.
+      # Achive *.lib files and directory containing it.
-      get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_RELEASE)
+      get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_RELEASE)
-      # Reserve cache variable for *.lib.
+      # Reserve cache variable for *.lib.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.lib)")
+        set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.lib)")
-      endif()
+      endif()
-      # Reserve cache variable for directory containing *.lib file.
+      # Reserve cache variable for directory containing *.lib file.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
+      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.lib)")
+        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.lib)")
-      endif()
+      endif()
-      if (EXISTS "${TBB_LIB_FILE}")
+      if (EXISTS "${TBB_LIB_FILE}")
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY
+        set (3RDPARTY_${LIB_UPPER}_LIBRARY
-             "${TBB_LIB_FILE}"
+             "${TBB_LIB_FILE}"
-             CACHE FILEPATH
+             CACHE FILEPATH
-             "${LIB_UPPER} library (*.lib)"
+             "${LIB_UPPER} library (*.lib)"
-             FORCE)
+             FORCE)
-        get_filename_component (TBB_LIB_FILE_DIRECTORY "${TBB_LIB_FILE}" DIRECTORY)
+        get_filename_component (TBB_LIB_FILE_DIRECTORY "${TBB_LIB_FILE}" DIRECTORY)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
+        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
-             "${TBB_LIB_FILE_DIRECTORY}"
+             "${TBB_LIB_FILE_DIRECTORY}"
-             CACHE PATH
+             CACHE PATH
-             "The directory containing ${LIB_UPPER} library (*.lib)"
+             "The directory containing ${LIB_UPPER} library (*.lib)"
-             FORCE)
+             FORCE)
-        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
+        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
-      else()
+      else()
-        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
+        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-      endif()
+      endif()
-
+
-      # Achive *.dll files and directory containing it.
+      # Achive *.dll files and directory containing it.
-      get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
+      get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
-      # Reserve cache variable for *.dll.
+      # Reserve cache variable for *.dll.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
+      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
-        set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} library (*.dll)")
+        set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} library (*.dll)")
-      endif()
+      endif()
-      # Reserve cache variable for directory containing *.dll file.
+      # Reserve cache variable for directory containing *.dll file.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL_DIR)
+      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL_DIR)
-        set (3RDPARTY_${LIB_UPPER}_DLL_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.dll)")
+        set (3RDPARTY_${LIB_UPPER}_DLL_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.dll)")
-      endif()
+      endif()
-      if (EXISTS "${TBB_DLL_FILE}")
+      if (EXISTS "${TBB_DLL_FILE}")
-        set (3RDPARTY_${LIB_UPPER}_DLL
+        set (3RDPARTY_${LIB_UPPER}_DLL
-             "${TBB_DLL_FILE}"
+             "${TBB_DLL_FILE}"
-             CACHE FILEPATH
+             CACHE FILEPATH
-             "${LIB_UPPER} library (*.dll)"
+             "${LIB_UPPER} library (*.dll)"
-             FORCE)
+             FORCE)
-        get_filename_component (TBB_DLL_FILE_DIRECTORY "${TBB_DLL_FILE}" DIRECTORY)
+        get_filename_component (TBB_DLL_FILE_DIRECTORY "${TBB_DLL_FILE}" DIRECTORY)
-        set (3RDPARTY_${LIB_UPPER}_DLL_DIR
+        set (3RDPARTY_${LIB_UPPER}_DLL_DIR
-             "${TBB_DLL_FILE_DIRECTORY}"
+             "${TBB_DLL_FILE_DIRECTORY}"
-             CACHE PATH
+             CACHE PATH
-             "The directory containing ${LIB_UPPER} library (*.dll)"
+             "The directory containing ${LIB_UPPER} library (*.dll)"
-             FORCE)
+             FORCE)
-        list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${LIB_UPPER}_DLL_DIR}")
+        list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${LIB_UPPER}_DLL_DIR}")
-      else()
+      else()
-        list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${LIB_UPPER}_DLL_DIR)
+        list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${LIB_UPPER}_DLL_DIR)
-      endif()
+      endif()
-
+
-      # install *.dll (tbb & tbbmalloc)
+      # install *.dll (tbb & tbbmalloc)
-      if (INSTALL_TBB)
+      if (INSTALL_TBB)
-        OCCT_MAKE_OS_WITH_BITNESS()
+        OCCT_MAKE_OS_WITH_BITNESS()
-        OCCT_MAKE_COMPILER_SHORT_NAME()
+        OCCT_MAKE_COMPILER_SHORT_NAME()
-
+
-        if (SINGLE_GENERATOR)
+        if (SINGLE_GENERATOR)
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} DESTINATION "${INSTALL_DIR_BIN}")
+          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} DESTINATION "${INSTALL_DIR_BIN}")
-        else()
+        else()
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_BIN}")
+          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_BIN}")
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_BIN}i")
+          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_BIN}i")
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_BIN}d")
+          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_BIN}d")
-        endif()
+        endif()
-      endif()
+      endif()
-      mark_as_advanced (3RDPARTY_${LIB_UPPER}_LIBRARY 3RDPARTY_${LIB_UPPER}_DLL)
+      mark_as_advanced (3RDPARTY_${LIB_UPPER}_LIBRARY 3RDPARTY_${LIB_UPPER}_DLL)
-    endforeach()
+    endforeach()
-    if (INSTALL_TBB)
+    if (INSTALL_TBB)
-      set (USED_3RDPARTY_TBB_DIR "")
+      set (USED_3RDPARTY_TBB_DIR "")
-    else()
+    else()
-      # the *.dll/*.so* directory for using by the executable
+      # the *.dll/*.so* directory for using by the executable
-      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_DLL_DIR})
+      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_DLL_DIR})
-    endif()
+    endif()
-  else()
+  else()
-    message (FATAL_ERROR "Installation directory with TBB is not exist.")
+    message (FATAL_ERROR "Installation directory with TBB is not exist.")
-  endif()
+  endif()
-else ()
+else ()
-  # NOT WIN32 branch
+  # NOT WIN32 branch
-  if ((DEFINED 3RDPARTY_DIR) AND (NOT "${3RDPARTY_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_DIR}"))
+  if ((DEFINED 3RDPARTY_DIR) AND (NOT "${3RDPARTY_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_DIR}"))
-    # Here, we have correct 3RDPARTY_DIR.
+    # Here, we have correct 3RDPARTY_DIR.
-    # Trying to specify TBB folder in connection with 3RDPARTY_DIR
+    # Trying to specify TBB folder in connection with 3RDPARTY_DIR
-    if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
+    if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
-      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
+      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
-      if (TBB_DIR_NAME)
+      if (TBB_DIR_NAME)
-        set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
+        set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-    if ((NOT "${3RDPARTY_TBB_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_TBB_DIR}"))
+    if ((NOT "${3RDPARTY_TBB_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_TBB_DIR}"))
-      # Find TBB 2021.5 in existing directory.
+      # Find TBB 2021.5 in existing directory.
-      find_package (
+      find_package (
-      TBB 2021.5
+      TBB 2021.5
-      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
+      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
-      REQUIRED
+      REQUIRED
-      CONFIG)
+      CONFIG)
-    else()
+    else()
-      # Find TBB 2021.5 in system directory.
+      # Find TBB 2021.5 in system directory.
-      find_package (
+      find_package (
-      TBB 2021.5
+      TBB 2021.5
-      REQUIRED
+      REQUIRED
-      CONFIG)
+      CONFIG)
-    endif()
+    endif()
-  else()
+  else()
-    # Find TBB 2021.5 in system directory.
+    # Find TBB 2021.5 in system directory.
-    find_package (
+    find_package (
-    TBB 2021.5
+    TBB 2021.5
-    REQUIRED
+    REQUIRED
-    CONFIG)
+    CONFIG)
-  endif()
+  endif()
-  # TBB has been configured (in other case FATAL_ERROR occures).
+  # TBB has been configured (in other case FATAL_ERROR occures).
-
+
-  # Achive include directory.
+  # Achive include directory.
-  get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
+  get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
-  if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
+  if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-    set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
+    set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
-  endif()
+  endif()
-  if (EXISTS "${TBB_INCLUDE_DIR}")
+  if (EXISTS "${TBB_INCLUDE_DIR}")
-    set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
+    set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
-    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
+    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
-  else()
+  else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-  endif()
+  endif()
-
+
-  separate_arguments (CSF_TBB)
+  separate_arguments (CSF_TBB)
-  foreach (LIB IN LISTS CSF_TBB)
+  foreach (LIB IN LISTS CSF_TBB)
-    string(TOLOWER "${LIB}" LIB_LOWER)
+    string(TOLOWER "${LIB}" LIB_LOWER)
-    string(TOUPPER "${LIB}" LIB_UPPER)
+    string(TOUPPER "${LIB}" LIB_UPPER)
-
+
-    # Achive *.so files and directory containing it.
+    # Achive *.so files and directory containing it.
-    get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
+    get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
-    # Reserve cache variable for *.so.
+    # Reserve cache variable for *.so.
-    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
+    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)")
+      set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)")
-    endif()
+    endif()
-    # Reserve cache variable for directory containing *.so file.
+    # Reserve cache variable for directory containing *.so file.
-    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
+    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.so)")
+      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.so)")
-    endif()
+    endif()
-    if (EXISTS "${TBB_SO_FILE}")
+    if (EXISTS "${TBB_SO_FILE}")
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY
+      set (3RDPARTY_${LIB_UPPER}_LIBRARY
-           "${TBB_SO_FILE}"
+           "${TBB_SO_FILE}"
-           CACHE FILEPATH
+           CACHE FILEPATH
-           "${LIB_UPPER} library (*.so)"
+           "${LIB_UPPER} library (*.so)"
-           FORCE)
+           FORCE)
-      get_filename_component (TBB_SO_FILE_DIRECTORY "${TBB_SO_FILE}" DIRECTORY)
+      get_filename_component (TBB_SO_FILE_DIRECTORY "${TBB_SO_FILE}" DIRECTORY)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
+      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
-           "${TBB_SO_FILE_DIRECTORY}"
+           "${TBB_SO_FILE_DIRECTORY}"
-           CACHE PATH
+           CACHE PATH
-           "The directory containing ${LIB_UPPER} library (*.so)"
+           "The directory containing ${LIB_UPPER} library (*.so)"
-           FORCE)
+           FORCE)
-      list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
+      list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
-    else()
+    else()
-      list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
+      list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-    endif()
+    endif()
-
+
-    # install *.so* (tbb & tbbmalloc)
+    # install *.so* (tbb & tbbmalloc)
-    if (INSTALL_TBB)
+    if (INSTALL_TBB)
-      OCCT_MAKE_OS_WITH_BITNESS()
+      OCCT_MAKE_OS_WITH_BITNESS()
-      OCCT_MAKE_COMPILER_SHORT_NAME()
+      OCCT_MAKE_COMPILER_SHORT_NAME()
-
+
-      if (SINGLE_GENERATOR)
+      if (SINGLE_GENERATOR)
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} DESTINATION "${INSTALL_DIR_LIB}")
+        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} DESTINATION "${INSTALL_DIR_LIB}")
-      else()
+      else()
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_LIB}")
+        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_LIB}")
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_LIB}i")
+        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_LIB}i")
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_LIB}d")
+        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_LIB}d")
-      endif()
+      endif()
-    endif()
+    endif()
-  endforeach()
+  endforeach()
-  if (INSTALL_TBB)
+  if (INSTALL_TBB)
-    set (USED_3RDPARTY_TBB_DIR "")
+    set (USED_3RDPARTY_TBB_DIR "")
-  else()
+  else()
-    # the *.so* directory for using by the executable
+    # the *.so* directory for using by the executable
-    set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
+    set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
-  endif()
+  endif()
-endif()
+endif()

adm/cmake/tcl.cmake

@@ -1,281 +1,281 @@
-# tcl
+# tcl
-
+
-if (NOT DEFINED INSTALL_TCL)
+if (NOT DEFINED INSTALL_TCL)
-  set (INSTALL_TCL OFF CACHE BOOL "${INSTALL_TCL_DESCR}")
+  set (INSTALL_TCL OFF CACHE BOOL "${INSTALL_TCL_DESCR}")
-endif()
+endif()
-
+
-# tcl directory
+# tcl directory
-if (NOT DEFINED 3RDPARTY_TCL_DIR)
+if (NOT DEFINED 3RDPARTY_TCL_DIR)
-  set (3RDPARTY_TCL_DIR "" CACHE PATH "The directory containing tcl")
+  set (3RDPARTY_TCL_DIR "" CACHE PATH "The directory containing tcl")
-endif()
+endif()
-
+
-# tcl include directory
+# tcl include directory
-if (NOT DEFINED 3RDPARTY_TCL_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_TCL_INCLUDE_DIR)
-  set (3RDPARTY_TCL_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tcl")
+  set (3RDPARTY_TCL_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tcl")
-endif()
+endif()
-
+
-
+
-# tcl library file (with absolute path)
+# tcl library file (with absolute path)
-if (NOT DEFINED 3RDPARTY_TCL_LIBRARY OR NOT 3RDPARTY_TCL_LIBRARY_DIR)
+if (NOT DEFINED 3RDPARTY_TCL_LIBRARY OR NOT 3RDPARTY_TCL_LIBRARY_DIR)
-  set (3RDPARTY_TCL_LIBRARY "" CACHE FILEPATH "tcl library"  FORCE)
+  set (3RDPARTY_TCL_LIBRARY "" CACHE FILEPATH "tcl library"  FORCE)
-endif()
+endif()
-
+
-# tcl library directory
+# tcl library directory
-if (NOT DEFINED 3RDPARTY_TCL_LIBRARY_DIR)
+if (NOT DEFINED 3RDPARTY_TCL_LIBRARY_DIR)
-  set (3RDPARTY_TCL_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tcl library")
+  set (3RDPARTY_TCL_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tcl library")
-endif()
+endif()
-
+
-# tcl shared library (with absolute path)
+# tcl shared library (with absolute path)
-if (WIN32)
+if (WIN32)
-  if (NOT DEFINED 3RDPARTY_TCL_DLL OR NOT 3RDPARTY_TCL_DLL_DIR)
+  if (NOT DEFINED 3RDPARTY_TCL_DLL OR NOT 3RDPARTY_TCL_DLL_DIR)
-    set (3RDPARTY_TCL_DLL "" CACHE FILEPATH "tcl shared library" FORCE)
+    set (3RDPARTY_TCL_DLL "" CACHE FILEPATH "tcl shared library" FORCE)
-  endif()
+  endif()
-endif()
+endif()
-
+
-# tcl shared library directory
+# tcl shared library directory
-if (WIN32 AND NOT DEFINED 3RDPARTY_TCL_DLL_DIR)
+if (WIN32 AND NOT DEFINED 3RDPARTY_TCL_DLL_DIR)
-  set (3RDPARTY_TCL_DLL_DIR "" CACHE FILEPATH "The directory containing tcl shared library")
+  set (3RDPARTY_TCL_DLL_DIR "" CACHE FILEPATH "The directory containing tcl shared library")
-endif()
+endif()
-
+
-
+
-# search for tcl in user defined directory
+# search for tcl in user defined directory
-if (NOT 3RDPARTY_TCL_DIR AND 3RDPARTY_DIR)
+if (NOT 3RDPARTY_TCL_DIR AND 3RDPARTY_DIR)
-  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" tcl TCL_DIR_NAME)
+  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" tcl TCL_DIR_NAME)
-  if (TCL_DIR_NAME)
+  if (TCL_DIR_NAME)
-    set (3RDPARTY_TCL_DIR "${3RDPARTY_DIR}/${TCL_DIR_NAME}" CACHE PATH "The directory containing tcl" FORCE)
+    set (3RDPARTY_TCL_DIR "${3RDPARTY_DIR}/${TCL_DIR_NAME}" CACHE PATH "The directory containing tcl" FORCE)
-  endif()
+  endif()
-endif()
+endif()
-
+
-# define paths for default engine
+# define paths for default engine
-if (3RDPARTY_TCL_DIR AND EXISTS "${3RDPARTY_TCL_DIR}")
+if (3RDPARTY_TCL_DIR AND EXISTS "${3RDPARTY_TCL_DIR}")
-  set (TCL_INCLUDE_PATH "${3RDPARTY_TCL_DIR}/include")
+  set (TCL_INCLUDE_PATH "${3RDPARTY_TCL_DIR}/include")
-endif()
+endif()
-
+
-# check tcl include dir, library dir and shared library dir
+# check tcl include dir, library dir and shared library dir
-COMPLIANCE_PRODUCT_CONSISTENCY(TCL)
+COMPLIANCE_PRODUCT_CONSISTENCY(TCL)
-
+
-# use default (CMake) TCL search
+# use default (CMake) TCL search
-find_package(TCL QUIET)
+find_package(TCL QUIET)
-
+
-# tcl include dir
+# tcl include dir
-if (NOT 3RDPARTY_TCL_INCLUDE_DIR)
+if (NOT 3RDPARTY_TCL_INCLUDE_DIR)
-  if (TCL_INCLUDE_PATH AND EXISTS "${TCL_INCLUDE_PATH}")
+  if (TCL_INCLUDE_PATH AND EXISTS "${TCL_INCLUDE_PATH}")
-    set (3RDPARTY_TCL_INCLUDE_DIR "${TCL_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of TCL" FORCE)
+    set (3RDPARTY_TCL_INCLUDE_DIR "${TCL_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of TCL" FORCE)
-  endif()
+  endif()
-endif()
+endif()
-
+
-# tcl dir and library
+# tcl dir and library
-if (NOT 3RDPARTY_TCL_LIBRARY)
+if (NOT 3RDPARTY_TCL_LIBRARY)
-  if (TCL_LIBRARY AND EXISTS "${TCL_LIBRARY}")
+  if (TCL_LIBRARY AND EXISTS "${TCL_LIBRARY}")
-    set (3RDPARTY_TCL_LIBRARY "${TCL_LIBRARY}" CACHE FILEPATH "TCL library" FORCE)
+    set (3RDPARTY_TCL_LIBRARY "${TCL_LIBRARY}" CACHE FILEPATH "TCL library" FORCE)
-
+
-    if (NOT 3RDPARTY_TCL_LIBRARY_DIR)
+    if (NOT 3RDPARTY_TCL_LIBRARY_DIR)
-      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
+      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
-      set (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TCL library" FORCE)
+      set (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TCL library" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (WIN32)
+if (WIN32)
-  if (NOT 3RDPARTY_TCL_DLL)
+  if (NOT 3RDPARTY_TCL_DLL)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll .a)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll .a)
-
+
-    set (DLL_FOLDER_FOR_SEARCH "")
+    set (DLL_FOLDER_FOR_SEARCH "")
-    if (3RDPARTY_TCL_DLL_DIR)
+    if (3RDPARTY_TCL_DLL_DIR)
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DLL_DIR}")
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DLL_DIR}")
-    elseif (3RDPARTY_TCL_DIR)
+    elseif (3RDPARTY_TCL_DIR)
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
-    elseif (3RDPARTY_TCL_LIBRARY_DIR)
+    elseif (3RDPARTY_TCL_LIBRARY_DIR)
-      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR_PARENT "${3RDPARTY_TCL_LIBRARY_DIR}" PATH)
+      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR_PARENT "${3RDPARTY_TCL_LIBRARY_DIR}" PATH)
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_LIBRARY_DIR_PARENT}/bin")
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_LIBRARY_DIR_PARENT}/bin")
-    endif()
+    endif()
-
+
-    set (3RDPARTY_TCL_DLL "3RDPARTY_TCL_DLL-NOTFOUND" CACHE FILEPATH "TCL shared library" FORCE)
+    set (3RDPARTY_TCL_DLL "3RDPARTY_TCL_DLL-NOTFOUND" CACHE FILEPATH "TCL shared library" FORCE)
-    find_library (3RDPARTY_TCL_DLL NAMES ${CSF_TclLibs}
+    find_library (3RDPARTY_TCL_DLL NAMES ${CSF_TclLibs}
-                                         PATHS "${DLL_FOLDER_FOR_SEARCH}"
+                                         PATHS "${DLL_FOLDER_FOR_SEARCH}"
-                                         NO_DEFAULT_PATH)
+                                         NO_DEFAULT_PATH)
-  endif()
+  endif()
-endif()
+endif()
-
+
-COMPLIANCE_PRODUCT_CONSISTENCY(TCL)
+COMPLIANCE_PRODUCT_CONSISTENCY(TCL)
-
+
-# tcl dir and library
+# tcl dir and library
-if (NOT 3RDPARTY_TCL_LIBRARY)
+if (NOT 3RDPARTY_TCL_LIBRARY)
-  set (3RDPARTY_TCL_LIBRARY "3RDPARTY_TCL_LIBRARY-NOTFOUND" CACHE FILEPATH "TCL library" FORCE)
+  set (3RDPARTY_TCL_LIBRARY "3RDPARTY_TCL_LIBRARY-NOTFOUND" CACHE FILEPATH "TCL library" FORCE)
-  find_library (3RDPARTY_TCL_LIBRARY NAMES ${CSF_TclLibs}
+  find_library (3RDPARTY_TCL_LIBRARY NAMES ${CSF_TclLibs}
-                                           PATHS "${3RDPARTY_TCL_LIBRARY_DIR}"
+                                           PATHS "${3RDPARTY_TCL_LIBRARY_DIR}"
-                                           NO_DEFAULT_PATH)
+                                           NO_DEFAULT_PATH)
-
+
-  # search in another place if previous search doesn't find anything
+  # search in another place if previous search doesn't find anything
-  find_library (3RDPARTY_TCL_LIBRARY NAMES ${CSF_TclLibs}
+  find_library (3RDPARTY_TCL_LIBRARY NAMES ${CSF_TclLibs}
-                                           PATHS "${3RDPARTY_TCL_DIR}/lib"
+                                           PATHS "${3RDPARTY_TCL_DIR}/lib"
-                                           NO_DEFAULT_PATH)
+                                           NO_DEFAULT_PATH)
-
+
-  if (NOT 3RDPARTY_TCL_LIBRARY OR NOT EXISTS "${3RDPARTY_TCL_LIBRARY}")
+  if (NOT 3RDPARTY_TCL_LIBRARY OR NOT EXISTS "${3RDPARTY_TCL_LIBRARY}")
-    set (3RDPARTY_TCL_LIBRARY "" CACHE FILEPATH "TCL library" FORCE)
+    set (3RDPARTY_TCL_LIBRARY "" CACHE FILEPATH "TCL library" FORCE)
-  endif()
+  endif()
-
+
-  if (NOT 3RDPARTY_TCL_LIBRARY_DIR AND 3RDPARTY_TCL_LIBRARY)
+  if (NOT 3RDPARTY_TCL_LIBRARY_DIR AND 3RDPARTY_TCL_LIBRARY)
-    get_filename_component (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
+    get_filename_component (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY}" PATH)
-    set (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TCL library" FORCE)
+    set (3RDPARTY_TCL_LIBRARY_DIR "${3RDPARTY_TCL_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TCL library" FORCE)
-  endif()
+  endif()
-endif()
+endif()
-
+
-set (3RDPARTY_TCL_LIBRARY_VERSION "")
+set (3RDPARTY_TCL_LIBRARY_VERSION "")
-if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
+if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
-  get_filename_component (TCL_LIBRARY_NAME "${3RDPARTY_TCL_LIBRARY}" NAME)
+  get_filename_component (TCL_LIBRARY_NAME "${3RDPARTY_TCL_LIBRARY}" NAME)
-  string(REGEX REPLACE "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_LIBRARY_VERSION "${TCL_LIBRARY_NAME}")
+  string(REGEX REPLACE "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_LIBRARY_VERSION "${TCL_LIBRARY_NAME}")
-
+
-  if (NOT "${TCL_LIBRARY_VERSION}" STREQUAL "${TCL_LIBRARY_NAME}")
+  if (NOT "${TCL_LIBRARY_VERSION}" STREQUAL "${TCL_LIBRARY_NAME}")
-    set (3RDPARTY_TCL_LIBRARY_VERSION "${TCL_LIBRARY_VERSION}")
+    set (3RDPARTY_TCL_LIBRARY_VERSION "${TCL_LIBRARY_VERSION}")
-  else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
+  else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
-    message (STATUS "Info: TCL version isn't found")
+    message (STATUS "Info: TCL version isn't found")
-  endif()
+  endif()
-endif()
+endif()
-
+
-set (3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT "")
+set (3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT "")
-if (3RDPARTY_TCL_LIBRARY_VERSION)
+if (3RDPARTY_TCL_LIBRARY_VERSION)
-  string (REGEX REPLACE "^.*([0-9])[^0-9]*[0-9].*$" "\\1" 3RDPARTY_TCL_MAJOR_VERSION "${3RDPARTY_TCL_LIBRARY_VERSION}")
+  string (REGEX REPLACE "^.*([0-9])[^0-9]*[0-9].*$" "\\1" 3RDPARTY_TCL_MAJOR_VERSION "${3RDPARTY_TCL_LIBRARY_VERSION}")
-  string (REGEX REPLACE "^.*[0-9][^0-9]*([0-9]).*$" "\\1" 3RDPARTY_TCL_MINOR_VERSION "${3RDPARTY_TCL_LIBRARY_VERSION}")
+  string (REGEX REPLACE "^.*[0-9][^0-9]*([0-9]).*$" "\\1" 3RDPARTY_TCL_MINOR_VERSION "${3RDPARTY_TCL_LIBRARY_VERSION}")
-  set (3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT "${3RDPARTY_TCL_MAJOR_VERSION}.${3RDPARTY_TCL_MINOR_VERSION}")
+  set (3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT "${3RDPARTY_TCL_MAJOR_VERSION}.${3RDPARTY_TCL_MINOR_VERSION}")
-endif()
+endif()
-
+
-if (WIN32)
+if (WIN32)
-  if (NOT 3RDPARTY_TCL_DLL)
+  if (NOT 3RDPARTY_TCL_DLL)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll .a)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll .a)
-
+
-    set (DLL_FOLDER_FOR_SEARCH "")
+    set (DLL_FOLDER_FOR_SEARCH "")
-    if (3RDPARTY_TCL_DLL_DIR)
+    if (3RDPARTY_TCL_DLL_DIR)
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DLL_DIR}")
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DLL_DIR}")
-    elseif (3RDPARTY_TCL_DIR)
+    elseif (3RDPARTY_TCL_DIR)
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_DIR}/bin")
-    else()
+    else()
-      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR_PARENT "${3RDPARTY_TCL_LIBRARY_DIR}" PATH)
+      get_filename_component (3RDPARTY_TCL_LIBRARY_DIR_PARENT "${3RDPARTY_TCL_LIBRARY_DIR}" PATH)
-      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_LIBRARY_DIR_PARENT}/bin")
+      set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TCL_LIBRARY_DIR_PARENT}/bin")
-    endif()
+    endif()
-
+
-    set (3RDPARTY_TCL_DLL "3RDPARTY_TCL_DLL-NOTFOUND" CACHE FILEPATH "TCL shared library" FORCE)
+    set (3RDPARTY_TCL_DLL "3RDPARTY_TCL_DLL-NOTFOUND" CACHE FILEPATH "TCL shared library" FORCE)
-    find_library (3RDPARTY_TCL_DLL NAMES tcl${3RDPARTY_TCL_LIBRARY_VERSION}
+    find_library (3RDPARTY_TCL_DLL NAMES tcl${3RDPARTY_TCL_LIBRARY_VERSION}
-                                         PATHS "${DLL_FOLDER_FOR_SEARCH}"
+                                         PATHS "${DLL_FOLDER_FOR_SEARCH}"
-                                         NO_DEFAULT_PATH)
+                                         NO_DEFAULT_PATH)
-
+
-    if (NOT 3RDPARTY_TCL_DLL OR NOT EXISTS "${3RDPARTY_TCL_DLL}")
+    if (NOT 3RDPARTY_TCL_DLL OR NOT EXISTS "${3RDPARTY_TCL_DLL}")
-      set (3RDPARTY_TCL_DLL "" CACHE FILEPATH "TCL shared library" FORCE)
+      set (3RDPARTY_TCL_DLL "" CACHE FILEPATH "TCL shared library" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-  if (NOT 3RDPARTY_TCL_DLL_DIR AND 3RDPARTY_TCL_DLL)
+  if (NOT 3RDPARTY_TCL_DLL_DIR AND 3RDPARTY_TCL_DLL)
-    get_filename_component (3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL}" PATH)
+    get_filename_component (3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL}" PATH)
-    set (3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL_DIR}" CACHE FILEPATH "The directory containing TCL shared library" FORCE)
+    set (3RDPARTY_TCL_DLL_DIR "${3RDPARTY_TCL_DLL_DIR}" CACHE FILEPATH "The directory containing TCL shared library" FORCE)
-  endif()
+  endif()
-endif()
+endif()
-
+
-# include found paths to common variables
+# include found paths to common variables
-if (3RDPARTY_TCL_INCLUDE_DIR AND EXISTS "${3RDPARTY_TCL_INCLUDE_DIR}")
+if (3RDPARTY_TCL_INCLUDE_DIR AND EXISTS "${3RDPARTY_TCL_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TCL_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TCL_INCLUDE_DIR}")
-else()
+else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TCL_INCLUDE_DIR)
-endif()
+endif()
-
+
-if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
+if (3RDPARTY_TCL_LIBRARY AND EXISTS "${3RDPARTY_TCL_LIBRARY}")
-  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TCL_LIBRARY_DIR}")
+  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TCL_LIBRARY_DIR}")
-else()
+else()
-  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TCL_LIBRARY_DIR)
+  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TCL_LIBRARY_DIR)
-endif()
+endif()
-
+
-if (WIN32)
+if (WIN32)
-  if (3RDPARTY_TCL_DLL OR EXISTS "${3RDPARTY_TCL_DLL}")
+  if (3RDPARTY_TCL_DLL OR EXISTS "${3RDPARTY_TCL_DLL}")
-    list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TCL_DLL_DIR}")
+    list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TCL_DLL_DIR}")
-  else()
+  else()
-    list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TCL_DLL_DIR)
+    list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TCL_DLL_DIR)
-  endif()
+  endif()
-endif()
+endif()
-
+
-# install tcl
+# install tcl
-if (INSTALL_TCL)
+if (INSTALL_TCL)
-  # include occt macros. compiler_bitness, os_wiht_bit, compiler
+  # include occt macros. compiler_bitness, os_wiht_bit, compiler
-  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
+
-  OCCT_MAKE_OS_WITH_BITNESS()
+  OCCT_MAKE_OS_WITH_BITNESS()
-  OCCT_MAKE_COMPILER_SHORT_NAME()
+  OCCT_MAKE_COMPILER_SHORT_NAME()
-
+
-  if (WIN32)
+  if (WIN32)
-    # tcl 8.6 requires zlib. install all dlls from tcl bin folder that may contain zlib also
+    # tcl 8.6 requires zlib. install all dlls from tcl bin folder that may contain zlib also
-
+
-    # collect and install all dlls from tcl dll dirs
+    # collect and install all dlls from tcl dll dirs
-    file (GLOB TCL_DLLS "${3RDPARTY_TCL_DLL_DIR}/*.dll")
+    file (GLOB TCL_DLLS "${3RDPARTY_TCL_DLL_DIR}/*.dll")
-
+
-    if (SINGLE_GENERATOR)
+    if (SINGLE_GENERATOR)
-      install (FILES ${TCL_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
+      install (FILES ${TCL_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
-    else()
+    else()
-      install (FILES ${TCL_DLLS}
+      install (FILES ${TCL_DLLS}
-               CONFIGURATIONS Release
+               CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR_BIN}")
+               DESTINATION "${INSTALL_DIR_BIN}")
-      install (FILES ${TCL_DLLS}
+      install (FILES ${TCL_DLLS}
-               CONFIGURATIONS RelWithDebInfo
+               CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR_BIN}i")
+               DESTINATION "${INSTALL_DIR_BIN}i")
-      install (FILES ${TCL_DLLS}
+      install (FILES ${TCL_DLLS}
-               CONFIGURATIONS Debug
+               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR_BIN}d")
+               DESTINATION "${INSTALL_DIR_BIN}d")
-    endif()
+    endif()
-  else()
+  else()
-    get_filename_component(3RDPARTY_TCL_LIBRARY_REALPATH ${3RDPARTY_TCL_LIBRARY} REALPATH)
+    get_filename_component(3RDPARTY_TCL_LIBRARY_REALPATH ${3RDPARTY_TCL_LIBRARY} REALPATH)
-
+
-    if (SINGLE_GENERATOR)
+    if (SINGLE_GENERATOR)
-      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
-    else()
+    else()
-      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
-               CONFIGURATIONS Release
+               CONFIGURATIONS Release
-               DESTINATION "${INSTALL_DIR_LIB}")
+               DESTINATION "${INSTALL_DIR_LIB}")
-      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
-               CONFIGURATIONS RelWithDebInfo
+               CONFIGURATIONS RelWithDebInfo
-               DESTINATION "${INSTALL_DIR_LIB}i")
+               DESTINATION "${INSTALL_DIR_LIB}i")
-      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
+      install (FILES ${3RDPARTY_TCL_LIBRARY_REALPATH}
-               CONFIGURATIONS Debug
+               CONFIGURATIONS Debug
-               DESTINATION "${INSTALL_DIR_LIB}d")
+               DESTINATION "${INSTALL_DIR_LIB}d")
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  if (TCL_TCLSH_VERSION)
+  if (TCL_TCLSH_VERSION)
-    # tcl is required to install in lib folder (without)
+    # tcl is required to install in lib folder (without)
-    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR_LIB}")
+    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl8"                    DESTINATION "${INSTALL_DIR_LIB}")
-    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR_LIB}")
+    install (DIRECTORY "${3RDPARTY_TCL_LIBRARY_DIR}/tcl${TCL_TCLSH_VERSION}" DESTINATION "${INSTALL_DIR_LIB}")
-  else()
+  else()
-    message (STATUS "\nWarning: tclX.X subdir won't be copied during the installation process.")
+    message (STATUS "\nWarning: tclX.X subdir won't be copied during the installation process.")
-    message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
+    message (STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
-  endif()
+  endif()
-
+
-  set (USED_3RDPARTY_TCL_DIR "")
+  set (USED_3RDPARTY_TCL_DIR "")
-else()
+else()
-  # the library directory for using by the executable
+  # the library directory for using by the executable
-  if (WIN32)
+  if (WIN32)
-    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_DLL_DIR})
+    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_DLL_DIR})
-  else()
+  else()
-    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_LIBRARY_DIR})
+    set (USED_3RDPARTY_TCL_DIR ${3RDPARTY_TCL_LIBRARY_DIR})
-  endif()
+  endif()
-endif()
+endif()
-
+
-mark_as_advanced (3RDPARTY_TCL_LIBRARY 3RDPARTY_TCL_DLL)
+mark_as_advanced (3RDPARTY_TCL_LIBRARY 3RDPARTY_TCL_DLL)
-
+
-if (TK_FOUND AND 3RDPARTY_TCL_DIR)
+if (TK_FOUND AND 3RDPARTY_TCL_DIR)
-
+
-  get_filename_component (TK_WISH_ABSOLUTE          "${TK_WISH}"          ABSOLUTE)
+  get_filename_component (TK_WISH_ABSOLUTE          "${TK_WISH}"          ABSOLUTE)
-  get_filename_component (3RDPARTY_TCL_DIR_ABSOLUTE "${3RDPARTY_TCL_DIR}" ABSOLUTE)
+  get_filename_component (3RDPARTY_TCL_DIR_ABSOLUTE "${3RDPARTY_TCL_DIR}" ABSOLUTE)
-
+
-  string (FIND "${TK_WISH_ABSOLUTE}" "${3RDPARTY_TCL_DIR_ABSOLUTE}" THE_SAME_FOLDER)
+  string (FIND "${TK_WISH_ABSOLUTE}" "${3RDPARTY_TCL_DIR_ABSOLUTE}" THE_SAME_FOLDER)
-
+
-  if (${THE_SAME_FOLDER} EQUAL 0)
+  if (${THE_SAME_FOLDER} EQUAL 0)
-    set (3RDPARTY_TCLTK_DIR "${3RDPARTY_TCL_DIR}")
+    set (3RDPARTY_TCLTK_DIR "${3RDPARTY_TCL_DIR}")
-    message (STATUS "Info: TK is used from TCL folder: ${3RDPARTY_TCLTK_DIR}")
+    message (STATUS "Info: TK is used from TCL folder: ${3RDPARTY_TCLTK_DIR}")
-  endif()
+  endif()
-endif()
+endif()
-
+
-# unset all redundant variables
+# unset all redundant variables
-#TCL
+#TCL
-OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
+OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
-OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TCL_TCLSH)
+OCCT_CHECK_AND_UNSET (TCL_TCLSH)
-#TK
+#TK
-OCCT_CHECK_AND_UNSET (TK_LIBRARY)
+OCCT_CHECK_AND_UNSET (TK_LIBRARY)
-OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TK_WISH)
+OCCT_CHECK_AND_UNSET (TK_WISH)
-
+

adm/cmake/tk.cmake

@@ -1,286 +1,286 @@
-# tk
+# tk
-
+
-if (NOT DEFINED INSTALL_TK AND BUILD_SHARED_LIBS)
+if (NOT DEFINED INSTALL_TK AND BUILD_SHARED_LIBS)
-  set (INSTALL_TK OFF CACHE BOOL "${INSTALL_TK_DESCR}")
+  set (INSTALL_TK OFF CACHE BOOL "${INSTALL_TK_DESCR}")
-endif()
+endif()
-
+
-# tk directory
+# tk directory
-if (NOT DEFINED 3RDPARTY_TK_DIR)
+if (NOT DEFINED 3RDPARTY_TK_DIR)
-  set (3RDPARTY_TK_DIR "" CACHE PATH "The directory containing tk")
+  set (3RDPARTY_TK_DIR "" CACHE PATH "The directory containing tk")
-endif ()
+endif ()
-
+
-if (NOT 3RDPARTY_TK_DIR AND 3RDPARTY_TCLTK_DIR)
+if (NOT 3RDPARTY_TK_DIR AND 3RDPARTY_TCLTK_DIR)
-  set (3RDPARTY_TK_DIR "${3RDPARTY_TCLTK_DIR}" CACHE PATH "The directory containing tk" FORCE)
+  set (3RDPARTY_TK_DIR "${3RDPARTY_TCLTK_DIR}" CACHE PATH "The directory containing tk" FORCE)
-endif()
+endif()
-
+
-# tk include directory
+# tk include directory
-if (NOT DEFINED 3RDPARTY_TK_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_TK_INCLUDE_DIR)
-  set (3RDPARTY_TK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tk")
+  set (3RDPARTY_TK_INCLUDE_DIR "" CACHE FILEPATH "The directory containing headers of tk")
-endif()
+endif()
-
+
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
-  # tk library file (with absolute path)
+  # tk library file (with absolute path)
-  if (NOT DEFINED 3RDPARTY_TK_LIBRARY OR NOT 3RDPARTY_TK_LIBRARY_DIR)
+  if (NOT DEFINED 3RDPARTY_TK_LIBRARY OR NOT 3RDPARTY_TK_LIBRARY_DIR)
-    set (3RDPARTY_TK_LIBRARY "" CACHE FILEPATH "tk library" FORCE)
+    set (3RDPARTY_TK_LIBRARY "" CACHE FILEPATH "tk library" FORCE)
-  endif()
+  endif()
-
+
-  # tk library directory
+  # tk library directory
-  if (NOT DEFINED 3RDPARTY_TK_LIBRARY_DIR)
+  if (NOT DEFINED 3RDPARTY_TK_LIBRARY_DIR)
-    set (3RDPARTY_TK_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tk library")
+    set (3RDPARTY_TK_LIBRARY_DIR "" CACHE FILEPATH "The directory containing tk library")
-  endif()
+  endif()
-
+
-  # tk shared library (with absolute path)
+  # tk shared library (with absolute path)
-  if (WIN32)
+  if (WIN32)
-    if (NOT DEFINED 3RDPARTY_TK_DLL OR NOT 3RDPARTY_TK_DLL_DIR)
+    if (NOT DEFINED 3RDPARTY_TK_DLL OR NOT 3RDPARTY_TK_DLL_DIR)
-      set (3RDPARTY_TK_DLL "" CACHE FILEPATH "tk shared library" FORCE)
+      set (3RDPARTY_TK_DLL "" CACHE FILEPATH "tk shared library" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  # tk shared library directory
+  # tk shared library directory
-  if (WIN32 AND NOT DEFINED 3RDPARTY_TK_DLL_DIR)
+  if (WIN32 AND NOT DEFINED 3RDPARTY_TK_DLL_DIR)
-    set (3RDPARTY_TK_DLL_DIR "" CACHE FILEPATH "The directory containing tk shared library")
+    set (3RDPARTY_TK_DLL_DIR "" CACHE FILEPATH "The directory containing tk shared library")
-  endif()
+  endif()
-endif()
+endif()
-
+
-# search for tk in user defined directory
+# search for tk in user defined directory
-if (NOT 3RDPARTY_TK_DIR AND 3RDPARTY_DIR)
+if (NOT 3RDPARTY_TK_DIR AND 3RDPARTY_DIR)
-  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" tk TK_DIR_NAME)
+  FIND_PRODUCT_DIR("${3RDPARTY_DIR}" tk TK_DIR_NAME)
-  if (TK_DIR_NAME)
+  if (TK_DIR_NAME)
-    set (3RDPARTY_TK_DIR "${3RDPARTY_DIR}/${TK_DIR_NAME}" CACHE PATH "The directory containing tk" FORCE)
+    set (3RDPARTY_TK_DIR "${3RDPARTY_DIR}/${TK_DIR_NAME}" CACHE PATH "The directory containing tk" FORCE)
-  endif()
+  endif()
-endif()
+endif()
-
+
-# define paths for default engine
+# define paths for default engine
-if (3RDPARTY_TK_DIR AND EXISTS "${3RDPARTY_TK_DIR}")
+if (3RDPARTY_TK_DIR AND EXISTS "${3RDPARTY_TK_DIR}")
-  set (TK_INCLUDE_PATH "${3RDPARTY_TK_DIR}/include")
+  set (TK_INCLUDE_PATH "${3RDPARTY_TK_DIR}/include")
-endif()
+endif()
-
+
-# check tk include dir, library dir and shared library dir
+# check tk include dir, library dir and shared library dir
-COMPLIANCE_PRODUCT_CONSISTENCY(TK)
+COMPLIANCE_PRODUCT_CONSISTENCY(TK)
-
+
-# use default (CMake) TCL search
+# use default (CMake) TCL search
-find_package(TCL QUIET)
+find_package(TCL QUIET)
-
+
-# tk include dir
+# tk include dir
-if (NOT 3RDPARTY_TK_INCLUDE_DIR)
+if (NOT 3RDPARTY_TK_INCLUDE_DIR)
-  if (TK_INCLUDE_PATH AND EXISTS "${TK_INCLUDE_PATH}")
+  if (TK_INCLUDE_PATH AND EXISTS "${TK_INCLUDE_PATH}")
-    set (3RDPARTY_TK_INCLUDE_DIR "${TK_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of TK" FORCE)
+    set (3RDPARTY_TK_INCLUDE_DIR "${TK_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of TK" FORCE)
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
-  # tk dir and library
+  # tk dir and library
-  if (NOT 3RDPARTY_TK_LIBRARY)
+  if (NOT 3RDPARTY_TK_LIBRARY)
-    if (TK_LIBRARY AND EXISTS "${TK_LIBRARY}")
+    if (TK_LIBRARY AND EXISTS "${TK_LIBRARY}")
-      set (3RDPARTY_TK_LIBRARY "${TK_LIBRARY}" CACHE FILEPATH "TK library" FORCE)
+      set (3RDPARTY_TK_LIBRARY "${TK_LIBRARY}" CACHE FILEPATH "TK library" FORCE)
-
+
-      if (NOT 3RDPARTY_TK_LIBRARY_DIR)
+      if (NOT 3RDPARTY_TK_LIBRARY_DIR)
-        get_filename_component (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY}" PATH)
+        get_filename_component (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY}" PATH)
-        set (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TK library" FORCE)
+        set (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TK library" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-
+
-  if (WIN32)
+  if (WIN32)
-    if (NOT 3RDPARTY_TK_DLL)
+    if (NOT 3RDPARTY_TK_DLL)
-        set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll" ".a")
+        set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll" ".a")
-
+
-        set (DLL_FOLDER_FOR_SEARCH "")
+        set (DLL_FOLDER_FOR_SEARCH "")
-        if (3RDPARTY_TK_DLL_DIR)
+        if (3RDPARTY_TK_DLL_DIR)
-          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DLL_DIR}")
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DLL_DIR}")
-        elseif (3RDPARTY_TK_DIR)
+        elseif (3RDPARTY_TK_DIR)
-          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DIR}/bin")
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DIR}/bin")
-        elseif (3RDPARTY_TK_LIBRARY_DIR)
+        elseif (3RDPARTY_TK_LIBRARY_DIR)
-          get_filename_component (3RDPARTY_TK_LIBRARY_DIR_PARENT "${3RDPARTY_TK_LIBRARY_DIR}" PATH)
+          get_filename_component (3RDPARTY_TK_LIBRARY_DIR_PARENT "${3RDPARTY_TK_LIBRARY_DIR}" PATH)
-          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_LIBRARY_DIR_PARENT}/bin")
+          set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_LIBRARY_DIR_PARENT}/bin")
-        endif()
+        endif()
-
+
-        set (3RDPARTY_TK_DLL "3RDPARTY_TK_DLL-NOTFOUND" CACHE FILEPATH "TK shared library" FORCE)
+        set (3RDPARTY_TK_DLL "3RDPARTY_TK_DLL-NOTFOUND" CACHE FILEPATH "TK shared library" FORCE)
-        find_library (3RDPARTY_TK_DLL NAMES ${CSF_TclTkLibs}
+        find_library (3RDPARTY_TK_DLL NAMES ${CSF_TclTkLibs}
-                                            PATHS "${DLL_FOLDER_FOR_SEARCH}"
+                                            PATHS "${DLL_FOLDER_FOR_SEARCH}"
-                                            NO_DEFAULT_PATH)
+                                            NO_DEFAULT_PATH)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-COMPLIANCE_PRODUCT_CONSISTENCY(TK)
+COMPLIANCE_PRODUCT_CONSISTENCY(TK)
-
+
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
-  # tk dir and library
+  # tk dir and library
-  if (NOT 3RDPARTY_TK_LIBRARY)
+  if (NOT 3RDPARTY_TK_LIBRARY)
-    set (3RDPARTY_TK_LIBRARY "3RDPARTY_TK_LIBRARY-NOTFOUND" CACHE FILEPATH "TK library" FORCE)
+    set (3RDPARTY_TK_LIBRARY "3RDPARTY_TK_LIBRARY-NOTFOUND" CACHE FILEPATH "TK library" FORCE)
-    find_library (3RDPARTY_TK_LIBRARY NAMES ${CSF_TclTkLibs}
+    find_library (3RDPARTY_TK_LIBRARY NAMES ${CSF_TclTkLibs}
-                                            PATHS "${3RDPARTY_TK_LIBRARY_DIR}"
+                                            PATHS "${3RDPARTY_TK_LIBRARY_DIR}"
-                                            NO_DEFAULT_PATH)
+                                            NO_DEFAULT_PATH)
-
+
-    # search in another place if previous search doesn't find anything
+    # search in another place if previous search doesn't find anything
-    find_library (3RDPARTY_TK_LIBRARY NAMES ${CSF_TclTkLibs}
+    find_library (3RDPARTY_TK_LIBRARY NAMES ${CSF_TclTkLibs}
-                                            PATHS "${3RDPARTY_TK_DIR}/lib"
+                                            PATHS "${3RDPARTY_TK_DIR}/lib"
-                                            NO_DEFAULT_PATH)
+                                            NO_DEFAULT_PATH)
-
+
-
+
-    if (NOT 3RDPARTY_TK_LIBRARY OR NOT EXISTS "${3RDPARTY_TK_LIBRARY}")
+    if (NOT 3RDPARTY_TK_LIBRARY OR NOT EXISTS "${3RDPARTY_TK_LIBRARY}")
-      set (3RDPARTY_TK_LIBRARY "" CACHE FILEPATH "TK library" FORCE)
+      set (3RDPARTY_TK_LIBRARY "" CACHE FILEPATH "TK library" FORCE)
-    endif()
+    endif()
-
+
-    if (NOT 3RDPARTY_TK_LIBRARY_DIR AND 3RDPARTY_TK_LIBRARY)
+    if (NOT 3RDPARTY_TK_LIBRARY_DIR AND 3RDPARTY_TK_LIBRARY)
-      get_filename_component (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY}" PATH)
+      get_filename_component (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY}" PATH)
-      set (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TK library" FORCE)
+      set (3RDPARTY_TK_LIBRARY_DIR "${3RDPARTY_TK_LIBRARY_DIR}" CACHE FILEPATH "The directory containing TK library" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  set (3RDPARTY_TK_LIBRARY_VERSION "")
+  set (3RDPARTY_TK_LIBRARY_VERSION "")
-  if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
+  if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
-    get_filename_component (TK_LIBRARY_NAME "${3RDPARTY_TK_LIBRARY}" NAME)
+    get_filename_component (TK_LIBRARY_NAME "${3RDPARTY_TK_LIBRARY}" NAME)
-    string(REGEX REPLACE "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY_NAME}")
+    string(REGEX REPLACE "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY_NAME}")
-
+
-    if (NOT "${TK_LIBRARY_VERSION}" STREQUAL "${TK_LIBRARY_NAME}")
+    if (NOT "${TK_LIBRARY_VERSION}" STREQUAL "${TK_LIBRARY_NAME}")
-      set (3RDPARTY_TK_LIBRARY_VERSION "${TK_LIBRARY_VERSION}")
+      set (3RDPARTY_TK_LIBRARY_VERSION "${TK_LIBRARY_VERSION}")
-    else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
+    else() # if the version isn't found - seek other library with 8.6 or 8.5 version in the same dir
-      message (STATUS "Info: TK version isn't found")
+      message (STATUS "Info: TK version isn't found")
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  set (3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT "")
+  set (3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT "")
-  if (3RDPARTY_TK_LIBRARY_VERSION)
+  if (3RDPARTY_TK_LIBRARY_VERSION)
-    string (REGEX REPLACE "^.*([0-9])[^0-9]*[0-9].*$" "\\1" 3RDPARTY_TK_MAJOR_VERSION "${3RDPARTY_TK_LIBRARY_VERSION}")
+    string (REGEX REPLACE "^.*([0-9])[^0-9]*[0-9].*$" "\\1" 3RDPARTY_TK_MAJOR_VERSION "${3RDPARTY_TK_LIBRARY_VERSION}")
-    string (REGEX REPLACE "^.*[0-9][^0-9]*([0-9]).*$" "\\1" 3RDPARTY_TK_MINOR_VERSION "${3RDPARTY_TK_LIBRARY_VERSION}")
+    string (REGEX REPLACE "^.*[0-9][^0-9]*([0-9]).*$" "\\1" 3RDPARTY_TK_MINOR_VERSION "${3RDPARTY_TK_LIBRARY_VERSION}")
-    set (3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT "${3RDPARTY_TK_MAJOR_VERSION}.${3RDPARTY_TK_MINOR_VERSION}")
+    set (3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT "${3RDPARTY_TK_MAJOR_VERSION}.${3RDPARTY_TK_MINOR_VERSION}")
-  endif()
+  endif()
-
+
-  if (WIN32)
+  if (WIN32)
-    if (NOT 3RDPARTY_TK_DLL)
+    if (NOT 3RDPARTY_TK_DLL)
-      set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll" ".a")
+      set (CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll" ".a")
-
+
-      set (DLL_FOLDER_FOR_SEARCH "")
+      set (DLL_FOLDER_FOR_SEARCH "")
-      if (3RDPARTY_TK_DLL_DIR)
+      if (3RDPARTY_TK_DLL_DIR)
-        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DLL_DIR}")
+        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DLL_DIR}")
-      elseif (3RDPARTY_TK_DIR)
+      elseif (3RDPARTY_TK_DIR)
-        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DIR}/bin")
+        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_DIR}/bin")
-      else()
+      else()
-        get_filename_component (3RDPARTY_TK_LIBRARY_DIR_PARENT "${3RDPARTY_TK_LIBRARY_DIR}" PATH)
+        get_filename_component (3RDPARTY_TK_LIBRARY_DIR_PARENT "${3RDPARTY_TK_LIBRARY_DIR}" PATH)
-        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_LIBRARY_DIR_PARENT}/bin")
+        set (DLL_FOLDER_FOR_SEARCH "${3RDPARTY_TK_LIBRARY_DIR_PARENT}/bin")
-      endif()
+      endif()
-
+
-      set (3RDPARTY_TK_DLL "3RDPARTY_TK_DLL-NOTFOUND" CACHE FILEPATH "TK shared library" FORCE)
+      set (3RDPARTY_TK_DLL "3RDPARTY_TK_DLL-NOTFOUND" CACHE FILEPATH "TK shared library" FORCE)
-      find_library (3RDPARTY_TK_DLL NAMES tk${3RDPARTY_TK_LIBRARY_VERSION}
+      find_library (3RDPARTY_TK_DLL NAMES tk${3RDPARTY_TK_LIBRARY_VERSION}
-                                          PATHS "${DLL_FOLDER_FOR_SEARCH}"
+                                          PATHS "${DLL_FOLDER_FOR_SEARCH}"
-                                          NO_DEFAULT_PATH)
+                                          NO_DEFAULT_PATH)
-
+
-      if (NOT 3RDPARTY_TK_DLL OR NOT EXISTS "${3RDPARTY_TK_DLL}")
+      if (NOT 3RDPARTY_TK_DLL OR NOT EXISTS "${3RDPARTY_TK_DLL}")
-        set (3RDPARTY_TK_DLL "" CACHE FILEPATH "TK shared library" FORCE)
+        set (3RDPARTY_TK_DLL "" CACHE FILEPATH "TK shared library" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-    if (NOT 3RDPARTY_TK_DLL_DIR AND 3RDPARTY_TK_DLL)
+    if (NOT 3RDPARTY_TK_DLL_DIR AND 3RDPARTY_TK_DLL)
-      get_filename_component (3RDPARTY_TK_DLL_DIR "${3RDPARTY_TK_DLL}" PATH)
+      get_filename_component (3RDPARTY_TK_DLL_DIR "${3RDPARTY_TK_DLL}" PATH)
-      set (3RDPARTY_TK_DLL_DIR "${3RDPARTY_TK_DLL_DIR}" CACHE FILEPATH "The directory containing TK shared library" FORCE)
+      set (3RDPARTY_TK_DLL_DIR "${3RDPARTY_TK_DLL_DIR}" CACHE FILEPATH "The directory containing TK shared library" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# include found paths to common variables
+# include found paths to common variables
-if (3RDPARTY_TK_INCLUDE_DIR AND EXISTS "${3RDPARTY_TK_INCLUDE_DIR}")
+if (3RDPARTY_TK_INCLUDE_DIR AND EXISTS "${3RDPARTY_TK_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TK_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TK_INCLUDE_DIR}")
-else()
+else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TK_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TK_INCLUDE_DIR)
-endif()
+endif()
-
+
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
-  if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
+  if (3RDPARTY_TK_LIBRARY AND EXISTS "${3RDPARTY_TK_LIBRARY}")
-    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TK_LIBRARY_DIR}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_TK_LIBRARY_DIR}")
-  else()
+  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TK_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_TK_LIBRARY_DIR)
-  endif()
+  endif()
-
+
-  if (WIN32)
+  if (WIN32)
-    if (3RDPARTY_TK_DLL OR EXISTS "${3RDPARTY_TK_DLL}")
+    if (3RDPARTY_TK_DLL OR EXISTS "${3RDPARTY_TK_DLL}")
-      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TK_DLL_DIR}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_TK_DLL_DIR}")
-    else()
+    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TK_DLL_DIR)
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_TK_DLL_DIR)
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  # install tk
+  # install tk
-  if (INSTALL_TK)
+  if (INSTALL_TK)
-    # include occt macros. compiler_bitness, os_wiht_bit, compiler
+    # include occt macros. compiler_bitness, os_wiht_bit, compiler
-    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+    OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
+
-    OCCT_MAKE_OS_WITH_BITNESS()
+    OCCT_MAKE_OS_WITH_BITNESS()
-    OCCT_MAKE_COMPILER_SHORT_NAME()
+    OCCT_MAKE_COMPILER_SHORT_NAME()
-
+
-    if (WIN32)
+    if (WIN32)
-      # tk 8.6 requires zlib. install all dlls from tk bin folder that may contain zlib also
+      # tk 8.6 requires zlib. install all dlls from tk bin folder that may contain zlib also
-
+
-      # collect and install all dlls from tk dll dirs
+      # collect and install all dlls from tk dll dirs
-      file (GLOB TK_DLLS  "${3RDPARTY_TK_DLL_DIR}/*.dll")
+      file (GLOB TK_DLLS  "${3RDPARTY_TK_DLL_DIR}/*.dll")
-
+
-      if (SINGLE_GENERATOR)
+      if (SINGLE_GENERATOR)
-        install (FILES ${TK_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
+        install (FILES ${TK_DLLS} DESTINATION "${INSTALL_DIR_BIN}")
-      else()
+      else()
-        install (FILES ${TK_DLLS}
+        install (FILES ${TK_DLLS}
-                 CONFIGURATIONS Release
+                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR_BIN}")
+                 DESTINATION "${INSTALL_DIR_BIN}")
-        install (FILES ${TK_DLLS}
+        install (FILES ${TK_DLLS}
-                 CONFIGURATIONS RelWithDebInfo
+                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_DIR_BIN}i")
-        install (FILES ${TK_DLLS}
+        install (FILES ${TK_DLLS}
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR_BIN}d")
-      endif()
+      endif()
-    else()
+    else()
-      get_filename_component(3RDPARTY_TK_LIBRARY_REALPATH ${3RDPARTY_TK_LIBRARY} REALPATH)
+      get_filename_component(3RDPARTY_TK_LIBRARY_REALPATH ${3RDPARTY_TK_LIBRARY} REALPATH)
-
+
-      if (SINGLE_GENERATOR)
+      if (SINGLE_GENERATOR)
-        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
+        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
-      else()
+      else()
-        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
-                 CONFIGURATIONS Release
+                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR_LIB}/")
+                 DESTINATION "${INSTALL_DIR_LIB}/")
-        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
-                 CONFIGURATIONS RelWithDebInfo
+                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR_LIB}/i")
+                 DESTINATION "${INSTALL_DIR_LIB}/i")
-        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
+        install (FILES ${3RDPARTY_TK_LIBRARY_REALPATH}
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR_LIB}d")
+                 DESTINATION "${INSTALL_DIR_LIB}d")
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    if (TCL_TCLSH_VERSION)
+    if (TCL_TCLSH_VERSION)
-      # tk is required to install in lib folder (without)
+      # tk is required to install in lib folder (without)
-      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR_LIB}")
+      install (DIRECTORY "${3RDPARTY_TK_LIBRARY_DIR}/tk${TCL_TCLSH_VERSION}"  DESTINATION "${INSTALL_DIR_LIB}")
-    else()
+    else()
-      message (STATUS "\nWarning: tkX.X subdir won't be copied during the installation process.")
+      message (STATUS "\nWarning: tkX.X subdir won't be copied during the installation process.")
-      message (STATUS "Try seeking tk within another folder by changing 3RDPARTY_TK_DIR variable.")
+      message (STATUS "Try seeking tk within another folder by changing 3RDPARTY_TK_DIR variable.")
-    endif()
+    endif()
-
+
-    set (USED_3RDPARTY_TK_DIR "")
+    set (USED_3RDPARTY_TK_DIR "")
-  else()
+  else()
-    # the library directory for using by the executable
+    # the library directory for using by the executable
-    if (WIN32)
+    if (WIN32)
-      set (USED_3RDPARTY_TK_DIR ${3RDPARTY_TK_DLL_DIR})
+      set (USED_3RDPARTY_TK_DIR ${3RDPARTY_TK_DLL_DIR})
-    else()
+    else()
-      set (USED_3RDPARTY_TK_DIR ${3RDPARTY_TK_LIBRARY_DIR})
+      set (USED_3RDPARTY_TK_DIR ${3RDPARTY_TK_LIBRARY_DIR})
-    endif()
+    endif()
-  endif()
+  endif()
-
+
-  mark_as_advanced (3RDPARTY_TK_LIBRARY 3RDPARTY_TK_DLL)
+  mark_as_advanced (3RDPARTY_TK_LIBRARY 3RDPARTY_TK_DLL)
-endif()
+endif()
-
+
-# unset all redundant variables
+# unset all redundant variables
-#TCL
+#TCL
-OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
+OCCT_CHECK_AND_UNSET (TCL_LIBRARY)
-OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TCL_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TCL_TCLSH)
+OCCT_CHECK_AND_UNSET (TCL_TCLSH)
-#TK
+#TK
-OCCT_CHECK_AND_UNSET (TK_LIBRARY)
+OCCT_CHECK_AND_UNSET (TK_LIBRARY)
-OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
+OCCT_CHECK_AND_UNSET (TK_INCLUDE_PATH)
-OCCT_CHECK_AND_UNSET (TK_WISH)
+OCCT_CHECK_AND_UNSET (TK_WISH)
-
+
-if (NOT BUILD_SHARED_LIBS)
+if (NOT BUILD_SHARED_LIBS)
-  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY)
+  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY)
-  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY_DIR)
+  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_LIBRARY_DIR)
-  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_DLL)
+  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_DLL)
-  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_DLL_DIR)
+  OCCT_CHECK_AND_UNSET (3RDPARTY_TK_DLL_DIR)
-  OCCT_CHECK_AND_UNSET (INSTALL_TK)
+  OCCT_CHECK_AND_UNSET (INSTALL_TK)
-endif()
+endif()

adm/cmake/vardescr.cmake

@@ -1,215 +1,215 @@
-# variable description
+# variable description
-
+
-# 
+# 
-set (BUILD_PATCH_DESCR 
+set (BUILD_PATCH_DESCR 
-"Points to the directory recognized as a 'patch' for OCCT. If specified,
+"Points to the directory recognized as a 'patch' for OCCT. If specified,
-the files from this directory take precedence over the corresponding native
+the files from this directory take precedence over the corresponding native
-OCCT sources. This way you are able to introduce patches to Open CASCADE
+OCCT sources. This way you are able to introduce patches to Open CASCADE
-Technology not affecting the original source distribution")
+Technology not affecting the original source distribution")
-
+
-
+
-set (BUILD_LIBRARY_TYPE_DESCR 
+set (BUILD_LIBRARY_TYPE_DESCR 
-"Specifies the type of library to be created. 'Shared' libraries
+"Specifies the type of library to be created. 'Shared' libraries
-are linked dynamically and loaded at runtime. 'Static' libraries
+are linked dynamically and loaded at runtime. 'Static' libraries
-are archives of object files for use when linking other targets")
+are archives of object files for use when linking other targets")
-
+
-set (BUILD_YACCLEX_DESCR 
+set (BUILD_YACCLEX_DESCR 
-"Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and
+"Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and
-ExprIntrp functionality are generated automatically with Flex/Bison. Checking this options
+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")
+leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files")
-
+
-set (BUILD_RESOURCES_DESCR "Enables regeneration of OCCT resource files")
+set (BUILD_RESOURCES_DESCR "Enables regeneration of OCCT resource files")
-
+
-set (BUILD_WITH_DEBUG_DESCR
+set (BUILD_WITH_DEBUG_DESCR
-"Enables extended messages of many OCCT algorithms, usually printed to cout.
+"Enables extended messages of many OCCT algorithms, usually printed to cout.
-These include messages on internal errors and special cases encountered, timing etc.
+These include messages on internal errors and special cases encountered, timing etc.
-Applies only for Debug configuration.")
+Applies only for Debug configuration.")
-
+
-set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
+set (BUILD_SHARED_LIBRARY_NAME_POSTFIX_DESCR
-"Append the postfix to names of output libraries")
+"Append the postfix to names of output libraries")
-
+
-set (BUILD_SOVERSION_NUMBERS_DESCR
+set (BUILD_SOVERSION_NUMBERS_DESCR
-"Version numbers to put into SONAME: 0 - for empty, 1 - for major, 2 - for major.minor, 3 - for major.minor.maintenance")
+"Version numbers to put into SONAME: 0 - for empty, 1 - for major, 2 - for major.minor, 3 - for major.minor.maintenance")
-
+
-set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
+set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
-"Disables exceptions like Standard_OutOfRange in Release builds.
+"Disables exceptions like Standard_OutOfRange in Release builds.
-Defines No_Exception macros for Release builds when enabled (default).
+Defines No_Exception macros for Release builds when enabled (default).
-These exceptions are always enabled in Debug builds, but disable in Release for better performance")
+These exceptions are always enabled in Debug builds, but disable in Release for better performance")
-
+
-set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
+set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
-"Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
+"Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
-Corresponding environment variable (CSF_FPE) can be changed manually
+Corresponding environment variable (CSF_FPE) can be changed manually
-in custom.bat/sh scripts without regeneration by CMake.")
+in custom.bat/sh scripts without regeneration by CMake.")
-
+
-set (BUILD_FORCE_RelWithDebInfo_DESCR
+set (BUILD_FORCE_RelWithDebInfo_DESCR
-"Generate PDB files within normal Release build.")
+"Generate PDB files within normal Release build.")
-
+
-set (BUILD_USE_PCH_DESCR
+set (BUILD_USE_PCH_DESCR
-"Use precompiled headers to accelerate the build.
+"Use precompiled headers to accelerate the build.
-Precompiled headers are generated automatically by Cotire tool.")
+Precompiled headers are generated automatically by Cotire tool.")
-
+
-# install variables
+# install variables
-set (INSTALL_DIR_DESCR 
+set (INSTALL_DIR_DESCR 
-"The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable),
+"The place where built OCCT libraries, headers, test cases (INSTALL_TEST_CASES variable),
-samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_TBB and
+samples (INSTALL_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_TBB and
-other similar variables) will be placed during the installation process (building INSTALL project)")
+other similar variables) will be placed during the installation process (building INSTALL project)")
-
+
-set (INSTALL_DIR_WITH_VERSION_DESCR
+set (INSTALL_DIR_WITH_VERSION_DESCR
-"Use OCCT version number as suffix for names of directories")
+"Use OCCT version number as suffix for names of directories")
-
+
-set (INSTALL_DIR_LAYOUT_DESCR
+set (INSTALL_DIR_LAYOUT_DESCR
-"Defines structure of OCCT files (binaries, resources, headers etc.) for the install directory.
+"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).
+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.")
+If needed, layout can be customized with INSTALL_DIR_* variables.")
-
+
-set (INSTALL_DIR_BIN_DESCR 
+set (INSTALL_DIR_BIN_DESCR 
-"Subdirectory of INSTALL_DIR where binaries will be installed")
+"Subdirectory of INSTALL_DIR where binaries will be installed")
-set (INSTALL_DIR_INCLUDE_DESCR 
+set (INSTALL_DIR_INCLUDE_DESCR 
-"Subdirectory of INSTALL_DIR where OCCT headers will be installed")
+"Subdirectory of INSTALL_DIR where OCCT headers will be installed")
-set (INSTALL_DIR_DATA_DESCR 
+set (INSTALL_DIR_DATA_DESCR 
-"Subdirectory of INSTALL_DIR where sample data files will be installed")
+"Subdirectory of INSTALL_DIR where sample data files will be installed")
-set (INSTALL_DIR_DOC_DESCR 
+set (INSTALL_DIR_DOC_DESCR 
-"Subdirectory of INSTALL_DIR where documentation will be installed")
+"Subdirectory of INSTALL_DIR where documentation will be installed")
-set (INSTALL_DIR_LIB_DESCR 
+set (INSTALL_DIR_LIB_DESCR 
-"Subdirectory of INSTALL_DIR where libraries (.so on Linux, .lib on Windows) will be installed")
+"Subdirectory of INSTALL_DIR where libraries (.so on Linux, .lib on Windows) will be installed")
-set (INSTALL_DIR_RESOURCE_DESCR 
+set (INSTALL_DIR_RESOURCE_DESCR 
-"Subdirectory of INSTALL_DIR where OCCT resource files will be installed")
+"Subdirectory of INSTALL_DIR where OCCT resource files will be installed")
-set (INSTALL_DIR_SAMPLES_DESCR 
+set (INSTALL_DIR_SAMPLES_DESCR 
-"Subdirectory of INSTALL_DIR where samples will be installed")
+"Subdirectory of INSTALL_DIR where samples will be installed")
-set (INSTALL_DIR_TESTS_DESCR 
+set (INSTALL_DIR_TESTS_DESCR 
-"Subdirectory of INSTALL_DIR where test scripts will be installed")
+"Subdirectory of INSTALL_DIR where test scripts will be installed")
-set (INSTALL_DIR_SCRIPT_DESCR 
+set (INSTALL_DIR_SCRIPT_DESCR 
-"Subdirectory of INSTALL_DIR where scripts will be installed")
+"Subdirectory of INSTALL_DIR where scripts will be installed")
-set (INSTALL_DIR_CMAKE_DESCR 
+set (INSTALL_DIR_CMAKE_DESCR 
-"Subdirectory of INSTALL_DIR where CMake configuration files will be installed.
+"Subdirectory of INSTALL_DIR where CMake configuration files will be installed.
-Must be three levels below INSTALL_DIR")
+Must be three levels below INSTALL_DIR")
-
+
-macro (INSTALL_MESSAGE INSTALL_TARGET_VARIABLE INSTALL_TARGET_STRING)
+macro (INSTALL_MESSAGE INSTALL_TARGET_VARIABLE INSTALL_TARGET_STRING)
-set (${INSTALL_TARGET_VARIABLE}_DESCR
+set (${INSTALL_TARGET_VARIABLE}_DESCR
-"Indicates whether ${INSTALL_TARGET_STRING} should be installed (building INSTALL
+"Indicates whether ${INSTALL_TARGET_STRING} should be installed (building INSTALL
-project) into the installation directory (INSTALL_DIR variable)")
+project) into the installation directory (INSTALL_DIR variable)")
-endmacro()
+endmacro()
-
+
-INSTALL_MESSAGE (INSTALL_SAMPLES          "OCCT samples")
+INSTALL_MESSAGE (INSTALL_SAMPLES          "OCCT samples")
-INSTALL_MESSAGE (INSTALL_TEST_CASES       "non-regression OCCT test scripts")
+INSTALL_MESSAGE (INSTALL_TEST_CASES       "non-regression OCCT test scripts")
-INSTALL_MESSAGE (INSTALL_DOC_Overview     "OCCT overview documentation (HTML format)")
+INSTALL_MESSAGE (INSTALL_DOC_Overview     "OCCT overview documentation (HTML format)")
-INSTALL_MESSAGE (INSTALL_FFMPEG           "FFmpeg binaries")
+INSTALL_MESSAGE (INSTALL_FFMPEG           "FFmpeg binaries")
-INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
+INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
-INSTALL_MESSAGE (INSTALL_OPENVR           "OpenVR binaries")
+INSTALL_MESSAGE (INSTALL_OPENVR           "OpenVR binaries")
-INSTALL_MESSAGE (INSTALL_EIGEN            "EIGEN header files")
+INSTALL_MESSAGE (INSTALL_EIGEN            "EIGEN header files")
-INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
+INSTALL_MESSAGE (INSTALL_EGL              "EGL binaries")
-INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
+INSTALL_MESSAGE (INSTALL_GLES2            "OpenGL ES 2.0 binaries")
-INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
+INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
-INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
+INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
-INSTALL_MESSAGE (INSTALL_RAPIDJSON        "RapidJSON header files")
+INSTALL_MESSAGE (INSTALL_RAPIDJSON        "RapidJSON header files")
-INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
+INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
-INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
+INSTALL_MESSAGE (INSTALL_TK               "TK binaries")
-INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
+INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
-
+
-# build variables
+# build variables
-macro (BUILD_MODULE_MESSAGE BUILD_MODULE_TARGET_VARIABLE BUILD_MODULE_TARGET_STRING)
+macro (BUILD_MODULE_MESSAGE BUILD_MODULE_TARGET_VARIABLE BUILD_MODULE_TARGET_STRING)
-set (${BUILD_MODULE_TARGET_VARIABLE}_DESCR
+set (${BUILD_MODULE_TARGET_VARIABLE}_DESCR
-"Indicates whether ${BUILD_MODULE_TARGET_STRING} module should be built or not.
+"Indicates whether ${BUILD_MODULE_TARGET_STRING} module should be built or not.
-It should be noted that some toolkits of the module can be built even if this module
+It should be noted that some toolkits of the module can be built even if this module
-is not checked (this happens if some other modules depend on these toolkits)")
+is not checked (this happens if some other modules depend on these toolkits)")
-endmacro()
+endmacro()
-
+
-BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingData         "ModelingData")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingData         "ModelingData")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_Visualization        "Visualization")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_Visualization        "Visualization")
-
+
-
+
-set (BUILD_ADDITIONAL_TOOLKITS_DESCR
+set (BUILD_ADDITIONAL_TOOLKITS_DESCR
-"Semicolon-separated individual toolkits to include into build process. If you
+"Semicolon-separated individual toolkits to include into build process. If you
-want to build some particular libraries (toolkits) only, then you may uncheck
+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
+all modules in the corresponding BUILD_MODUE_* options and provide the list of
-necessary libraries here. Of course, all dependencies will be resolved automatically")
+necessary libraries here. Of course, all dependencies will be resolved automatically")
-
+
-set (BUILD_SAMPLES_MFC_DESCR
+set (BUILD_SAMPLES_MFC_DESCR
-"Indicates whether OCCT MFC samples should be built together with OCCT.
+"Indicates whether OCCT MFC samples should be built together with OCCT.
-These samples show some possibilities of using OCCT and they can be executed
+These samples show some possibilities of using OCCT and they can be executed
-with script samples.bat from the installation directory (INSTALL_DIR)")
+with script samples.bat from the installation directory (INSTALL_DIR)")
-
+
-set (BUILD_SAMPLES_QT_DESCR
+set (BUILD_SAMPLES_QT_DESCR
-"Indicates whether OCCT Qt samples should be built together with OCCT.
+"Indicates whether OCCT Qt samples should be built together with OCCT.
-These samples show some possibilities of using OCCT and they can be executed
+These samples show some possibilities of using OCCT and they can be executed
-with script samples.bat from the installation directory (INSTALL_DIR)")
+with script samples.bat from the installation directory (INSTALL_DIR)")
-
+
-set (BUILD_Inspector_DESCR
+set (BUILD_Inspector_DESCR
-"Indicates whether OCCT inspector should be built together with OCCT.
+"Indicates whether OCCT inspector should be built together with OCCT.
-This inspector provides functionality to interactively inspect low-level content
+This inspector provides functionality to interactively inspect low-level content
-of the OCAF data model, OCCT viewer, etc. have been introduced in OCCT.
+of the OCAF data model, OCCT viewer, etc. have been introduced in OCCT.
-It can be executed with script inspector.bat from the installation directory (INSTALL_DIR) or
+It can be executed with script inspector.bat from the installation directory (INSTALL_DIR) or
-using 'tinspector' command in DRAW interpretator")
+using 'tinspector' command in DRAW interpretator")
-
+
-set (BUILD_MODULE_UwpSample_DESCR
+set (BUILD_MODULE_UwpSample_DESCR
-"Indicates whether OCCT UWP sample should be built together with OCCT.")
+"Indicates whether OCCT UWP sample should be built together with OCCT.")
-
+
-set (BUILD_DOC_Overview_DESCR
+set (BUILD_DOC_Overview_DESCR
-"Indicates whether OCCT overview documentation project (Markdown format) should be
+"Indicates whether OCCT overview documentation project (Markdown format) should be
-created together with OCCT. It is not built together with OCCT. Checking this options
+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
+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
+to generate the documentation in HTML format. The documentation will be available in the
-installation directory (overview.bat script) if INSTALL_DOC_Overview variable is checked")
+installation directory (overview.bat script) if INSTALL_DOC_Overview variable is checked")
-
+
-set (3RDPARTY_DIR_DESCR
+set (3RDPARTY_DIR_DESCR
-"The root directory where all required third-party products will be searched. If a
+"The root directory where all required third-party products will be searched. If a
-third-party product have been found - corresponding CMake variables will be specified
+third-party product have been found - corresponding CMake variables will be specified
-(VTK: 3RDPARTY_VTK_DIR, 3RDPARTY_VTK_INCLUDE_DIR, 3RDPARTY_VTK_LIBRARY_DIR)")
+(VTK: 3RDPARTY_VTK_DIR, 3RDPARTY_VTK_INCLUDE_DIR, 3RDPARTY_VTK_LIBRARY_DIR)")
-
+
-set (USE_TK_DESCR
+set (USE_TK_DESCR
-"Indicates whether Tk product should be used by Draw Harness for user interface")
+"Indicates whether Tk product should be used by Draw Harness for user interface")
-
+
-set (USE_FREETYPE_DESCR
+set (USE_FREETYPE_DESCR
-"Indicates whether FreeType product should be used in OCCT for text rendering using external font files")
+"Indicates whether FreeType product should be used in OCCT for text rendering using external font files")
-
+
-set (USE_FFMPEG_DESCR
+set (USE_FFMPEG_DESCR
-"Indicates whether FFmpeg framework is used or not. FFmpeg stands for
+"Indicates whether FFmpeg framework is used or not. FFmpeg stands for
-multimedia data handling, open-source software libraries used for video encoding and decoding.")
+multimedia data handling, open-source software libraries used for video encoding and decoding.")
-
+
-set (USE_FREEIMAGE_DESCR
+set (USE_FREEIMAGE_DESCR
-"Indicates whether FreeImage product should be used in OCCT visualization
+"Indicates whether FreeImage product should be used in OCCT visualization
-module for support of popular graphics image formats (PNG, BMP etc)")
+module for support of popular graphics image formats (PNG, BMP etc)")
-
+
-set (USE_OPENVR_DESCR
+set (USE_OPENVR_DESCR
-"Indicates whether OpenVR should be used in OCCT visualization module for VR support")
+"Indicates whether OpenVR should be used in OCCT visualization module for VR support")
-
+
-set (USE_RAPIDJSON_DESCR
+set (USE_RAPIDJSON_DESCR
-"Indicates whether RapidJSON product should be used in OCCT DataExchange
+"Indicates whether RapidJSON product should be used in OCCT DataExchange
-module for support of JSON-based formats like glTF")
+module for support of JSON-based formats like glTF")
-
+
-set (USE_DRACO_DESCR
+set (USE_DRACO_DESCR
-"Indicates whether Draco mesh decoding library should be used by glTF reader")
+"Indicates whether Draco mesh decoding library should be used by glTF reader")
-
+
-set (USE_EGL_DESCR
+set (USE_EGL_DESCR
-"Indicates whether EGL should be used in OCCT visualization
+"Indicates whether EGL should be used in OCCT visualization
-module instead of conventional OpenGL context creation APIs")
+module instead of conventional OpenGL context creation APIs")
-
+
-set (USE_OPENGL_DESCR
+set (USE_OPENGL_DESCR
-"Indicates whether OpenGL desktop should be used in OCCT visualization module")
+"Indicates whether OpenGL desktop should be used in OCCT visualization module")
-set (USE_GLES2_DESCR
+set (USE_GLES2_DESCR
-"Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module")
+"Indicates whether OpenGL ES 2.0 should be used in OCCT visualization module")
-
+
-set (USE_TBB_DESCR
+set (USE_TBB_DESCR
-"Indicates whether TBB is used or not. TBB stands for Threading Building Blocks,
+"Indicates whether TBB is used or not. TBB stands for Threading Building Blocks,
-the technology of Intel Corp, which comes with different mechanisms and patterns for
+the technology of Intel Corp, which comes with different mechanisms and patterns for
-injecting parallelism into your application. OCCT remains parallel even without TBB product")
+injecting parallelism into your application. OCCT remains parallel even without TBB product")
-
+
-set (USE_VTK_DESCR
+set (USE_VTK_DESCR
-"Indicates whether VTK is used or not. VTK stands for Visualization
+"Indicates whether VTK is used or not. VTK stands for Visualization
-ToolKit, the technology of Kitware Inc intended for general-purpose scientific
+ToolKit, the technology of Kitware Inc intended for general-purpose scientific
-visualization. OCCT comes with a bridge between CAD data representation and
+visualization. OCCT comes with a bridge between CAD data representation and
-VTK by means of its dedicated VIS component (VTK Integration Services).")
+VTK by means of its dedicated VIS component (VTK Integration Services).")
-
+
-set (USE_XLIB_DESCR "Indicates whether X11 is used or not")
+set (USE_XLIB_DESCR "Indicates whether X11 is used or not")
-
+
-set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualization module should be build or not")
+set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualization module should be build or not")
-
+
-macro (BUILD_MODULE MODULE_NAME)
+macro (BUILD_MODULE MODULE_NAME)
-  set (ENABLE_MODULE TRUE)
+  set (ENABLE_MODULE TRUE)
-  set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
+  set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
-endmacro()
+endmacro()

adm/cmake/vtk.cmake

@@ -1,307 +1,307 @@
-# vtk
+# vtk
-
+
-if (NOT DEFINED INSTALL_VTK)
+if (NOT DEFINED INSTALL_VTK)
-  set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
+  set (INSTALL_VTK OFF CACHE BOOL "${INSTALL_VTK_DESCR}")
-endif()
+endif()
-
+
-# vtk directory
+# vtk directory
-if (NOT DEFINED 3RDPARTY_VTK_DIR)
+if (NOT DEFINED 3RDPARTY_VTK_DIR)
-  set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK")
+  set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK")
-endif()
+endif()
-
+
-# include occt macros. compiler_bitness, os_wiht_bit, compiler
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
-OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")
-
+
-# specify VTK folder in connectin with 3RDPARTY_DIR
+# specify VTK folder in connectin with 3RDPARTY_DIR
-if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
-  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_VTK_DIR PATH "The directory containing VTK")
+  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_VTK_DIR PATH "The directory containing VTK")
-
+
-  if (NOT 3RDPARTY_VTK_DIR OR NOT EXISTS "${3RDPARTY_VTK_DIR}")
+  if (NOT 3RDPARTY_VTK_DIR OR NOT EXISTS "${3RDPARTY_VTK_DIR}")
-    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" VTK VTK_DIR_NAME)
+    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" VTK VTK_DIR_NAME)
-    if (VTK_DIR_NAME)
+    if (VTK_DIR_NAME)
-      set (3RDPARTY_VTK_DIR "${3RDPARTY_DIR}/${VTK_DIR_NAME}" CACHE PATH "The directory containing VTK" FORCE)
+      set (3RDPARTY_VTK_DIR "${3RDPARTY_DIR}/${VTK_DIR_NAME}" CACHE PATH "The directory containing VTK" FORCE)
-    endif()
+    endif()
-  endif()
+  endif()
-else()
+else()
-  #set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK" FORCE)
+  #set (3RDPARTY_VTK_DIR "" CACHE PATH "The directory containing VTK" FORCE)
-endif()
+endif()
-
+
-# vtk include directory
+# vtk include directory
-if (NOT DEFINED 3RDPARTY_VTK_INCLUDE_DIR)
+if (NOT DEFINED 3RDPARTY_VTK_INCLUDE_DIR)
-  set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE PATH "The directory containing headers of VTK")
+  set (3RDPARTY_VTK_INCLUDE_DIR "" CACHE PATH "The directory containing headers of VTK")
-endif()
+endif()
-
+
-#if (BUILD_SHARED_LIBS)
+#if (BUILD_SHARED_LIBS)
-  # vtk library directory
+  # vtk library directory
-  if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
+  if (NOT DEFINED 3RDPARTY_VTK_LIBRARY_DIR)
-    set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE PATH "The directory containing VTK libraries")
+    set (3RDPARTY_VTK_LIBRARY_DIR "" CACHE PATH "The directory containing VTK libraries")
-  endif()
+  endif()
-
+
-  # vtk dll directory
+  # vtk dll directory
-  if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
+  if (WIN32 AND NOT DEFINED 3RDPARTY_VTK_DLL_DIR)
-    set (3RDPARTY_VTK_DLL_DIR "" CACHE PATH "The directory containing VTK shared libraries")
+    set (3RDPARTY_VTK_DLL_DIR "" CACHE PATH "The directory containing VTK shared libraries")
-  endif()
+  endif()
-#endif()
+#endif()
-
+
-# check 3RDPARTY_VTK_ paths for consistency with specified 3RDPARTY_VTK_DIR
+# check 3RDPARTY_VTK_ paths for consistency with specified 3RDPARTY_VTK_DIR
-if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_INCLUDE_DIR PATH "The directory containing headers of VTK")
+  CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_INCLUDE_DIR PATH "The directory containing headers of VTK")
-  if (BUILD_SHARED_LIBS)
+  if (BUILD_SHARED_LIBS)
-    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_LIBRARY_DIR PATH "The directory containing VTK libraries")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_LIBRARY_DIR PATH "The directory containing VTK libraries")
-
+
-    if (WIN32)
+    if (WIN32)
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_DLL_DIR PATH "The directory containing VTK shared library")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_VTK_DIR 3RDPARTY_VTK_DLL_DIR PATH "The directory containing VTK shared library")
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-  set (CACHED_VTK_DIR $ENV{VTK_DIR})
+  set (CACHED_VTK_DIR $ENV{VTK_DIR})
-  set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
+  set (ENV{VTK_DIR} "${3RDPARTY_VTK_DIR}")
-endif()
+endif()
-
+
-find_package(VTK QUIET)
+find_package(VTK QUIET)
-
+
-if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
+if (3RDPARTY_VTK_DIR AND EXISTS "${3RDPARTY_VTK_DIR}")
-  set (ENV{VTK_DIR} ${CACHED_VTK_DIR})
+  set (ENV{VTK_DIR} ${CACHED_VTK_DIR})
-endif()
+endif()
-
+
-unset (IS_VTK_9XX)
+unset (IS_VTK_9XX)
-if (VTK_FOUND)
+if (VTK_FOUND)
-  message ("VTK version (${VTK_VERSION})")
+  message ("VTK version (${VTK_VERSION})")
-  if(VTK_MAJOR_VERSION EQUAL 8 AND VTK_MINOR_VERSION GREATER 9 OR VTK_MAJOR_VERSION GREATER 8)
+  if(VTK_MAJOR_VERSION EQUAL 8 AND VTK_MINOR_VERSION GREATER 9 OR VTK_MAJOR_VERSION GREATER 8)
-    set (IS_VTK_9XX 1)
+    set (IS_VTK_9XX 1)
-  else()
+  else()
-    # add compiler flags, preprocessor definitions, include and link dirs
+    # add compiler flags, preprocessor definitions, include and link dirs
-    include (${VTK_USE_FILE})
+    include (${VTK_USE_FILE})
-  endif()
+  endif()
-
+
-  if (VTK_LIBRARIES)
+  if (VTK_LIBRARIES)
-
+
-    set (3RDPARTY_VTK_INCLUDE_DIRS)
+    set (3RDPARTY_VTK_INCLUDE_DIRS)
-
+
-#    if (BUILD_SHARED_LIBS)
+#    if (BUILD_SHARED_LIBS)
-      set (3RDPARTY_VTK_LIBRARY_DIRS)
+      set (3RDPARTY_VTK_LIBRARY_DIRS)
-      set (3RDPARTY_VTK_DLL_DIRS)
+      set (3RDPARTY_VTK_DLL_DIRS)
-#    endif()
+#    endif()
-
+
-    foreach (VTK_LIBRARY ${VTK_LIBRARIES})
+    foreach (VTK_LIBRARY ${VTK_LIBRARIES})
-      if (IS_VTK_9XX)
+      if (IS_VTK_9XX)
-        string (REGEX MATCH "^VTK::" IS_VTK_LIBRARY ${VTK_LIBRARY})
+        string (REGEX MATCH "^VTK::" IS_VTK_LIBRARY ${VTK_LIBRARY})
-      else()
+      else()
-        string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
+        string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY})
-      endif()
+      endif()
-      if (NOT IS_VTK_LIBRARY OR NOT TARGET ${VTK_LIBRARY})
+      if (NOT IS_VTK_LIBRARY OR NOT TARGET ${VTK_LIBRARY})
-        continue()
+        continue()
-      endif()
+      endif()
-
+
-      # get paths from corresponding variables
+      # get paths from corresponding variables
-      if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
+      if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
-        list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
+        list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}")
-      endif()
+      endif()
-
+
-      if (${VTK_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
+      if (${VTK_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
-        list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
+        list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_LIBRARY_DIRS}")
-      endif()
+      endif()
-
+
-      if (${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+      if (${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-        list (APPEND 3RDPARTY_VTK_DLL_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+        list (APPEND 3RDPARTY_VTK_DLL_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-        if (NOT WIN32)
+        if (NOT WIN32)
-          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
+          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${${VTK_LIBRARY}_RUNTIME_LIBRARY_DIRS}")
-        endif()
+        endif()
-      endif()
+      endif()
-
+
-      # get paths from corresponding properties
+      # get paths from corresponding properties
-      get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY} IMPORTED_CONFIGURATIONS)
+      get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY} IMPORTED_CONFIGURATIONS)
-      if (TARGET_VTK_IMPORT_CONFS)
+      if (TARGET_VTK_IMPORT_CONFS)
-        list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+        list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
-
+
-        # todo: choose configuration in connection with the build type
+        # todo: choose configuration in connection with the build type
-        #if (CMAKE_BUILD_TYPE)
+        #if (CMAKE_BUILD_TYPE)
-        #  foreach (IMPORT_CONF ${TARGET_VTK_IMPORT_CONFS})
+        #  foreach (IMPORT_CONF ${TARGET_VTK_IMPORT_CONFS})
-        #  endforeach()
+        #  endforeach()
-        #endif()
+        #endif()
-
+
-        # Work-around against link failure in case if VTK contains dependency
+        # Work-around against link failure in case if VTK contains dependency
-        # on DirectX: its run-time is always present on Windows, but SDK can
+        # on DirectX: its run-time is always present on Windows, but SDK can
-        # be absent on current workstation, while not actually needed for
+        # be absent on current workstation, while not actually needed for
-        # OCCT linking.
+        # OCCT linking.
-        # VTK 6.1 for VC 10
+        # VTK 6.1 for VC 10
-        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
+        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
-        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
+        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
-          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-          if (HARDCODED_D3D9_LIB)
+          if (HARDCODED_D3D9_LIB)
-            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
+            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
-
+
-            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
+            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
-            set_target_properties (${VTK_LIBRARY} PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF} "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+            set_target_properties (${VTK_LIBRARY} PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF} "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-          endif()
+          endif()
-        endif()
+        endif()
-        # VTK 6.1 for VC 12, 14
+        # VTK 6.1 for VC 12, 14
-        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} INTERFACE_LINK_LIBRARIES)
+        get_target_property (TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${VTK_LIBRARY} INTERFACE_LINK_LIBRARIES)
-        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
+        if(TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES)
-          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+          string (REGEX MATCH "[^;]*d3d[0-9]+[.]lib" HARDCODED_D3D9_LIB "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-          if (HARDCODED_D3D9_LIB)
+          if (HARDCODED_D3D9_LIB)
-            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
+            message (STATUS "Warning: ${HARDCODED_D3D9_LIB} has been removed from imported dependencies of ${VTK_LIBRARY}")
-
+
-            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
+            list (REMOVE_ITEM TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES ${HARDCODED_D3D9_LIB})
-            set_target_properties (${VTK_LIBRARY} PROPERTIES INTERFACE_LINK_LIBRARIES "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
+            set_target_properties (${VTK_LIBRARY} PROPERTIES INTERFACE_LINK_LIBRARIES "${TARGET_PROPERTY_IMP_LINK_INTERFACE_LIBRARIES}")
-          endif()
+          endif()
-        endif()
+        endif()
-
+
-        get_target_property (TARGET_PROPERTY_IMP_PATH ${VTK_LIBRARY} IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
+        get_target_property (TARGET_PROPERTY_IMP_PATH ${VTK_LIBRARY} IMPORTED_IMPLIB_${CHOSEN_IMPORT_CONF})
-        if(TARGET_PROPERTY_IMP_PATH AND EXISTS "${TARGET_PROPERTY_IMP_PATH}")
+        if(TARGET_PROPERTY_IMP_PATH AND EXISTS "${TARGET_PROPERTY_IMP_PATH}")
-          get_filename_component (TARGET_PROPERTY_IMP_DIR "${TARGET_PROPERTY_IMP_PATH}" PATH)
+          get_filename_component (TARGET_PROPERTY_IMP_DIR "${TARGET_PROPERTY_IMP_PATH}" PATH)
-          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_IMP_DIR}")
+          list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_IMP_DIR}")
-        endif()
+        endif()
-
+
-        get_target_property (TARGET_PROPERTY_LOCATION_PATH ${VTK_LIBRARY} IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
+        get_target_property (TARGET_PROPERTY_LOCATION_PATH ${VTK_LIBRARY} IMPORTED_LOCATION_${CHOSEN_IMPORT_CONF})
-        if(TARGET_PROPERTY_LOCATION_PATH AND EXISTS "${TARGET_PROPERTY_LOCATION_PATH}")
+        if(TARGET_PROPERTY_LOCATION_PATH AND EXISTS "${TARGET_PROPERTY_LOCATION_PATH}")
-          get_filename_component (TARGET_PROPERTY_LOCATION_DIR "${TARGET_PROPERTY_LOCATION_PATH}" PATH)
+          get_filename_component (TARGET_PROPERTY_LOCATION_DIR "${TARGET_PROPERTY_LOCATION_PATH}" PATH)
-
+
-          if (WIN32)
+          if (WIN32)
-            list (APPEND 3RDPARTY_VTK_DLL_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
+            list (APPEND 3RDPARTY_VTK_DLL_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
-          else()
+          else()
-            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
+            list (APPEND 3RDPARTY_VTK_LIBRARY_DIRS "${TARGET_PROPERTY_LOCATION_DIR}")
-          endif()
+          endif()
-        endif()
+        endif()
-      endif()
+      endif()
-    endforeach()
+    endforeach()
-  endif()
+  endif()
-
+
-  if (3RDPARTY_VTK_INCLUDE_DIRS)
+  if (3RDPARTY_VTK_INCLUDE_DIRS)
-    list (REMOVE_DUPLICATES 3RDPARTY_VTK_INCLUDE_DIRS)
+    list (REMOVE_DUPLICATES 3RDPARTY_VTK_INCLUDE_DIRS)
-    list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIRS})
+    list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIRS})
-
+
-    list (GET 3RDPARTY_VTK_INCLUDE_DIRS 0 3RDPARTY_VTK_INCLUDE_DIR)
+    list (GET 3RDPARTY_VTK_INCLUDE_DIRS 0 3RDPARTY_VTK_INCLUDE_DIR)
-    set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
+    set (3RDPARTY_VTK_INCLUDE_DIR "${3RDPARTY_VTK_INCLUDE_DIR}" CACHE PATH "The directory containing headers of VTK" FORCE)
-  endif()
+  endif()
-
+
-#  if (BUILD_SHARED_LIBS)
+#  if (BUILD_SHARED_LIBS)
-    if (3RDPARTY_VTK_LIBRARY_DIRS)
+    if (3RDPARTY_VTK_LIBRARY_DIRS)
-      list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
+      list (REMOVE_DUPLICATES 3RDPARTY_VTK_LIBRARY_DIRS)
-      list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})
+      list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIRS})
-
+
-      list (GET 3RDPARTY_VTK_LIBRARY_DIRS 0 3RDPARTY_VTK_LIBRARY_DIR)
+      list (GET 3RDPARTY_VTK_LIBRARY_DIRS 0 3RDPARTY_VTK_LIBRARY_DIR)
-      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_LIBRARY_DIR}" CACHE PATH "The directory containing VTK libraries" FORCE)
+      set (3RDPARTY_VTK_LIBRARY_DIR "${3RDPARTY_VTK_LIBRARY_DIR}" CACHE PATH "The directory containing VTK libraries" FORCE)
-    endif()
+    endif()
-
+
-    if (WIN32)
+    if (WIN32)
-      if (3RDPARTY_VTK_DLL_DIRS)
+      if (3RDPARTY_VTK_DLL_DIRS)
-        list (REMOVE_DUPLICATES 3RDPARTY_VTK_DLL_DIRS)
+        list (REMOVE_DUPLICATES 3RDPARTY_VTK_DLL_DIRS)
-        list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIRS})
+        list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIRS})
-
+
-        list (GET 3RDPARTY_VTK_DLL_DIRS 0 3RDPARTY_VTK_DLL_DIR)
+        list (GET 3RDPARTY_VTK_DLL_DIRS 0 3RDPARTY_VTK_DLL_DIR)
-        set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
+        set (3RDPARTY_VTK_DLL_DIR "${3RDPARTY_VTK_DLL_DIR}" CACHE PATH "The directory containing VTK shared libraries" FORCE)
-      endif()
+      endif()
-    endif()
+    endif()
-#  endif()
+#  endif()
-endif()
+endif()
-
+
-if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
+if (3RDPARTY_VTK_INCLUDE_DIR AND EXISTS "${3RDPARTY_VTK_INCLUDE_DIR}")
-  list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIR})
+  list (APPEND 3RDPARTY_INCLUDE_DIRS ${3RDPARTY_VTK_INCLUDE_DIR})
-else()
+else()
-  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_INCLUDE_DIR)
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_VTK_INCLUDE_DIR)
-endif()
+endif()
-
+
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
-  if (3RDPARTY_VTK_LIBRARY_DIR AND EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
+  if (3RDPARTY_VTK_LIBRARY_DIR AND EXISTS "${3RDPARTY_VTK_LIBRARY_DIR}")
-    list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIR})
+    list (APPEND 3RDPARTY_LIBRARY_DIRS ${3RDPARTY_VTK_LIBRARY_DIR})
-  else()
+  else()
-    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_VTK_LIBRARY_DIR)
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_VTK_LIBRARY_DIR)
-  endif()
+  endif()
-
+
-  if (WIN32)
+  if (WIN32)
-    if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
+    if (3RDPARTY_VTK_DLL_DIR OR EXISTS "${3RDPARTY_VTK_DLL_DIR}")
-      list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIR})
+      list (APPEND 3RDPARTY_DLL_DIRS ${3RDPARTY_VTK_DLL_DIR})
-    else()
+    else()
-      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_VTK_DLL_DIR)
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_VTK_DLL_DIR)
-    endif()
+    endif()
-  endif()
+  endif()
-endif()
+endif()
-
+
-# Install vtk library using vtk targets
+# Install vtk library using vtk targets
-macro (OCCT_INSTALL_VTK VTK_LIBRARY_NAME)
+macro (OCCT_INSTALL_VTK VTK_LIBRARY_NAME)
-  # Check that input library name contains "vtk" prefix
+  # Check that input library name contains "vtk" prefix
-  string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY_NAME})
+  string (REGEX MATCH "^vtk" IS_VTK_LIBRARY ${VTK_LIBRARY_NAME})
-  # Check that input library was not already installed
+  # Check that input library was not already installed
-  list (FIND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME} VTK_LIBRARY_IS_USED)
+  list (FIND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME} VTK_LIBRARY_IS_USED)
-  if (BUILD_SHARED_LIBS AND INSTALL_VTK AND TARGET ${VTK_LIBRARY_NAME} AND VTK_LIBRARY_IS_USED EQUAL -1 AND IS_VTK_LIBRARY)
+  if (BUILD_SHARED_LIBS AND INSTALL_VTK AND TARGET ${VTK_LIBRARY_NAME} AND VTK_LIBRARY_IS_USED EQUAL -1 AND IS_VTK_LIBRARY)
-    OCCT_MAKE_OS_WITH_BITNESS()
+    OCCT_MAKE_OS_WITH_BITNESS()
-
+
-    # Get configuration of vtk
+    # Get configuration of vtk
-    get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY_NAME} IMPORTED_CONFIGURATIONS)
+    get_target_property (TARGET_VTK_IMPORT_CONFS ${VTK_LIBRARY_NAME} IMPORTED_CONFIGURATIONS)
-    list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
+    list (GET TARGET_VTK_IMPORT_CONFS 0 CHOSEN_IMPORT_CONF)
-
+
-    # Get dependencies for current input library
+    # Get dependencies for current input library
-    get_property(VTK_LIBRARY_PATH       TARGET ${VTK_LIBRARY_NAME} PROPERTY LOCATION)
+    get_property(VTK_LIBRARY_PATH       TARGET ${VTK_LIBRARY_NAME} PROPERTY LOCATION)
-    get_property(VTK_DEPEND             TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES_${CHOSEN_IMPORT_CONF})
+    get_property(VTK_DEPEND             TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES_${CHOSEN_IMPORT_CONF})
-    get_property(VTK_IMPORTED_INTERFACE TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
+    get_property(VTK_IMPORTED_INTERFACE TARGET ${VTK_LIBRARY_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES_${CHOSEN_IMPORT_CONF})
-    get_property(VTK_INTERFACE          TARGET ${VTK_LIBRARY_NAME} PROPERTY INTERFACE_LINK_LIBRARIES)
+    get_property(VTK_INTERFACE          TARGET ${VTK_LIBRARY_NAME} PROPERTY INTERFACE_LINK_LIBRARIES)
-    list (APPEND VTK_DEPEND ${VTK_INTERFACE} ${VTK_IMPORTED_INTERFACE})
+    list (APPEND VTK_DEPEND ${VTK_INTERFACE} ${VTK_IMPORTED_INTERFACE})
-
+
-    # Install
+    # Install
-    if (WIN32)
+    if (WIN32)
-      if (SINGLE_GENERATOR)
+      if (SINGLE_GENERATOR)
-        install (FILES "${VTK_LIBRARY_PATH}" DESTINATION "${INSTALL_DIR_BIN}")
+        install (FILES "${VTK_LIBRARY_PATH}" DESTINATION "${INSTALL_DIR_BIN}")
-      else()
+      else()
-        install (FILES "${VTK_LIBRARY_PATH}"
+        install (FILES "${VTK_LIBRARY_PATH}"
-                 CONFIGURATIONS Release
+                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR_BIN}")
+                 DESTINATION "${INSTALL_DIR_BIN}")
-        install (FILES "${VTK_LIBRARY_PATH}"
+        install (FILES "${VTK_LIBRARY_PATH}"
-                 CONFIGURATIONS RelWithDebInfo
+                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR_BIN}i")
+                 DESTINATION "${INSTALL_DIR_BIN}i")
-        install (FILES "${VTK_LIBRARY_PATH}"
+        install (FILES "${VTK_LIBRARY_PATH}"
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR_BIN}d")
+                 DESTINATION "${INSTALL_DIR_BIN}d")
-      endif()
+      endif()
-    else()
+    else()
-      get_filename_component(3RDPARTY_VTK_LIBRARY_ABS ${VTK_LIBRARY_PATH} REALPATH)
+      get_filename_component(3RDPARTY_VTK_LIBRARY_ABS ${VTK_LIBRARY_PATH} REALPATH)
-
+
-      if (SINGLE_GENERATOR)
+      if (SINGLE_GENERATOR)
-        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
-                 DESTINATION "${INSTALL_DIR_LIB}")
+                 DESTINATION "${INSTALL_DIR_LIB}")
-      else()
+      else()
-        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
-                 CONFIGURATIONS Release
+                 CONFIGURATIONS Release
-                 DESTINATION "${INSTALL_DIR_LIB}")
+                 DESTINATION "${INSTALL_DIR_LIB}")
-        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
-                 CONFIGURATIONS RelWithDebInfo
+                 CONFIGURATIONS RelWithDebInfo
-                 DESTINATION "${INSTALL_DIR_LIB}i")
+                 DESTINATION "${INSTALL_DIR_LIB}i")
-        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
+        install (FILES "${3RDPARTY_VTK_LIBRARY_ABS}"
-                 CONFIGURATIONS Debug
+                 CONFIGURATIONS Debug
-                 DESTINATION "${INSTALL_DIR_LIB}d")
+                 DESTINATION "${INSTALL_DIR_LIB}d")
-      endif()
+      endif()
-    endif()
+    endif()
-
+
-    set (USED_3RDPARTY_VTK_DIR "")
+    set (USED_3RDPARTY_VTK_DIR "")
-
+
-    # Mark current library as already installed
+    # Mark current library as already installed
-    list (APPEND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME})
+    list (APPEND OCCT_VTK_USED_TARGETS ${VTK_LIBRARY_NAME})
-    set (OCCT_VTK_USED_TARGETS "${OCCT_VTK_USED_TARGETS}" CACHE INTERNAL "" FORCE)
+    set (OCCT_VTK_USED_TARGETS "${OCCT_VTK_USED_TARGETS}" CACHE INTERNAL "" FORCE)
-
+
-    # Recursively install all depended libraries
+    # Recursively install all depended libraries
-    foreach(VTK_TARGET ${VTK_DEPEND})
+    foreach(VTK_TARGET ${VTK_DEPEND})
-      OCCT_INSTALL_VTK(${VTK_TARGET})
+      OCCT_INSTALL_VTK(${VTK_TARGET})
-    endforeach()
+    endforeach()
-  endif()
+  endif()
-endmacro()
+endmacro()
-
+
-if (NOT BUILD_SHARED_LIBS)
+if (NOT BUILD_SHARED_LIBS)
-  OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_DLL_DIR)
+  OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_DLL_DIR)
-  OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_LIBRARY_DIR)
+  OCCT_CHECK_AND_UNSET(3RDPARTY_VTK_LIBRARY_DIR)
-  OCCT_CHECK_AND_UNSET(INSTALL_VTK)
+  OCCT_CHECK_AND_UNSET(INSTALL_VTK)
-endif()
+endif()
-
+
-# the library directory for using by the executable
+# the library directory for using by the executable
-if (NOT INSTALL_VTK)
+if (NOT INSTALL_VTK)
-  if (WIN32)
+  if (WIN32)
-    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_DLL_DIR})
+    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_DLL_DIR})
-  else()
+  else()
-    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
+    set (USED_3RDPARTY_VTK_DIR ${3RDPARTY_VTK_LIBRARY_DIR})
-  endif()
+  endif()
-endif()
+endif()
-
+
-OCCT_CHECK_AND_UNSET (VTK_INCLUDE_DIRS)
+OCCT_CHECK_AND_UNSET (VTK_INCLUDE_DIRS)
-OCCT_CHECK_AND_UNSET (VTK_LIBRARY_DIRS)
+OCCT_CHECK_AND_UNSET (VTK_LIBRARY_DIRS)
-OCCT_CHECK_AND_UNSET (VTK_DIR)
+OCCT_CHECK_AND_UNSET (VTK_DIR)

adm/qmake/OccCppConfig.pri

@@ -1,165 +1,165 @@
-# This is project defines C++ compilation rules for building an OCCT Toolkit.
+# This is project defines C++ compilation rules for building an OCCT Toolkit.
-
+
-exists(custom.auto.pri) { include(custom.auto.pri) }
+exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
+exists(custom.pri)      { include(custom.pri) }
-
+
-# Disable some dummy Qt defaults
+# Disable some dummy Qt defaults
-QT -= core gui
+QT -= core gui
-CONFIG -= qt app_bundle
+CONFIG -= qt app_bundle
-CONFIG -= qml_debug
+CONFIG -= qml_debug
-CONFIG -= debug_and_release
+CONFIG -= debug_and_release
-
+
-OccGitRoot = $$_PRO_FILE_PWD_/../../../..
+OccGitRoot = $$_PRO_FILE_PWD_/../../../..
-
+
-# Define compilation flags
+# Define compilation flags
-CONFIG += warn_on
+CONFIG += warn_on
-QMAKE_CFLAGS_WARN_ON   = -Wall -Wextra
+QMAKE_CFLAGS_WARN_ON   = -Wall -Wextra
-QMAKE_CXXFLAGS_WARN_ON = -Wall -Wextra
+QMAKE_CXXFLAGS_WARN_ON = -Wall -Wextra
-win32 {
+win32 {
-  QMAKE_CFLAGS_WARN_ON   = -W4
+  QMAKE_CFLAGS_WARN_ON   = -W4
-  QMAKE_CXXFLAGS_WARN_ON = -W4
+  QMAKE_CXXFLAGS_WARN_ON = -W4
-  QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHa
+  QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHa
-  QMAKE_CXXFLAGS_STL_ON = /EHa
+  QMAKE_CXXFLAGS_STL_ON = /EHa
-
+
-  QMAKE_CXXFLAGS += -fp:precise
+  QMAKE_CXXFLAGS += -fp:precise
-  #QMAKE_CXXFLAGS -= -Zc:throwingNew
+  #QMAKE_CXXFLAGS -= -Zc:throwingNew
-  #QMAKE_CXXFLAGS -= -Zc:rvalueCast
+  #QMAKE_CXXFLAGS -= -Zc:rvalueCast
-
+
-  QMAKE_LFLAGS += -INCREMENTAL:NO
+  QMAKE_LFLAGS += -INCREMENTAL:NO
-
+
-  CONFIG(debug, debug|release) {
+  CONFIG(debug, debug|release) {
-    QMAKE_CXXFLAGS += -Od
+    QMAKE_CXXFLAGS += -Od
-    QMAKE_CXXFLAGS += -Ob1
+    QMAKE_CXXFLAGS += -Ob1
-  }
+  }
-
+
-  DEFINES -= WIN32
+  DEFINES -= WIN32
-  DEFINES -= WIN64
+  DEFINES -= WIN64
-  DEFINES += _CRT_SECURE_NO_WARNINGS
+  DEFINES += _CRT_SECURE_NO_WARNINGS
-  DEFINES += _CRT_NONSTDC_NO_DEPRECATE
+  DEFINES += _CRT_NONSTDC_NO_DEPRECATE
-  DEFINES += _SCL_SECURE_NO_WARNINGS
+  DEFINES += _SCL_SECURE_NO_WARNINGS
-} else {
+} else {
-  CONFIG += c++11
+  CONFIG += c++11
-  clang {
+  clang {
-    QMAKE_CFLAGS_WARN_ON   += -Wshorten-64-to-32
+    QMAKE_CFLAGS_WARN_ON   += -Wshorten-64-to-32
-    QMAKE_CXXFLAGS_WARN_ON += -Wshorten-64-to-32
+    QMAKE_CXXFLAGS_WARN_ON += -Wshorten-64-to-32
-  }
+  }
-  QMAKE_CFLAGS   += -fexceptions
+  QMAKE_CFLAGS   += -fexceptions
-  QMAKE_CXXFLAGS += -fexceptions
+  QMAKE_CXXFLAGS += -fexceptions
-  QMAKE_CXXFLAGS += -fvisibility=default
+  QMAKE_CXXFLAGS += -fvisibility=default
-  DEFINES += OCC_CONVERT_SIGNALS
+  DEFINES += OCC_CONVERT_SIGNALS
-  mac {
+  mac {
-    iphoneos {
+    iphoneos {
-      QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
+      QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
-    } else {
+    } else {
-      QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
+      QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
-    }
+    }
-  } else:gcc {
+  } else:gcc {
-    # ask linker to report missing library dependencies
+    # ask linker to report missing library dependencies
-    QMAKE_LFLAGS += -Wl,-z,defs
+    QMAKE_LFLAGS += -Wl,-z,defs
-  }
+  }
-}
+}
-!CONFIG(debug, debug|release) {
+!CONFIG(debug, debug|release) {
-  # disable exceptions in Release builds
+  # disable exceptions in Release builds
-  DEFINES += No_Exception
+  DEFINES += No_Exception
-  HAVE_RelWithDebInfo {
+  HAVE_RelWithDebInfo {
-    win32 {
+    win32 {
-      CONFIG += force_debug_info
+      CONFIG += force_debug_info
-    }
+    }
-  }
+  }
-}
+}
-
+
-# Define output folder depending on compiler name
+# Define output folder depending on compiler name
-MY_BITNESS = 32
+MY_BITNESS = 32
-
+
-equals(QMAKE_TARGET.arch, x86_64) | equals(QMAKE_HOST.arch, x86_64) { MY_BITNESS = 64 }
+equals(QMAKE_TARGET.arch, x86_64) | equals(QMAKE_HOST.arch, x86_64) { MY_BITNESS = 64 }
-equals(ANDROID_TARGET_ARCH, arm64-v8a) { MY_BITNESS = 64 }
+equals(ANDROID_TARGET_ARCH, arm64-v8a) { MY_BITNESS = 64 }
-has64Target = $$find(QMAKE_TARGET.arch, "x64")
+has64Target = $$find(QMAKE_TARGET.arch, "x64")
-count(has64Target, 1) { MY_BITNESS = 64 }
+count(has64Target, 1) { MY_BITNESS = 64 }
-
+
-MY_PLATFORM = platform
+MY_PLATFORM = platform
-CONFIG(iphonesimulator, iphoneos|iphonesimulator) { MY_PLATFORM = iphonesimulator
+CONFIG(iphonesimulator, iphoneos|iphonesimulator) { MY_PLATFORM = iphonesimulator
-} else:CONFIG(iphoneos, iphoneos|iphonesimulator) { MY_PLATFORM = iphoneos
+} else:CONFIG(iphoneos, iphoneos|iphonesimulator) { MY_PLATFORM = iphoneos
-} else:android { MY_PLATFORM = android-$$ANDROID_TARGET_ARCH
+} else:android { MY_PLATFORM = android-$$ANDROID_TARGET_ARCH
-} else:win32   { MY_PLATFORM = win$$MY_BITNESS
+} else:win32   { MY_PLATFORM = win$$MY_BITNESS
-} else:mac     { MY_PLATFORM = mac
+} else:mac     { MY_PLATFORM = mac
-} else:linux   { MY_PLATFORM = lin
+} else:linux   { MY_PLATFORM = lin
-} else:unix    { MY_PLATFORM = unix
+} else:unix    { MY_PLATFORM = unix
-} else { warning (Unknown platform. "$$MY_PLATFORM" is used) }
+} else { warning (Unknown platform. "$$MY_PLATFORM" is used) }
-
+
-MY_COMPILER = compiler
+MY_COMPILER = compiler
-MY_VC_VER = 0
+MY_VC_VER = 0
-android-g++ {
+android-g++ {
-  MY_COMPILER = gcc
+  MY_COMPILER = gcc
-} else:clang {
+} else:clang {
-  MY_COMPILER = clang
+  MY_COMPILER = clang
-} else:gcc {
+} else:gcc {
-  MY_COMPILER = gcc
+  MY_COMPILER = gcc
-} else:win32-msvc2010 {
+} else:win32-msvc2010 {
-  MY_COMPILER = vc10
+  MY_COMPILER = vc10
-  MY_VC_VER = 10
+  MY_VC_VER = 10
-} else:win32-msvc2012 {
+} else:win32-msvc2012 {
-  MY_COMPILER = vc11
+  MY_COMPILER = vc11
-  MY_VC_VER = 11
+  MY_VC_VER = 11
-} else:win32-msvc2013 {
+} else:win32-msvc2013 {
-  MY_COMPILER = vc12
+  MY_COMPILER = vc12
-  MY_VC_VER = 12
+  MY_VC_VER = 12
-} else:win32-msvc2015 {
+} else:win32-msvc2015 {
-  MY_COMPILER = vc14
+  MY_COMPILER = vc14
-  MY_VC_VER = 14
+  MY_VC_VER = 14
-} else:win32-msvc2017 {
+} else:win32-msvc2017 {
-  MY_COMPILER = vc14
+  MY_COMPILER = vc14
-  MY_VC_VER = 14
+  MY_VC_VER = 14
-} else:win32-msvc {
+} else:win32-msvc {
-  MY_COMPILER = vc14
+  MY_COMPILER = vc14
-  MY_VC_VER = 14
+  MY_VC_VER = 14
-  aMsvcVer = $$(VisualStudioVersion)
+  aMsvcVer = $$(VisualStudioVersion)
-  equals(aMsvcVer, 14.0){
+  equals(aMsvcVer, 14.0){
-    # VS2015, vc140
+    # VS2015, vc140
-  } else:equals(aMsvcVer, 15.0){
+  } else:equals(aMsvcVer, 15.0){
-    # VS2015, vc141
+    # VS2015, vc141
-  } else:equals(aMsvcVer, 16.0){
+  } else:equals(aMsvcVer, 16.0){
-    # VS2019, vc142
+    # VS2019, vc142
-  } else:equals(aMsvcVer, 17.0){
+  } else:equals(aMsvcVer, 17.0){
-    # VS2022, vc143
+    # VS2022, vc143
-  } else {
+  } else {
-    warning (Unknown msvc version. "$$MY_COMPILER" is used)
+    warning (Unknown msvc version. "$$MY_COMPILER" is used)
-  }
+  }
-} else {
+} else {
-  warning (Unknown compiler. "$$MY_COMPILER" is used)
+  warning (Unknown compiler. "$$MY_COMPILER" is used)
-}
+}
-MY_PLATFORM_AND_COMPILER = $$MY_PLATFORM/$$MY_COMPILER
+MY_PLATFORM_AND_COMPILER = $$MY_PLATFORM/$$MY_COMPILER
-#warning (The platform is "$$MY_PLATFORM"; bitness is "$$MY_BITNESS"; compiler is "$$MY_COMPILER")
+#warning (The platform is "$$MY_PLATFORM"; bitness is "$$MY_BITNESS"; compiler is "$$MY_COMPILER")
-
+
-CONFIG(debug, debug|release) { MY_BUILDTYPE = d }
+CONFIG(debug, debug|release) { MY_BUILDTYPE = d }
-
+
-DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/lib$${MY_BUILDTYPE}
+DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/lib$${MY_BUILDTYPE}
-win32 {
+win32 {
-  DESTDIR  = $$OccGitRoot/win$${MY_BITNESS}/vc$${MY_VC_VER}/bin$${MY_BUILDTYPE}
+  DESTDIR  = $$OccGitRoot/win$${MY_BITNESS}/vc$${MY_VC_VER}/bin$${MY_BUILDTYPE}
-  aLibDest = $$DESTDIR/../lib$${MY_BUILDTYPE}
+  aLibDest = $$DESTDIR/../lib$${MY_BUILDTYPE}
-  #DLLDESTDIR = $$DESTDIR/../bin$${MY_BUILDTYPE}
+  #DLLDESTDIR = $$DESTDIR/../bin$${MY_BUILDTYPE}
-
+
-  # dummy target creating lib/libd folder
+  # dummy target creating lib/libd folder
-  occtkgen_libfolder.input  = $$_PRO_FILE_PWD_/../../OcctDummy.in
+  occtkgen_libfolder.input  = $$_PRO_FILE_PWD_/../../OcctDummy.in
-  occtkgen_libfolder.output = $$aLibDest/dummy.tmp
+  occtkgen_libfolder.output = $$aLibDest/dummy.tmp
-  occtkgen_libfolder.config = verbatim
+  occtkgen_libfolder.config = verbatim
-  QMAKE_SUBSTITUTES += occtkgen_libfolder
+  QMAKE_SUBSTITUTES += occtkgen_libfolder
-
+
-  LIBS += -L$$aLibDest
+  LIBS += -L$$aLibDest
-  equals(TEMPLATE, lib) {
+  equals(TEMPLATE, lib) {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.dll
+    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.dll
-    QMAKE_CLEAN += $$aLibDest/$${TARGET}.lib
+    QMAKE_CLEAN += $$aLibDest/$${TARGET}.lib
-    QMAKE_CLEAN += $$aLibDest/$${TARGET}.exp
+    QMAKE_CLEAN += $$aLibDest/$${TARGET}.exp
-  } else {
+  } else {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.exe
+    QMAKE_CLEAN += $$DESTDIR/$${TARGET}.exe
-  }
+  }
-  QMAKE_CLEAN += $$DESTDIR/$${TARGET}.pdb
+  QMAKE_CLEAN += $$DESTDIR/$${TARGET}.pdb
-  QMAKE_LFLAGS += -PDB:"$$DESTDIR/$${TARGET}.pdb"
+  QMAKE_LFLAGS += -PDB:"$$DESTDIR/$${TARGET}.pdb"
-  QMAKE_LFLAGS += -IMPLIB:"$$aLibDest/$${TARGET}.lib"
+  QMAKE_LFLAGS += -IMPLIB:"$$aLibDest/$${TARGET}.lib"
-} else {
+} else {
-  LIBS += -L$$DESTDIR
+  LIBS += -L$$DESTDIR
-  equals(TEMPLATE, app) {
+  equals(TEMPLATE, app) {
-    DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/bin$${MY_BUILDTYPE}
+    DESTDIR = $$OccGitRoot/$${MY_PLATFORM_AND_COMPILER}/bin$${MY_BUILDTYPE}
-  }
+  }
-}
+}
-
+
-OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}
+OBJECTS_DIR = $$DESTDIR/../obj$${MY_BUILDTYPE}/$${TARGET}

adm/qmake/OccModule.pri

@@ -1,42 +1,42 @@
-# This is a project template file defining an OCCT Module.
+# This is a project template file defining an OCCT Module.
-# This project should be included with predefined OCC_MODULE_NAME variable.
+# This project should be included with predefined OCC_MODULE_NAME variable.
-TEMPLATE = subdirs
+TEMPLATE = subdirs
-exists(custom.auto.pri) { include(custom.auto.pri) }
+exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
+exists(custom.pri)      { include(custom.pri) }
-
+
-# Iterate over Toolkits within current Module and generate sub-project per Toolkit
+# Iterate over Toolkits within current Module and generate sub-project per Toolkit
-aModuleList = $$cat(../MODULES, lines)
+aModuleList = $$cat(../MODULES, lines)
-for (aModuleIter, aModuleList) {
+for (aModuleIter, aModuleList) {
-  #aTkList = $$list($$aModuleIter) - this doesn't work, qmake bug?
+  #aTkList = $$list($$aModuleIter) - this doesn't work, qmake bug?
-  aModule = $$first($$list($$aModuleIter))
+  aModule = $$first($$list($$aModuleIter))
-  equals (aModule, $$OCC_MODULE_NAME) {
+  equals (aModule, $$OCC_MODULE_NAME) {
-    for (aToolKit, $$list($$aModuleIter)) {
+    for (aToolKit, $$list($$aModuleIter)) {
-      toSkipToolkit = 0
+      toSkipToolkit = 0
-      equals (aToolKit, $$OCC_MODULE_NAME)      { toSkipToolkit = 1 }
+      equals (aToolKit, $$OCC_MODULE_NAME)      { toSkipToolkit = 1 }
-      !HAVE_VTK:equals (aToolKit, "TKIVtk")     { toSkipToolkit = 1 }
+      !HAVE_VTK:equals (aToolKit, "TKIVtk")     { toSkipToolkit = 1 }
-      !HAVE_VTK:equals (aToolKit, "TKIVtkDraw") { toSkipToolkit = 1 }
+      !HAVE_VTK:equals (aToolKit, "TKIVtkDraw") { toSkipToolkit = 1 }
-      #!HAVE_OPENGL: equals (aToolKit, "TKOpenGl")       { toSkipToolkit = 1 }
+      #!HAVE_OPENGL: equals (aToolKit, "TKOpenGl")       { toSkipToolkit = 1 }
-      #!HAVE_OPENGL: equals (aToolKit, "TKOpenGlTest")   { toSkipToolkit = 1 }
+      #!HAVE_OPENGL: equals (aToolKit, "TKOpenGlTest")   { toSkipToolkit = 1 }
-      !HAVE_GLES2:   equals (aToolKit, "TKOpenGles")     { toSkipToolkit = 1 }
+      !HAVE_GLES2:   equals (aToolKit, "TKOpenGles")     { toSkipToolkit = 1 }
-      !HAVE_GLES2:   equals (aToolKit, "TKOpenGlesTest") { toSkipToolkit = 1 }
+      !HAVE_GLES2:   equals (aToolKit, "TKOpenGlesTest") { toSkipToolkit = 1 }
-      !win32:   equals (aToolKit, "TKD3DHost")  { toSkipToolkit = 1 }
+      !win32:   equals (aToolKit, "TKD3DHost")  { toSkipToolkit = 1 }
-      !win32:   equals (aToolKit, "TKD3DHostTest") { toSkipToolkit = 1 }
+      !win32:   equals (aToolKit, "TKD3DHostTest") { toSkipToolkit = 1 }
-      equals (toSkipToolkit, 0) {
+      equals (toSkipToolkit, 0) {
-
+
-        #warning(aToolKit($$OCC_MODULE_NAME)=$$aToolKit)
+        #warning(aToolKit($$OCC_MODULE_NAME)=$$aToolKit)
-        eval(occtkgen_$${aToolKit}.input  = $$_PRO_FILE_PWD_/../OccToolkit.pro.in)
+        eval(occtkgen_$${aToolKit}.input  = $$_PRO_FILE_PWD_/../OccToolkit.pro.in)
-        eval(occtkgen_$${aToolKit}.output = $$_PRO_FILE_PWD_/$${aToolKit}/$${aToolKit}.pro)
+        eval(occtkgen_$${aToolKit}.output = $$_PRO_FILE_PWD_/$${aToolKit}/$${aToolKit}.pro)
-        eval(occtkgen_$${aToolKit}.config = verbatim)
+        eval(occtkgen_$${aToolKit}.config = verbatim)
-        eval(QMAKE_SUBSTITUTES += occtkgen_$${aToolKit})
+        eval(QMAKE_SUBSTITUTES += occtkgen_$${aToolKit})
-        SUBDIRS += $${aToolKit}
+        SUBDIRS += $${aToolKit}
-
+
-        aModExtList = $$cat(../../src/$${aToolKit}/EXTERNLIB, lines)
+        aModExtList = $$cat(../../src/$${aToolKit}/EXTERNLIB, lines)
-        aTkDepends = $${aToolKit}.depends
+        aTkDepends = $${aToolKit}.depends
-        for (aModExtIter, aModExtList) {
+        for (aModExtIter, aModExtList) {
-          contains ($$list($$aModuleIter), $$aModExtIter) { eval ($${aTkDepends} += $$aModExtIter) }
+          contains ($$list($$aModuleIter), $$aModExtIter) { eval ($${aTkDepends} += $$aModExtIter) }
-        }
+        }
-        #warning($$aToolKit depends on: $$reverse($${aTkDepends}))
+        #warning($$aToolKit depends on: $$reverse($${aTkDepends}))
-      }
+      }
-    }
+    }
-  }
+  }
-}
+}

adm/qmake/OccModule.pro.in

@@ -1,2 +1,2 @@
-OCC_MODULE_NAME = \$\$TARGET
+OCC_MODULE_NAME = \$\$TARGET
-include(../OccModule.pri)
+include(../OccModule.pri)

adm/qmake/OccToolkit.pri

@@ -1,166 +1,166 @@
-# This is a project template file defining an OCCT Toolkit.
+# This is a project template file defining an OCCT Toolkit.
-# This project should be included with predefined OCC_TOOLKIT_NAME variable.
+# This project should be included with predefined OCC_TOOLKIT_NAME variable.
-
+
-TEMPLATE = lib
+TEMPLATE = lib
-!exists(../../src/$$OCC_TOOLKIT_NAME/PACKAGES) {
+!exists(../../src/$$OCC_TOOLKIT_NAME/PACKAGES) {
-  TEMPLATE = app
+  TEMPLATE = app
-  CONFIG += console
+  CONFIG += console
-}
+}
-win32 {
+win32 {
-  # do not append version to DLL name
+  # do not append version to DLL name
-  CONFIG += skip_target_version_ext
+  CONFIG += skip_target_version_ext
-}
+}
-
+
-include(OccCppConfig.pri)
+include(OccCppConfig.pri)
-
+
-aSrcRoot = $$OccGitRoot/src
+aSrcRoot = $$OccGitRoot/src
-aHxxRoot = $$OccGitRoot/inc
+aHxxRoot = $$OccGitRoot/inc
-INCLUDEPATH += $$aHxxRoot
+INCLUDEPATH += $$aHxxRoot
-
+
-# CSF variables
+# CSF variables
-HAVE_FREETYPE  { CSF_FREETYPE = -lfreetype }
+HAVE_FREETYPE  { CSF_FREETYPE = -lfreetype }
-CSF_TclLibs   = -ltcl8.6
+CSF_TclLibs   = -ltcl8.6
-CSF_TclTkLibs = -ltk8.6
+CSF_TclTkLibs = -ltk8.6
-HAVE_FREEIMAGE { CSF_FreeImagePlus = -lfreeimage } else:win32 { CSF_FreeImagePlus = -lwindowscodecs -lole32 }
+HAVE_FREEIMAGE { CSF_FreeImagePlus = -lfreeimage } else:win32 { CSF_FreeImagePlus = -lwindowscodecs -lole32 }
-HAVE_FFMPEG    { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil }
+HAVE_FFMPEG    { CSF_FFmpeg = -lavcodec -lavformat -lswscale -lavutil }
-HAVE_TBB       { CSF_TBB = -ltbb -ltbbmalloc }
+HAVE_TBB       { CSF_TBB = -ltbb -ltbbmalloc }
-HAVE_ZLIB      { CSF_ZLIB = -lzlib }
+HAVE_ZLIB      { CSF_ZLIB = -lzlib }
-HAVE_LIBLZMA   { CSF_LIBLZMA = -lliblzma }
+HAVE_LIBLZMA   { CSF_LIBLZMA = -lliblzma }
-HAVE_DRACO     { CSF_Draco = -ldraco }
+HAVE_DRACO     { CSF_Draco = -ldraco }
-win32 {
+win32 {
-  CSF_kernel32   = -lkernel32
+  CSF_kernel32   = -lkernel32
-  CSF_advapi32   = -ladvapi32
+  CSF_advapi32   = -ladvapi32
-  CSF_gdi32      = -lgdi32
+  CSF_gdi32      = -lgdi32
-  CSF_user32     = -luser32 -lcomdlg32
+  CSF_user32     = -luser32 -lcomdlg32
-  CSF_shell32    = -lShell32
+  CSF_shell32    = -lShell32
-  CSF_opengl32   = -lopengl32
+  CSF_opengl32   = -lopengl32
-  CSF_wsock32    = -lwsock32
+  CSF_wsock32    = -lwsock32
-  CSF_netapi32   = -lnetapi32
+  CSF_netapi32   = -lnetapi32
-  CSF_OpenGlLibs = -lopengl32
+  CSF_OpenGlLibs = -lopengl32
-  CSF_OpenGlesLibs = -llibEGL -llibGLESv2
+  CSF_OpenGlesLibs = -llibEGL -llibGLESv2
-  CSF_psapi      = -lPsapi
+  CSF_psapi      = -lPsapi
-  CSF_winmm      = -lwinmm
+  CSF_winmm      = -lwinmm
-  CSF_d3d9       = -ld3d9
+  CSF_d3d9       = -ld3d9
-  CSF_TclLibs    = -ltcl86
+  CSF_TclLibs    = -ltcl86
-  CSF_TclTkLibs  = -ltk86
+  CSF_TclTkLibs  = -ltk86
-  CSF_TBB =
+  CSF_TBB =
-} else:mac {
+} else:mac {
-  CSF_dl         = -ldl
+  CSF_dl         = -ldl
-  CSF_objc       = -lobjc
+  CSF_objc       = -lobjc
-  CSF_OpenGlLibs = -framework OpenGL
+  CSF_OpenGlLibs = -framework OpenGL
-  CSF_OpenGlesLibs = -framework OpenGLES
+  CSF_OpenGlesLibs = -framework OpenGLES
-  iphoneos {
+  iphoneos {
-    CSF_Appkit     = -framework UIKit
+    CSF_Appkit     = -framework UIKit
-  } else {
+  } else {
-    CSF_Appkit     = -framework AppKit
+    CSF_Appkit     = -framework AppKit
-  }
+  }
-  CSF_IOKit      = -framework IOKit
+  CSF_IOKit      = -framework IOKit
-  CSF_TclLibs    = -framework Tcl
+  CSF_TclLibs    = -framework Tcl
-  CSF_TclTkLibs  = -framework Tk
+  CSF_TclTkLibs  = -framework Tk
-} else {
+} else {
-  CSF_dl = -ldl
+  CSF_dl = -ldl
-  CSF_ThreadLibs = -lpthread -lrt
+  CSF_ThreadLibs = -lpthread -lrt
-  CSF_OpenGlesLibs = -lEGL -lGLESv2
+  CSF_OpenGlesLibs = -lEGL -lGLESv2
-  CSF_TclTkLibs  = -ltk8.6
+  CSF_TclTkLibs  = -ltk8.6
-  HAVE_XLIB {
+  HAVE_XLIB {
-    CSF_OpenGlLibs = -lGL
+    CSF_OpenGlLibs = -lGL
-    CSF_XwLibs     = -lX11
+    CSF_XwLibs     = -lX11
-  } else {
+  } else {
-    CSF_OpenGlLibs = -lGL -lEGL
+    CSF_OpenGlLibs = -lGL -lEGL
-  }
+  }
-  HAVE_FREETYPE  { CSF_fontconfig = -lfontconfig }
+  HAVE_FREETYPE  { CSF_fontconfig = -lfontconfig }
-}
+}
-
+
-for (aCfgIter, CONFIG) {
+for (aCfgIter, CONFIG) {
-  aRes = $$find(aCfgIter, "^HAVE_")
+  aRes = $$find(aCfgIter, "^HAVE_")
-  !equals(aCfgIter, "HAVE_GLES2") {
+  !equals(aCfgIter, "HAVE_GLES2") {
-    count(aRes, 1) {
+    count(aRes, 1) {
-      DEFINES += $$aCfgIter
+      DEFINES += $$aCfgIter
-    }
+    }
-  }
+  }
-}
+}
-
+
-# Define the list of standard OCCT file extensions
+# Define the list of standard OCCT file extensions
-aHxxRegex = ^.*\.(hxx|h|lxx|gxx)$
+aHxxRegex = ^.*\.(hxx|h|lxx|gxx)$
-aPxxRegex = ^.*\.(pxx)$
+aPxxRegex = ^.*\.(pxx)$
-aCxxRegex = ^.*\.(cxx|cpp|c)$
+aCxxRegex = ^.*\.(cxx|cpp|c)$
-mac { aCxxRegex = ^.*\.(cxx|cpp|c|m|mm)$ }
+mac { aCxxRegex = ^.*\.(cxx|cpp|c|m|mm)$ }
-
+
-# Auxiliary function for probing file extension
+# Auxiliary function for probing file extension
-defineTest (occCheckExtension) {
+defineTest (occCheckExtension) {
-  aProbe = $$find(1, "$$2")
+  aProbe = $$find(1, "$$2")
-  count(aProbe, 1) { return(true) } else { return(false) }
+  count(aProbe, 1) { return(true) } else { return(false) }
-}
+}
-
+
-# Auxiliary function for probing compilable files
+# Auxiliary function for probing compilable files
-defineTest (occIsCxxFile) { occCheckExtension ($$1, $$aCxxRegex) { return(true) } else { return(false) } }
+defineTest (occIsCxxFile) { occCheckExtension ($$1, $$aCxxRegex) { return(true) } else { return(false) } }
-
+
-# Auxiliary function for probing header files
+# Auxiliary function for probing header files
-defineTest (occIsHxxFile) { occCheckExtension ($$1, $$aHxxRegex) { return(true) } else { return(false) } }
+defineTest (occIsHxxFile) { occCheckExtension ($$1, $$aHxxRegex) { return(true) } else { return(false) } }
-
+
-aTkFiles     = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/FILES,     lines)
+aTkFiles     = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/FILES,     lines)
-aTkFiles += CMakeLists.txt
+aTkFiles += CMakeLists.txt
-aPackages    = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/PACKAGES,  lines)
+aPackages    = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/PACKAGES,  lines)
-anExternLibs = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/EXTERNLIB, lines)
+anExternLibs = $$cat($$aSrcRoot/$$OCC_TOOLKIT_NAME/EXTERNLIB, lines)
-
+
-for (aTkFileIter, aTkFiles) { OTHER_FILES += $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aTkFileIter }
+for (aTkFileIter, aTkFiles) { OTHER_FILES += $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aTkFileIter }
-for (anExternLib, anExternLibs) {
+for (anExternLib, anExternLibs) {
-  hasCsf = $$find(anExternLib, CSF_)
+  hasCsf = $$find(anExternLib, CSF_)
-  count(hasCsf, 1) {
+  count(hasCsf, 1) {
-    aList = $$split($$anExternLib, "\n")
+    aList = $$split($$anExternLib, "\n")
-    LIBS += $$aList
+    LIBS += $$aList
-    equals(anExternLib, "CSF_OpenGlLibs") {
+    equals(anExternLib, "CSF_OpenGlLibs") {
-      DEFINES += "HAVE_OPENGL"
+      DEFINES += "HAVE_OPENGL"
-    }
+    }
-    equals(anExternLib, "CSF_OpenGlesLibs") {
+    equals(anExternLib, "CSF_OpenGlesLibs") {
-      DEFINES += "HAVE_GLES2"
+      DEFINES += "HAVE_GLES2"
-    }
+    }
-  } else {
+  } else {
-    LIBS += -l$$anExternLib
+    LIBS += -l$$anExternLib
-  }
+  }
-}
+}
-
+
-# Iterate over Packages and add compilable files into this project
+# Iterate over Packages and add compilable files into this project
-isEmpty (aPackages) { aPackages = $$OCC_TOOLKIT_NAME }
+isEmpty (aPackages) { aPackages = $$OCC_TOOLKIT_NAME }
-for (aPackage, aPackages) {
+for (aPackage, aPackages) {
-  aPackageFolder = $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aPackage
+  aPackageFolder = $$aSrcRoot/$$OCC_TOOLKIT_NAME/$$aPackage
-  aPackageFiles = $$cat($$aSrcRoot/$$aPackage/FILES, lines)
+  aPackageFiles = $$cat($$aSrcRoot/$$aPackage/FILES, lines)
-  for (aFileIter, aPackageFiles) {
+  for (aFileIter, aPackageFiles) {
-    occIsCxxFile($$aFileIter) {
+    occIsCxxFile($$aFileIter) {
-      SOURCES += $$aSrcRoot/$$aPackage/$$aFileIter
+      SOURCES += $$aSrcRoot/$$aPackage/$$aFileIter
-    }
+    }
-  }
+  }
-}
+}
-
+
-!win32 {
+!win32 {
-  aVerList = $$split(VERSION, ".")
+  aVerList = $$split(VERSION, ".")
-  aVerMaj = $$member(aVerList, 0)
+  aVerMaj = $$member(aVerList, 0)
-  aVerMin = $$member(aVerList, 1)
+  aVerMin = $$member(aVerList, 1)
-  aVerMic = $$member(aVerList, 2)
+  aVerMic = $$member(aVerList, 2)
-
+
-  equals(TEMPLATE, app) {
+  equals(TEMPLATE, app) {
-    QMAKE_CLEAN += $$DESTDIR/$${TARGET}
+    QMAKE_CLEAN += $$DESTDIR/$${TARGET}
-  } else {
+  } else {
-    mac {
+    mac {
-      # override qmake soname versionong logic
+      # override qmake soname versionong logic
-      QMAKE_LFLAGS_SONAME =
+      QMAKE_LFLAGS_SONAME =
-      QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.dylib.$${aVerMaj}.$${aVerMin}
+      QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.dylib.$${aVerMaj}.$${aVerMin}
-
+
-      # extend clean with versioned .dylib files
+      # extend clean with versioned .dylib files
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.dylib
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.$${aVerMic}.dylib
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.$${aVerMaj}.$${aVerMin}.$${aVerMic}.dylib
-    } else {
+    } else {
-      # override qmake soname versionong logic
+      # override qmake soname versionong logic
-      QMAKE_LFLAGS_SONAME =
+      QMAKE_LFLAGS_SONAME =
-      QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
+      QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
-
+
-      # extend clean with versioned .so files
+      # extend clean with versioned .so files
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}
-      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}.$${aVerMic}
+      QMAKE_CLEAN += $$DESTDIR/lib$${TARGET}.so.$${aVerMaj}.$${aVerMin}.$${aVerMic}
-    }
+    }
-  }
+  }
-}
+}

adm/qmake/OccToolkit.pro.in

@@ -1,2 +1,2 @@
-OCC_TOOLKIT_NAME = \$\$TARGET
+OCC_TOOLKIT_NAME = \$\$TARGET
-include(../../OccToolkit.pri)
+include(../../OccToolkit.pri)

adm/qmake/Occt.pro

@@ -1,45 +1,45 @@
-# This is an experimental Solution project for building entire OCCT framework using qmake.
+# This is an experimental Solution project for building entire OCCT framework using qmake.
-# It can be also used for just source code navigation in Qt Creator without actually building OCCT.
+# It can be also used for just source code navigation in Qt Creator without actually building OCCT.
-# Note, as this is an experimental project, compiler flags might differ from official builds - use it on your own risk!
+# Note, as this is an experimental project, compiler flags might differ from official builds - use it on your own risk!
-# Building OCCT using CMake is a preferred solution.
+# Building OCCT using CMake is a preferred solution.
-#
+#
-# This project GENERATES sub-projects (OCCT modules) dynamically, so to start using it:
+# This project GENERATES sub-projects (OCCT modules) dynamically, so to start using it:
-# - Launch genconf, select Project Format "Qt Project" and configure dependencies; this will also generate "custom.auto.pri".
+# - Launch genconf, select Project Format "Qt Project" and configure dependencies; this will also generate "custom.auto.pri".
-# - Launch genproj to fill in "inc" folder with links to header files.
+# - Launch genproj to fill in "inc" folder with links to header files.
-# - Open project in Qt Creator, and call "Run qmake".
+# - Open project in Qt Creator, and call "Run qmake".
-# - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again.
+# - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again.
-# - "Run qmake" and perform Build.
+# - "Run qmake" and perform Build.
-#
+#
-# Within Debian-based Linux repository Qt Creator can be installed like this:
+# Within Debian-based Linux repository Qt Creator can be installed like this:
-# > sudo apt-get install qtcreator qtbase5-dev
+# > sudo apt-get install qtcreator qtbase5-dev
-
+
-TEMPLATE = subdirs
+TEMPLATE = subdirs
-exists(custom.auto.pri) { include(custom.auto.pri) }
+exists(custom.auto.pri) { include(custom.auto.pri) }
-exists(custom.pri)      { include(custom.pri) }
+exists(custom.pri)      { include(custom.pri) }
-
+
-OTHER_FILES += OccModule.pro.in \
+OTHER_FILES += OccModule.pro.in \
-               OcctHeaderLink.hxx.in \
+               OcctHeaderLink.hxx.in \
-               OccToolkit.pro.in \
+               OccToolkit.pro.in \
-               OccCppConfig.pri \
+               OccCppConfig.pri \
-               OccModule.pri \
+               OccModule.pri \
-               OccToolkit.pri \
+               OccToolkit.pri \
-               custom.pri.template
+               custom.pri.template
-
+
-# Iterate over Modules and generate sub-projects
+# Iterate over Modules and generate sub-projects
-aSolModuleList = $$cat(../MODULES, lines)
+aSolModuleList = $$cat(../MODULES, lines)
-for (aSolModuleIter, aSolModuleList) {
+for (aSolModuleIter, aSolModuleList) {
-  aSolModule = $$first($$list($$aSolModuleIter))
+  aSolModule = $$first($$list($$aSolModuleIter))
-  eval(occtkgen_$${aSolModule}.input  = $$_PRO_FILE_PWD_/OccModule.pro.in)
+  eval(occtkgen_$${aSolModule}.input  = $$_PRO_FILE_PWD_/OccModule.pro.in)
-  eval(occtkgen_$${aSolModule}.output = $$_PRO_FILE_PWD_/$${aSolModule}/$${aSolModule}.pro)
+  eval(occtkgen_$${aSolModule}.output = $$_PRO_FILE_PWD_/$${aSolModule}/$${aSolModule}.pro)
-  eval(occtkgen_$${aSolModule}.config = verbatim)
+  eval(occtkgen_$${aSolModule}.config = verbatim)
-  eval(QMAKE_SUBSTITUTES += occtkgen_$${aSolModule})
+  eval(QMAKE_SUBSTITUTES += occtkgen_$${aSolModule})
-  SUBDIRS += $${aSolModule}
+  SUBDIRS += $${aSolModule}
-}
+}
-
+
-# These dependencies are manually defined
+# These dependencies are manually defined
-ModelingData.depends = FoundationClasses
+ModelingData.depends = FoundationClasses
-ModelingAlgorithms.depends = FoundationClasses ModelingData
+ModelingAlgorithms.depends = FoundationClasses ModelingData
-Visualization.depends = FoundationClasses ModelingData ModelingAlgorithms
+Visualization.depends = FoundationClasses ModelingData ModelingAlgorithms
-ApplicationFramework.depends = FoundationClasses ModelingData ModelingAlgorithms Visualization
+ApplicationFramework.depends = FoundationClasses ModelingData ModelingAlgorithms Visualization
-DataExchange.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework
+DataExchange.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework
-Draw.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework DataExchange Visualization
+Draw.depends = FoundationClasses ModelingData ModelingAlgorithms ApplicationFramework DataExchange Visualization

adm/qmake/OcctHeaderLink.hxx.in

@@ -1 +1 @@
-#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"
+#include \"../src/$${OCCT_PACKAGE}/$${OCCT_HEADER}\"

adm/qmake/custom.pri.template

@@ -1,17 +1,17 @@
-PRODUCTS_PATH = c:/3rdparty/vc14
+PRODUCTS_PATH = c:/3rdparty/vc14
-
+
-#CONFIG += HAVE_FREEIMAGE
+#CONFIG += HAVE_FREEIMAGE
-#CONFIG += HAVE_FFMPEG
+#CONFIG += HAVE_FFMPEG
-#CONFIG += HAVE_TBB
+#CONFIG += HAVE_TBB
-#CONFIG += HAVE_GLES2
+#CONFIG += HAVE_GLES2
-#CONFIG += HAVE_D3D
+#CONFIG += HAVE_D3D
-#CONFIG += HAVE_VTK
+#CONFIG += HAVE_VTK
-
+
-aFreeType = $$PRODUCTS_PATH/freetype-2.5.5-vc14-64
+aFreeType = $$PRODUCTS_PATH/freetype-2.5.5-vc14-64
-aTclTk    = $$PRODUCTS_PATH/tcltk-86-64
+aTclTk    = $$PRODUCTS_PATH/tcltk-86-64
-
+
-INCLUDEPATH += $$aFreeType/include
+INCLUDEPATH += $$aFreeType/include
-LIBS        += -L$$aFreeType/lib
+LIBS        += -L$$aFreeType/lib
-
+
-INCLUDEPATH += $$aTclTk/include
+INCLUDEPATH += $$aTclTk/include
-LIBS        += -L$$aTclTk/lib
+LIBS        += -L$$aTclTk/lib

adm/qmake/qtcreator-occt-cpp.xml

@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorCodeStyle>
+<!DOCTYPE QtCreatorCodeStyle>
-<!-- Written by QtCreator 3.6.1, 2016-05-19T14:46:43. -->
+<!-- Written by QtCreator 3.6.1, 2016-05-19T14:46:43. -->
-<qtcreator>
+<qtcreator>
- <data>
+ <data>
-  <variable>CodeStyleData</variable>
+  <variable>CodeStyleData</variable>
-  <valuemap type="QVariantMap">
+  <valuemap type="QVariantMap">
-   <value type="bool" key="AlignAssignments">true</value>
+   <value type="bool" key="AlignAssignments">true</value>
-   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
-   <value type="bool" key="BindStarToIdentifier">false</value>
+   <value type="bool" key="BindStarToIdentifier">false</value>
-   <value type="bool" key="BindStarToLeftSpecifier">true</value>
+   <value type="bool" key="BindStarToLeftSpecifier">true</value>
-   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
-   <value type="bool" key="BindStarToTypeName">true</value>
+   <value type="bool" key="BindStarToTypeName">true</value>
-   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
-   <value type="bool" key="IndentAccessSpecifiers">false</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
-   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBody">true</value>
-   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
-   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentClassBraces">false</value>
-   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
-   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
-   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
-   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
-   <value type="bool" key="IndentNamespaceBody">true</value>
+   <value type="bool" key="IndentNamespaceBody">true</value>
-   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
-   <value type="int" key="IndentSize">2</value>
+   <value type="int" key="IndentSize">2</value>
-   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
-   <value type="bool" key="IndentSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">true</value>
-   <value type="int" key="PaddingMode">2</value>
+   <value type="int" key="PaddingMode">2</value>
-   <value type="bool" key="SpacesForTabs">true</value>
+   <value type="bool" key="SpacesForTabs">true</value>
-   <value type="int" key="TabSize">2</value>
+   <value type="int" key="TabSize">2</value>
-  </valuemap>
+  </valuemap>
- </data>
+ </data>
- <data>
+ <data>
-  <variable>DisplayName</variable>
+  <variable>DisplayName</variable>
-  <value type="QString">occt</value>
+  <value type="QString">occt</value>
- </data>
+ </data>
-</qtcreator>
+</qtcreator>

adm/scripts/android_custom.bat.template

@@ -1,33 +1,33 @@
-rem Environment configuration template for android_build.bat (to be renamed as android_custom.bat)
+rem Environment configuration template for android_build.bat (to be renamed as android_custom.bat)
-
+
-rem Paths to 3rd-party tools and libraries
+rem Paths to 3rd-party tools and libraries
-rem call c:\TDM-GCC-64\mingwvars.bat
+rem call c:\TDM-GCC-64\mingwvars.bat
-rem set "PATH=c:\CMake\bin;%PATH%"
+rem set "PATH=c:\CMake\bin;%PATH%"
-rem set "anNdkPath=c:/android-ndk-r12"
+rem set "anNdkPath=c:/android-ndk-r12"
-rem set "aFreeType=c:/freetype-2.7.1-android"
+rem set "aFreeType=c:/freetype-2.7.1-android"
-rem set "aRapidJson=c:/rapidjson-1.1.0"
+rem set "aRapidJson=c:/rapidjson-1.1.0"
-rem set "aDraco=c:/draco-1.4.1-android"
+rem set "aDraco=c:/draco-1.4.1-android"
-
+
-rem Uncomment to customize building steps
+rem Uncomment to customize building steps
-rem set "aBuildRoot=%~dp0..\..\work"
+rem set "aBuildRoot=%~dp0..\..\work"
-rem set "toCMake=1"
+rem set "toCMake=1"
-rem set "toClean=0"
+rem set "toClean=0"
-rem set "toMake=1"
+rem set "toMake=1"
-rem set "toInstall=1"
+rem set "toInstall=1"
-rem set "toPack=1"
+rem set "toPack=1"
-rem set "isStatic=0"
+rem set "isStatic=0"
-
+
-rem Minimal Android platform and CPU architectures
+rem Minimal Android platform and CPU architectures
-rem set "anNdkApiLevel=21"
+rem set "anNdkApiLevel=21"
-rem set "anNdkAbiList=arm64-v8a x86_64"
+rem set "anNdkAbiList=arm64-v8a x86_64"
-
+
-rem OCCT Modules to build
+rem OCCT Modules to build
-rem set "BUILD_ModelingData=ON"
+rem set "BUILD_ModelingData=ON"
-rem set "BUILD_ModelingAlgorithms=ON"
+rem set "BUILD_ModelingAlgorithms=ON"
-rem set "BUILD_Visualization=ON"
+rem set "BUILD_Visualization=ON"
-rem set "BUILD_ApplicationFramework=ON"
+rem set "BUILD_ApplicationFramework=ON"
-rem set "BUILD_DataExchange=ON"
+rem set "BUILD_DataExchange=ON"
-
+
-rem Optional 3rd-party libraries to enable
+rem Optional 3rd-party libraries to enable
-rem set "USE_RAPIDJSON=ON"
+rem set "USE_RAPIDJSON=ON"
-rem set "USE_DRACO=ON"
+rem set "USE_DRACO=ON"

adm/scripts/cmake_custom.bat.template

@@ -1,48 +1,48 @@
-rem Environment configuration template for cmake_gen.bat (to be renamed as cmake_gen_custom.bat)
+rem Environment configuration template for cmake_gen.bat (to be renamed as cmake_gen_custom.bat)
-
+
-set "OCCT3RDPARTY=%SrcRoot%\..\3rdparty"
+set "OCCT3RDPARTY=%SrcRoot%\..\3rdparty"
-
+
-set VS=14
+set VS=14
-set VSDATA=2015
+set VSDATA=2015
-
+
-rem Leave VSPLATFORM empty to build for x86 platform
+rem Leave VSPLATFORM empty to build for x86 platform
-set VSPLATFORM=Win64
+set VSPLATFORM=Win64
-
+
-rem ------------------------------------
+rem ------------------------------------
-rem Uncomment to customize building steps
+rem Uncomment to customize building steps
-rem ------------------------------------
+rem ------------------------------------
-
+
-rem set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%"
+rem set "BUILD_DIR=build-vs%VS%-%VSPLATFORM%"
-rem set "INSTALL_DIR=%SrcRoot%\install"
+rem set "INSTALL_DIR=%SrcRoot%\install"
-
+
-rem set BUILD_DOC_Overview=OFF
+rem set BUILD_DOC_Overview=OFF
-rem set BUILD_Inspector=OFF
+rem set BUILD_Inspector=OFF
-rem set BUILD_LIBRARY_TYPE=Shared
+rem set BUILD_LIBRARY_TYPE=Shared
-rem set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
+rem set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
-rem set BUILD_WITH_DEBUG=OFF
+rem set BUILD_WITH_DEBUG=OFF
-rem set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
+rem set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
-rem set BUILD_USE_PCH=OFF
+rem set BUILD_USE_PCH=OFF
-rem set BUILD_FORCE_RelWithDebInfo=OFF
+rem set BUILD_FORCE_RelWithDebInfo=OFF
-
+
-rem Use semicolon-separated list of toolkits if you want to disable all modules
+rem Use semicolon-separated list of toolkits if you want to disable all modules
-rem  and build only some toolkits.
+rem  and build only some toolkits.
-rem set BUILD_ADDITIONAL_TOOLKITS=
+rem set BUILD_ADDITIONAL_TOOLKITS=
-
+
-rem Set a directory recognized as a patch for OCCT.
+rem Set a directory recognized as a patch for OCCT.
-rem set BUILD_PATCH=
+rem set BUILD_PATCH=
-
+
-rem set BUILD_MODULE_ApplicationFramework=ON
+rem set BUILD_MODULE_ApplicationFramework=ON
-rem set BUILD_MODULE_DataExchange=ON
+rem set BUILD_MODULE_DataExchange=ON
-rem set BUILD_MODULE_Draw=ON
+rem set BUILD_MODULE_Draw=ON
-rem set BUILD_MODULE_ModelingAlgorithms=ON
+rem set BUILD_MODULE_ModelingAlgorithms=ON
-rem set BUILD_MODULE_ModelingData=ON
+rem set BUILD_MODULE_ModelingData=ON
-rem set BUILD_MODULE_Visualization=ON
+rem set BUILD_MODULE_Visualization=ON
-
+
-rem set USE_D3D=OFF
+rem set USE_D3D=OFF
-rem set USE_FFMPEG=OFF
+rem set USE_FFMPEG=OFF
-rem set USE_FREEIMAGE=OFF
+rem set USE_FREEIMAGE=OFF
-rem set USE_GLES2=OFF
+rem set USE_GLES2=OFF
-rem set USE_RAPIDJSON=OFF
+rem set USE_RAPIDJSON=OFF
-rem set USE_DRACO=OFF
+rem set USE_DRACO=OFF
-rem set USE_TBB=OFF
+rem set USE_TBB=OFF
-rem set USE_VTK=OFF
+rem set USE_VTK=OFF

adm/scripts/cmake_custom.sh.template

@@ -1,43 +1,43 @@
-# Environment configuration template for cmake_gen.sh (to be renamed as cmake_gen_custom.sh)
+# Environment configuration template for cmake_gen.sh (to be renamed as cmake_gen_custom.sh)
-
+
-OCCT3RDPARTY="$SrcRoot/../3rdparty"
+OCCT3RDPARTY="$SrcRoot/../3rdparty"
-FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"
+FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"
-
+
-# ------------------------------------
+# ------------------------------------
-# Uncomment to customize building steps
+# Uncomment to customize building steps
-# ------------------------------------
+# ------------------------------------
-
+
-#BUILD_DIR=build
+#BUILD_DIR=build
-#INSTALL_DIR="$SrcRoot/install"
+#INSTALL_DIR="$SrcRoot/install"
-
+
-#BUILD_DOC_Overview=OFF
+#BUILD_DOC_Overview=OFF
-#BUILD_Inspector=OFF
+#BUILD_Inspector=OFF
-#BUILD_LIBRARY_TYPE=Shared
+#BUILD_LIBRARY_TYPE=Shared
-#BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
+#BUILD_RELEASE_DISABLE_EXCEPTIONS=ON
-#BUILD_WITH_DEBUG=OFF
+#BUILD_WITH_DEBUG=OFF
-#BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
+#BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON
-
+
-# Use semicolon-separated list of toolkits if you want to disable all modules
+# Use semicolon-separated list of toolkits if you want to disable all modules
-#  and build only some toolkits.
+#  and build only some toolkits.
-#BUILD_ADDITIONAL_TOOLKITS=
+#BUILD_ADDITIONAL_TOOLKITS=
-
+
-# Set a directory recognized as a patch for OCCT.
+# Set a directory recognized as a patch for OCCT.
-#BUILD_PATCH=
+#BUILD_PATCH=
-
+
-#BUILD_MODULE_ApplicationFramework=ON
+#BUILD_MODULE_ApplicationFramework=ON
-#BUILD_MODULE_DataExchange=ON
+#BUILD_MODULE_DataExchange=ON
-#BUILD_MODULE_Draw=ON
+#BUILD_MODULE_Draw=ON
-#BUILD_MODULE_ModelingAlgorithms=ON
+#BUILD_MODULE_ModelingAlgorithms=ON
-#BUILD_MODULE_ModelingData=ON
+#BUILD_MODULE_ModelingData=ON
-#BUILD_MODULE_Visualization=ON
+#BUILD_MODULE_Visualization=ON
-
+
-#USE_FFMPEG=OFF
+#USE_FFMPEG=OFF
-#USE_FREEIMAGE=OFF
+#USE_FREEIMAGE=OFF
-#USE_GLES2=OFF
+#USE_GLES2=OFF
-#USE_RAPIDJSON=OFF
+#USE_RAPIDJSON=OFF
-#USE_DRACO=OFF
+#USE_DRACO=OFF
-#USE_TBB=OFF
+#USE_TBB=OFF
-#USE_VTK=OFF
+#USE_VTK=OFF
-
+
-# This is to add any additional arguments to cmake
+# This is to add any additional arguments to cmake
-#AUX_ARGS=
+#AUX_ARGS=

adm/scripts/ios_custom.sh.template

@@ -1,30 +1,30 @@
-# environment configuration template for ios_build.sh (to be renamed as ios_custom_env.sh)
+# environment configuration template for ios_build.sh (to be renamed as ios_custom_env.sh)
-export PATH=/Applications/CMake.app/Contents/bin:$PATH
+export PATH=/Applications/CMake.app/Contents/bin:$PATH
-export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-ios"
+export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-ios"
-export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-ios"
+export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-ios"
-export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
+export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
-export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-ios"
+export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-ios"
-
+
-# Uncomment to customize building steps
+# Uncomment to customize building steps
-#export isStatic=0
+#export isStatic=0
-#export toCMake=1
+#export toCMake=1
-#export toClean=1
+#export toClean=1
-#export toMake=1
+#export toMake=1
-#export toInstall=1
+#export toInstall=1
-#export toPack=0
+#export toPack=0
-#export toPackFat=1
+#export toPackFat=1
-#export toDebug=0
+#export toDebug=0
-
+
-#export BUILD_ModelingData=ON
+#export BUILD_ModelingData=ON
-#export BUILD_ModelingAlgorithms=ON
+#export BUILD_ModelingAlgorithms=ON
-#export BUILD_Visualization=ON
+#export BUILD_Visualization=ON
-#export BUILD_ApplicationFramework=ON
+#export BUILD_ApplicationFramework=ON
-#export BUILD_DataExchange=ON
+#export BUILD_DataExchange=ON
-
+
-#export USE_RAPIDJSON=ON
+#export USE_RAPIDJSON=ON
-#export USE_DRACO=ON
+#export USE_DRACO=ON
-#export USE_FREEIMAGE=ON
+#export USE_FREEIMAGE=ON
-
+
-#export IPHONEOS_DEPLOYMENT_TARGET=8.0
+#export IPHONEOS_DEPLOYMENT_TARGET=8.0
-#export anAbiList="iPhoneOS|arm64 iPhoneSimulator|arm64 iPhoneSimulator|x86_64"
+#export anAbiList="iPhoneOS|arm64 iPhoneSimulator|arm64 iPhoneSimulator|x86_64"
-#export anAbiList="iPhoneOS|arm64"
+#export anAbiList="iPhoneOS|arm64"

adm/scripts/macos_custom.sh.template

@@ -1,31 +1,31 @@
-# environment configuration template for macos_build.sh (to be renamed as macos_custom_env.sh)
+# environment configuration template for macos_build.sh (to be renamed as macos_custom_env.sh)
-export PATH=/Applications/CMake.app/Contents/bin:$PATH
+export PATH=/Applications/CMake.app/Contents/bin:$PATH
-export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-macos"
+export aFreeType="$aSrcRoot/../3rdparty/freetype-2.10.4-macos"
-export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-macos"
+export aFreeImage="$aSrcRoot/../3rdparty/freeimage-3.18-macos"
-export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
+export aRapidJson="$aSrcRoot/../3rdparty/rapidjson-1.1.0"
-export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-macos"
+export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-macos"
-
+
-# Uncomment to customize building steps
+# Uncomment to customize building steps
-#export aBuildRoot=work
+#export aBuildRoot=work
-#export toCMake=1
+#export toCMake=1
-#export toClean=1
+#export toClean=1
-#export toMake=1
+#export toMake=1
-#export toInstall=1
+#export toInstall=1
-#export toPack=1
+#export toPack=1
-#export toPackFat=1
+#export toPackFat=1
-
+
-#export BUILD_ModelingData=ON
+#export BUILD_ModelingData=ON
-#export BUILD_ModelingAlgorithms=ON
+#export BUILD_ModelingAlgorithms=ON
-#export BUILD_Visualization=ON
+#export BUILD_Visualization=ON
-#export BUILD_ApplicationFramework=ON
+#export BUILD_ApplicationFramework=ON
-#export BUILD_DataExchange=ON
+#export BUILD_DataExchange=ON
-#export BUILD_Draw=ON
+#export BUILD_Draw=ON
-
+
-#export USE_RAPIDJSON=ON
+#export USE_RAPIDJSON=ON
-#export USE_DRACO=ON
+#export USE_DRACO=ON
-#export USE_FREEIMAGE=ON
+#export USE_FREEIMAGE=ON
-
+
-#export MACOSX_DEPLOYMENT_TARGET=10.10
+#export MACOSX_DEPLOYMENT_TARGET=10.10
-#export anAbiList=arm64
+#export anAbiList=arm64
-#export anAbiList=x86_64
+#export anAbiList=x86_64
-#export anAbiList="arm64 x86_64"
+#export anAbiList="arm64 x86_64"

adm/scripts/mingw_custom.bat.template

@@ -1,29 +1,29 @@
-rem Environment configuration template for mingw_build.bat (to be renamed as mingw_custom.bat)
+rem Environment configuration template for mingw_build.bat (to be renamed as mingw_custom.bat)
-set "aCmakeBin=%ProgramW6432%\CMake\bin"
+set "aCmakeBin=%ProgramW6432%\CMake\bin"
-set "aFreeType=%aCasSrc%/../3rdparty/freetype-2.6.3-mingw-64"
+set "aFreeType=%aCasSrc%/../3rdparty/freetype-2.6.3-mingw-64"
-set "aTclTk=%aCasSrc%/../3rdparty/tcltk-8.6.4-mingw-64"
+set "aTclTk=%aCasSrc%/../3rdparty/tcltk-8.6.4-mingw-64"
-set "aFreeImage=%aCasSrc%/../3rdparty/freeimage-3.17-0-mingw-64"
+set "aFreeImage=%aCasSrc%/../3rdparty/freeimage-3.17-0-mingw-64"
-set "aRapidJson=%aCasSrc%/../3rdparty/rapidjson-1.1.0"
+set "aRapidJson=%aCasSrc%/../3rdparty/rapidjson-1.1.0"
-set "aDraco=%aCasSrc%/../3rdparty/draco-1.4-1-mingw-64"
+set "aDraco=%aCasSrc%/../3rdparty/draco-1.4-1-mingw-64"
-
+
-set "aMingwVars=c:\mingw-8.3.0-msys2\mingwvars.bat"
+set "aMingwVars=c:\mingw-8.3.0-msys2\mingwvars.bat"
-
+
-rem Uncomment to customize building steps
+rem Uncomment to customize building steps
-rem set "aBuildRoot=work"
+rem set "aBuildRoot=work"
-rem set "toCMake=1"
+rem set "toCMake=1"
-rem set "toClean=1"
+rem set "toClean=1"
-rem set "toMake=1"
+rem set "toMake=1"
-rem set "toInstall=1"
+rem set "toInstall=1"
-rem set "toPack=1"
+rem set "toPack=1"
-rem set "toDebug=0"
+rem set "toDebug=0"
-
+
-rem set "BUILD_ModelingData=ON"
+rem set "BUILD_ModelingData=ON"
-rem set "BUILD_ModelingAlgorithms=ON"
+rem set "BUILD_ModelingAlgorithms=ON"
-rem set "BUILD_Visualization=ON"
+rem set "BUILD_Visualization=ON"
-rem set "BUILD_ApplicationFramework=ON"
+rem set "BUILD_ApplicationFramework=ON"
-rem set "BUILD_DataExchange=ON"
+rem set "BUILD_DataExchange=ON"
-rem set "BUILD_Draw=ON"
+rem set "BUILD_Draw=ON"
-
+
-rem set "USE_RAPIDJSON=ON"
+rem set "USE_RAPIDJSON=ON"
-rem set "USE_DRACO=ON"
+rem set "USE_DRACO=ON"
-rem set "USE_FREEIMAGE=ON"
+rem set "USE_FREEIMAGE=ON"

adm/scripts/wasm_custom.bat.template

@@ -1,29 +1,29 @@
-rem Environment configuration template for wasm_build.bat (to be renamed as wasm_custom.bat)
+rem Environment configuration template for wasm_build.bat (to be renamed as wasm_custom.bat)
-set "EMSDK_ROOT=%aCasSrc%\..\emsdk"
+set "EMSDK_ROOT=%aCasSrc%\..\emsdk"
-set "aFreeType=%aCasSrc%\..\3rdparty\freetype-2.7.1-wasm32"
+set "aFreeType=%aCasSrc%\..\3rdparty\freetype-2.7.1-wasm32"
-rem set "aRapidJson=%aCasSrc%\..\3rdparty\rapidjson-1.1.0"
+rem set "aRapidJson=%aCasSrc%\..\3rdparty\rapidjson-1.1.0"
-rem set "aDraco=%aCasSrc%\..\3rdparty\draco-1.4.1-wasm32"
+rem set "aDraco=%aCasSrc%\..\3rdparty\draco-1.4.1-wasm32"
-rem set "aCmakeBin=%ProgramW6432%\CMake\bin"
+rem set "aCmakeBin=%ProgramW6432%\CMake\bin"
-
+
-rem Uncomment to customize building steps
+rem Uncomment to customize building steps
-rem set "aBuildRoot=work"
+rem set "aBuildRoot=work"
-rem set "toCMake=1"
+rem set "toCMake=1"
-rem set "toClean=1"
+rem set "toClean=1"
-rem set "toMake=1"
+rem set "toMake=1"
-rem set "toInstall=1"
+rem set "toInstall=1"
-rem set "toPack=1"
+rem set "toPack=1"
-rem set "toDebug=1"
+rem set "toDebug=1"
-rem set "toBuildSample=1"
+rem set "toBuildSample=1"
-rem Source map base (should point to server where C++ sources will be copied)
+rem Source map base (should point to server where C++ sources will be copied)
-rem enables -g4 debug building option for WebGL sample and allows navigating C++ source code within JavaScript debugger.
+rem enables -g4 debug building option for WebGL sample and allows navigating C++ source code within JavaScript debugger.
-rem set "sourceMapBase=http://localhost:9090/"
+rem set "sourceMapBase=http://localhost:9090/"
-
+
-rem set "BUILD_ModelingData=ON"
+rem set "BUILD_ModelingData=ON"
-rem set "BUILD_ModelingAlgorithms=ON"
+rem set "BUILD_ModelingAlgorithms=ON"
-rem set "BUILD_Visualization=ON"
+rem set "BUILD_Visualization=ON"
-rem set "BUILD_ApplicationFramework=ON"
+rem set "BUILD_ApplicationFramework=ON"
-rem set "BUILD_DataExchange=ON"
+rem set "BUILD_DataExchange=ON"
-
+
-rem set "USE_RAPIDJSON=ON"
+rem set "USE_RAPIDJSON=ON"
-rem set "USE_DRACO=ON"
+rem set "USE_DRACO=ON"
-rem set "USE_PTHREADS=ON"
+rem set "USE_PTHREADS=ON"

adm/scripts/wasm_custom.sh.template

@@ -1,16 +1,16 @@
-# environment configuration template for occ_build_wasm.sh (to be renamed as wasm_custom_env.sh)
+# environment configuration template for occ_build_wasm.sh (to be renamed as wasm_custom_env.sh)
-export aFreeType="$aSrcRoot/../3rdparty/freetype-2.7.1-wasm"
+export aFreeType="$aSrcRoot/../3rdparty/freetype-2.7.1-wasm"
-export EMSDK_ROOT="$aSrcRoot/../emsdk"
+export EMSDK_ROOT="$aSrcRoot/../emsdk"
-
+
-# Uncomment to customize building steps
+# Uncomment to customize building steps
-#export aBuildRoot=work
+#export aBuildRoot=work
-#export toCMake=1
+#export toCMake=1
-#export toClean=0
+#export toClean=0
-#export toMake=1
+#export toMake=1
-#export toInstall=1
+#export toInstall=1
-
+
-#export BUILD_ModelingData=ON
+#export BUILD_ModelingData=ON
-#export BUILD_ModelingAlgorithms=ON
+#export BUILD_ModelingAlgorithms=ON
-#export BUILD_Visualization=ON
+#export BUILD_Visualization=ON
-#export BUILD_ApplicationFramework=ON
+#export BUILD_ApplicationFramework=ON
-#export BUILD_DataExchange=ON
+#export BUILD_DataExchange=ON

adm/templates/OpenCASCADECompileDefinitionsAndFlags.cmake.in

@@ -1,14 +1,14 @@
-#-----------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
-#
+#
-# OpenCASCADECompileDefinitionsAndFlags-@OCCT_CONFIGURATION_LOWER@.cmake - OpenCASCADE CMake file 
+# OpenCASCADECompileDefinitionsAndFlags-@OCCT_CONFIGURATION_LOWER@.cmake - OpenCASCADE CMake file 
-# with compile definitions and C/C++ flags for @OCCT_CONFIGURATION@ configuration.
+# with compile definitions and C/C++ flags for @OCCT_CONFIGURATION@ configuration.
-#
+#
-# This file is configured by OpenCASCADE.
+# This file is configured by OpenCASCADE.
-#
+#
-
+
-# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
+# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
-set (OpenCASCADE_C_FLAGS_@OCCT_CONFIGURATION_UPPER@      "@SET_OpenCASCADE_CMAKE_C_FLAGS@")
+set (OpenCASCADE_C_FLAGS_@OCCT_CONFIGURATION_UPPER@      "@SET_OpenCASCADE_CMAKE_C_FLAGS@")
-set (OpenCASCADE_CXX_FLAGS_@OCCT_CONFIGURATION_UPPER@    "@SET_OpenCASCADE_CMAKE_CXX_FLAGS@")
+set (OpenCASCADE_CXX_FLAGS_@OCCT_CONFIGURATION_UPPER@    "@SET_OpenCASCADE_CMAKE_CXX_FLAGS@")
-
+
-# The compile definitions used by OpenCASCADE.
+# The compile definitions used by OpenCASCADE.
-@SET_OpenCASCADE_COMPILE_DEFINITIONS@
+@SET_OpenCASCADE_COMPILE_DEFINITIONS@

adm/templates/OpenCASCADEConfig.cmake.in

@@ -1,94 +1,94 @@
-#-----------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
-#
+#
-# OpenCASCADEConfig.cmake - OpenCASCADE CMake configuration file for external projects.
+# OpenCASCADEConfig.cmake - OpenCASCADE CMake configuration file for external projects.
-#
+#
-# This file is configured by OpenCASCADE.
+# This file is configured by OpenCASCADE.
-#
+#
-
+
-if(OpenCASCADE_ALREADY_INCLUDED)
+if(OpenCASCADE_ALREADY_INCLUDED)
-  return()
+  return()
-endif()
+endif()
-set(OpenCASCADE_ALREADY_INCLUDED 1)
+set(OpenCASCADE_ALREADY_INCLUDED 1)
-
+
-# The OpenCASCADE version number
+# The OpenCASCADE version number
-set (OpenCASCADE_MAJOR_VERSION       "@OCC_VERSION_MAJOR@")
+set (OpenCASCADE_MAJOR_VERSION       "@OCC_VERSION_MAJOR@")
-set (OpenCASCADE_MINOR_VERSION       "@OCC_VERSION_MINOR@")
+set (OpenCASCADE_MINOR_VERSION       "@OCC_VERSION_MINOR@")
-set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@")
+set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@")
-set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
+set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
-
+
-# Compute the installation prefix from this OpenCASCADEConfig.cmake file 
+# Compute the installation prefix from this OpenCASCADEConfig.cmake file 
-# location, by going up one level + one level if "cmake" + one level if "lib".
+# location, by going up one level + one level if "cmake" + one level if "lib".
-# This is made to support different locations of CMake files:
+# This is made to support different locations of CMake files:
-# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version>
+# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version>
-# - in Windows style: $INSTALL_DIR/cmake
+# - in Windows style: $INSTALL_DIR/cmake
-# - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/opencascade-<version>
+# - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/opencascade-<version>
-get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-endif()
+endif()
-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$")
-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-endif()
+endif()
-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")
+if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$")
-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+  get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
-endif()
+endif()
-
+
-# Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
+# Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
-set (OpenCASCADE_BINARY_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
+set (OpenCASCADE_BINARY_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
-set (OpenCASCADE_LIBRARY_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_LIB@")
+set (OpenCASCADE_LIBRARY_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_LIB@")
-set (OpenCASCADE_SCRIPT_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_SCRIPT@")
+set (OpenCASCADE_SCRIPT_DIR   "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_SCRIPT@")
-set (OpenCASCADE_INCLUDE_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_INCLUDE@")
+set (OpenCASCADE_INCLUDE_DIR  "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_INCLUDE@")
-set (OpenCASCADE_RESOURCE_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_RESOURCE@")
+set (OpenCASCADE_RESOURCE_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_RESOURCE@")
-
+
-# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
+# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
-set (OpenCASCADE_C_FLAGS      "@CMAKE_C_FLAGS@")
+set (OpenCASCADE_C_FLAGS      "@CMAKE_C_FLAGS@")
-set (OpenCASCADE_CXX_FLAGS    "@CMAKE_CXX_FLAGS@")
+set (OpenCASCADE_CXX_FLAGS    "@CMAKE_CXX_FLAGS@")
-@SET_OpenCASCADE_LINKER_FLAGS@
+@SET_OpenCASCADE_LINKER_FLAGS@
-
+
-# List of available OpenCASCADE modules.
+# List of available OpenCASCADE modules.
-set (OpenCASCADE_MODULES @OCCT_MODULES_ENABLED@)
+set (OpenCASCADE_MODULES @OCCT_MODULES_ENABLED@)
-@SET_OpenCASCADE_MODULES_TOOLKITS@
+@SET_OpenCASCADE_MODULES_TOOLKITS@
-# List of available OpenCASCADE libraries.
+# List of available OpenCASCADE libraries.
-set (OpenCASCADE_LIBRARIES @OCCT_LIBRARIES@)
+set (OpenCASCADE_LIBRARIES @OCCT_LIBRARIES@)
-
+
-# OpenCASCADE global configuration options.
+# OpenCASCADE global configuration options.
-set (OpenCASCADE_COMPILER          "@COMPILER@")
+set (OpenCASCADE_COMPILER          "@COMPILER@")
-set (OpenCASCADE_BUILD_WITH_DEBUG  @BUILD_WITH_DEBUG@)
+set (OpenCASCADE_BUILD_WITH_DEBUG  @BUILD_WITH_DEBUG@)
-set (OpenCASCADE_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+set (OpenCASCADE_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
-@SET_OpenCASCADE_BUILD_TYPE@
+@SET_OpenCASCADE_BUILD_TYPE@
-
+
-# Use of third-party libraries.
+# Use of third-party libraries.
-set (OpenCASCADE_WITH_TCL       @USE_TCL@)
+set (OpenCASCADE_WITH_TCL       @USE_TCL@)
-set (OpenCASCADE_WITH_FREETYPE  @USE_FREETYPE@)
+set (OpenCASCADE_WITH_FREETYPE  @USE_FREETYPE@)
-set (OpenCASCADE_WITH_FREEIMAGE @USE_FREEIMAGE@)
+set (OpenCASCADE_WITH_FREEIMAGE @USE_FREEIMAGE@)
-set (OpenCASCADE_WITH_TBB       @USE_TBB@)
+set (OpenCASCADE_WITH_TBB       @USE_TBB@)
-set (OpenCASCADE_WITH_VTK       @USE_VTK@)
+set (OpenCASCADE_WITH_VTK       @USE_VTK@)
-set (OpenCASCADE_WITH_FFMPEG    @USE_FFMPEG@)
+set (OpenCASCADE_WITH_FFMPEG    @USE_FFMPEG@)
-set (OpenCASCADE_WITH_GLES2     @USE_GLES2@)
+set (OpenCASCADE_WITH_GLES2     @USE_GLES2@)
-@SET_OpenCASCADE_WITH_D3D@
+@SET_OpenCASCADE_WITH_D3D@
-@SET_OpenCASCADE_WITH_GLX@
+@SET_OpenCASCADE_WITH_GLX@
-
+
-# Import OpenCASCADE compile definitions, C and C++ flags for each installed configuration.
+# Import OpenCASCADE compile definitions, C and C++ flags for each installed configuration.
-file(GLOB CONFIG_FILES "${CMAKE_CURRENT_LIST_DIR}/OpenCASCADECompileDefinitionsAndFlags-*.cmake")
+file(GLOB CONFIG_FILES "${CMAKE_CURRENT_LIST_DIR}/OpenCASCADECompileDefinitionsAndFlags-*.cmake")
-foreach(f ${CONFIG_FILES})
+foreach(f ${CONFIG_FILES})
-  include(${f})
+  include(${f})
-endforeach()
+endforeach()
-
+
-if (NOT OpenCASCADE_FIND_COMPONENTS)
+if (NOT OpenCASCADE_FIND_COMPONENTS)
-  set (OpenCASCADE_FIND_COMPONENTS ${OpenCASCADE_MODULES})
+  set (OpenCASCADE_FIND_COMPONENTS ${OpenCASCADE_MODULES})
-endif ()
+endif ()
-
+
-# Import OpenCASCADE targets.
+# Import OpenCASCADE targets.
-foreach(_comp ${OpenCASCADE_FIND_COMPONENTS})
+foreach(_comp ${OpenCASCADE_FIND_COMPONENTS})
-  if (NOT ";${OpenCASCADE_MODULES};" MATCHES "${_comp}")
+  if (NOT ";${OpenCASCADE_MODULES};" MATCHES "${_comp}")
-    set(OpenCASCADE_FOUND False)
+    set(OpenCASCADE_FOUND False)
-    set(OpenCASCADE_NOTFOUND_MESSAGE "Specified unsupported component: ${_comp}")
+    set(OpenCASCADE_NOTFOUND_MESSAGE "Specified unsupported component: ${_comp}")
-    if (NOT OpenCASCADE_FIND_QUIETLY)
+    if (NOT OpenCASCADE_FIND_QUIETLY)
-      message (ERROR ": ${OpenCASCADE_NOTFOUND_MESSAGE}")
+      message (ERROR ": ${OpenCASCADE_NOTFOUND_MESSAGE}")
-    endif()
+    endif()
-  else()
+  else()
-    include("${CMAKE_CURRENT_LIST_DIR}/OpenCASCADE${_comp}Targets.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/OpenCASCADE${_comp}Targets.cmake")
-  endif()
+  endif()
-endforeach()
+endforeach()

adm/templates/android.toolchain.config.cmake

@@ -1,8 +1,8 @@
-# A toolchain file to configure a Makefile Generators or the Ninja generator to target Android for cross-compiling.
+# A toolchain file to configure a Makefile Generators or the Ninja generator to target Android for cross-compiling.
-# Set CMAKE_ANDROID_NDK variable equal to your Android NDK path.
+# Set CMAKE_ANDROID_NDK variable equal to your Android NDK path.
-
+
-set (CMAKE_SYSTEM_NAME       Android)
+set (CMAKE_SYSTEM_NAME       Android)
-set (CMAKE_SYSTEM_VERSION    15) # API level
+set (CMAKE_SYSTEM_VERSION    15) # API level
-set (CMAKE_ANDROID_ARCH_ABI  armeabi-v7a)
+set (CMAKE_ANDROID_ARCH_ABI  armeabi-v7a)
-set (CMAKE_ANDROID_NDK       "")
+set (CMAKE_ANDROID_NDK       "")
-set (CMAKE_ANDROID_STL_TYPE  gnustl_shared)
+set (CMAKE_ANDROID_STL_TYPE  gnustl_shared)

adm/templates/custom.bat.main

@@ -1,5 +1,5 @@
-echo off
+echo off
-
+
-rem include other custom.bat files with specific 3rdparty paths
+rem include other custom.bat files with specific 3rdparty paths
-@ADDITIONAL_CUSTOM_CONTENT@
+@ADDITIONAL_CUSTOM_CONTENT@
-
+

adm/templates/custom.build.bat.in

@@ -1,46 +1,46 @@
-echo off
+echo off
-
+
-if /I "%VCVER%" == "@COMPILER@" (
+if /I "%VCVER%" == "@COMPILER@" (
-  if "%ARCH%" == "@COMPILER_BITNESS@" (
+  if "%ARCH%" == "@COMPILER_BITNESS@" (
-    rem set environment variables used by OCCT
+    rem set environment variables used by OCCT
-    set CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
+    set CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
-
+
-    set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@"
+    set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@"
-    set "TK_DIR=@3RDPARTY_TK_DLL_DIR@"
+    set "TK_DIR=@3RDPARTY_TK_DLL_DIR@"
-    set "FREETYPE_DIR=@3RDPARTY_FREETYPE_DLL_DIR@"
+    set "FREETYPE_DIR=@3RDPARTY_FREETYPE_DLL_DIR@"
-    set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIRS@"
+    set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIRS@"
-    set "EGL_DIR=@3RDPARTY_EGL_DLL_DIRS@"
+    set "EGL_DIR=@3RDPARTY_EGL_DLL_DIRS@"
-    set "GLES2_DIR=@3RDPARTY_GLES2_DLL_DIRS@"
+    set "GLES2_DIR=@3RDPARTY_GLES2_DLL_DIRS@"
-    set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
+    set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
-    set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
+    set "VTK_DIR=@3RDPARTY_VTK_DLL_DIR@"
-    set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
+    set "FFMPEG_DIR=@3RDPARTY_FFMPEG_DLL_DIR@"
-    set "OPENVR_DIR=@3RDPARTY_OPENVR_DLL_DIRS@"
+    set "OPENVR_DIR=@3RDPARTY_OPENVR_DLL_DIRS@"
-
+
-    if not "@3RDPARTY_QT_DIR@" == "" (
+    if not "@3RDPARTY_QT_DIR@" == "" (
-      set "QTDIR=@3RDPARTY_QT_DIR@"
+      set "QTDIR=@3RDPARTY_QT_DIR@"
-    )
+    )
-    set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+    set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
-    set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_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 CSF_OCCTBinPath and CSF_OCCTLibPath are defined differently for 
-    rem multiple and single configuration builds
+    rem multiple and single configuration builds
-    set "CSF_OCCTBinPath=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
+    set "CSF_OCCTBinPath=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
-    if ["@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"] == [""] (
+    if ["@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"] == [""] (
-      set "CSF_OCCTBinPath=@CMAKE_BINARY_DIR@/win%ARCH%/%VCVER%/bin%3"
+      set "CSF_OCCTBinPath=@CMAKE_BINARY_DIR@/win%ARCH%/%VCVER%/bin%3"
-    )
+    )
-    set "CSF_OCCTLibPath=@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@"
+    set "CSF_OCCTLibPath=@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@"
-    if ["@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@"] == [""] (
+    if ["@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@"] == [""] (
-      set "CSF_OCCTLibPath=@CMAKE_BINARY_DIR@/win%ARCH%/%VCVER%/lib%3"
+      set "CSF_OCCTLibPath=@CMAKE_BINARY_DIR@/win%ARCH%/%VCVER%/lib%3"
-    )
+    )
-
+
-    set "CSF_OCCTIncludePath=@CMAKE_BINARY_DIR@/inc"
+    set "CSF_OCCTIncludePath=@CMAKE_BINARY_DIR@/inc"
-    set "CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src"
+    set "CSF_OCCTResourcePath=@CMAKE_SOURCE_DIR@/src"
-    set "CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data"
+    set "CSF_OCCTDataPath=@CMAKE_SOURCE_DIR@/data"
-    set "CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples"
+    set "CSF_OCCTSamplesPath=@CMAKE_SOURCE_DIR@/samples"
-    set "CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests"
+    set "CSF_OCCTTestsPath=@CMAKE_SOURCE_DIR@/tests"
-    set "CSF_OCCTDocPath=@CMAKE_SOURCE_DIR@/doc"
+    set "CSF_OCCTDocPath=@CMAKE_SOURCE_DIR@/doc"
-
+
-    rem for compatibility with external application using CASROOT
+    rem for compatibility with external application using CASROOT
-    set "CASROOT=@CMAKE_SOURCE_DIR@"
+    set "CASROOT=@CMAKE_SOURCE_DIR@"
-  ) 
+  ) 
-)
+)

adm/templates/custom.build.sh.in

@@ -1,36 +1,36 @@
-#!/bin/bash
+#!/bin/bash
-
+
-if [ "$1" == "@BIN_LETTER@" ]; then
+if [ "$1" == "@BIN_LETTER@" ]; then
-  if [ "$2" == "@COMPILER_BITNESS@" ]; then
+  if [ "$2" == "@COMPILER_BITNESS@" ]; then
-    # set environment variables used by OCCT
+    # set environment variables used by OCCT
-    export CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
+    export CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
-
+
-    export TCL_DIR="@3RDPARTY_TCL_LIBRARY_DIR@"
+    export TCL_DIR="@3RDPARTY_TCL_LIBRARY_DIR@"
-    export TK_DIR="@3RDPARTY_TK_LIBRARY_DIR@"
+    export TK_DIR="@3RDPARTY_TK_LIBRARY_DIR@"
-    export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@"
+    export FREETYPE_DIR="@3RDPARTY_FREETYPE_LIBRARY_DIR@"
-    export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_LIBRARY_DIRS@"
+    export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_LIBRARY_DIRS@"
-    export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
+    export TBB_DIR="@3RDPARTY_TBB_LIBRARY_DIR@"
-    export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
+    export VTK_DIR="@3RDPARTY_VTK_LIBRARY_DIR@"
-    export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
+    export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
-
+
-    if [ "x@3RDPARTY_QT_DIR" != "x" ]; then
+    if [ "x@3RDPARTY_QT_DIR" != "x" ]; then
-      export QTDIR="@3RDPARTY_QT_DIR@"
+      export QTDIR="@3RDPARTY_QT_DIR@"
-    fi
+    fi
-
+
-    export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+    export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
-    export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
+    export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
-
+
-    export CSF_OCCTBinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
+    export CSF_OCCTBinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
-    export CSF_OCCTLibPath="@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@"
+    export CSF_OCCTLibPath="@CMAKE_ARCHIVE_OUTPUT_DIRECTORY@"
-    export CSF_OCCTIncludePath="@CMAKE_BINARY_DIR@/inc"
+    export CSF_OCCTIncludePath="@CMAKE_BINARY_DIR@/inc"
-    export CSF_OCCTResourcePath="@CMAKE_SOURCE_DIR@/src"
+    export CSF_OCCTResourcePath="@CMAKE_SOURCE_DIR@/src"
-    export CSF_OCCTDataPath="@CMAKE_SOURCE_DIR@/data"
+    export CSF_OCCTDataPath="@CMAKE_SOURCE_DIR@/data"
-    export CSF_OCCTSamplesPath="@CMAKE_SOURCE_DIR@/samples"
+    export CSF_OCCTSamplesPath="@CMAKE_SOURCE_DIR@/samples"
-    export CSF_OCCTTestsPath="@CMAKE_SOURCE_DIR@/tests"
+    export CSF_OCCTTestsPath="@CMAKE_SOURCE_DIR@/tests"
-    export CSF_OCCTDocPath="@CMAKE_SOURCE_DIR@/doc"
+    export CSF_OCCTDocPath="@CMAKE_SOURCE_DIR@/doc"
-
+
-    # for compatibility with external application using CASROOT
+    # for compatibility with external application using CASROOT
-    export CASROOT="@CMAKE_SOURCE_DIR@"
+    export CASROOT="@CMAKE_SOURCE_DIR@"
-  fi
+  fi
-fi
+fi
-
+

adm/templates/custom.install.bat.in

@@ -1,38 +1,38 @@
-echo off
+echo off
-
+
-rem CASDEB comes as third argument
+rem CASDEB comes as third argument
-
+
-if /I "%VCVER%" == "@COMPILER@" (
+if /I "%VCVER%" == "@COMPILER@" (
-  if "%ARCH%" == "@COMPILER_BITNESS@" (
+  if "%ARCH%" == "@COMPILER_BITNESS@" (
-    rem set environment variables used by OCCT
+    rem set environment variables used by OCCT
-    set CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
+    set CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
-
+
-    set "TCL_DIR=@USED_3RDPARTY_TCL_DIR@"
+    set "TCL_DIR=@USED_3RDPARTY_TCL_DIR@"
-    set "TK_DIR=@USED_3RDPARTY_TK_DIR@"
+    set "TK_DIR=@USED_3RDPARTY_TK_DIR@"
-    set "FREETYPE_DIR=@USED_3RDPARTY_FREETYPE_DIR@"
+    set "FREETYPE_DIR=@USED_3RDPARTY_FREETYPE_DIR@"
-    set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIR@"
+    set "FREEIMAGE_DIR=@USED_3RDPARTY_FREEIMAGE_DIR@"
-    set "EGL_DIR=@USED_3RDPARTY_EGL_DIRS@"
+    set "EGL_DIR=@USED_3RDPARTY_EGL_DIRS@"
-    set "GLES2_DIR=@USED_3RDPARTY_GLES2_DIRS@"
+    set "GLES2_DIR=@USED_3RDPARTY_GLES2_DIRS@"
-    set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
+    set "TBB_DIR=@USED_3RDPARTY_TBB_DIR@"
-    set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
+    set "VTK_DIR=@USED_3RDPARTY_VTK_DIR@"
-    set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
+    set "FFMPEG_DIR=@USED_3RDPARTY_FFMPEG_DIR@"
-    set "OPENVR_DIR=@USED_3RDPARTY_OPENVR_DIR@"
+    set "OPENVR_DIR=@USED_3RDPARTY_OPENVR_DIR@"
-
+
-    if not "@USED_3RDPARTY_QT_DIR@" == "" (
+    if not "@USED_3RDPARTY_QT_DIR@" == "" (
-      set "QTDIR=@USED_3RDPARTY_QT_DIR@"
+      set "QTDIR=@USED_3RDPARTY_QT_DIR@"
-    )
+    )
-    set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+    set "TCL_VERSION_WITH_DOT=@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
-    set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
+    set "TK_VERSION_WITH_DOT=@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
-
+
-    set "CSF_OCCTBinPath=%CASROOT%/@INSTALL_DIR_BIN@%3"
+    set "CSF_OCCTBinPath=%CASROOT%/@INSTALL_DIR_BIN@%3"
-    set "CSF_OCCTLibPath=%CASROOT%/@INSTALL_DIR_LIB@%3"
+    set "CSF_OCCTLibPath=%CASROOT%/@INSTALL_DIR_LIB@%3"
-
+
-    set "CSF_OCCTIncludePath=%CASROOT%/@INSTALL_DIR_INCLUDE@"
+    set "CSF_OCCTIncludePath=%CASROOT%/@INSTALL_DIR_INCLUDE@"
-    set "CSF_OCCTResourcePath=%CASROOT%/@INSTALL_DIR_RESOURCE@"
+    set "CSF_OCCTResourcePath=%CASROOT%/@INSTALL_DIR_RESOURCE@"
-    set "CSF_OCCTDataPath=%CASROOT%/@INSTALL_DIR_DATA@"
+    set "CSF_OCCTDataPath=%CASROOT%/@INSTALL_DIR_DATA@"
-    set "CSF_OCCTSamplesPath=%CASROOT%/@INSTALL_DIR_SAMPLES@"
+    set "CSF_OCCTSamplesPath=%CASROOT%/@INSTALL_DIR_SAMPLES@"
-    set "CSF_OCCTTestsPath=%CASROOT%/@INSTALL_DIR_TESTS@"
+    set "CSF_OCCTTestsPath=%CASROOT%/@INSTALL_DIR_TESTS@"
-    set "CSF_OCCTDocPath=%CASROOT%/@INSTALL_DIR_DOC@"
+    set "CSF_OCCTDocPath=%CASROOT%/@INSTALL_DIR_DOC@"
-  )
+  )
-)
+)
-
+

adm/templates/custom.install.sh.in

@@ -1,33 +1,33 @@
-#!/bin/bash
+#!/bin/bash
-
+
-if [ "$1" == "@BIN_LETTER@" ]; then
+if [ "$1" == "@BIN_LETTER@" ]; then
-  if [ "$2" == "@COMPILER_BITNESS@" ]; then
+  if [ "$2" == "@COMPILER_BITNESS@" ]; then
-    # set environment variables used by OCCT
+    # set environment variables used by OCCT
-    export CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
+    export CSF_FPE=@BUILD_ENABLE_FPE_SIGNAL_HANDLER@
-
+
-    export TCL_DIR="@USED_3RDPARTY_TCL_DIR@"
+    export TCL_DIR="@USED_3RDPARTY_TCL_DIR@"
-    export TK_DIR="@USED_3RDPARTY_TK_DIR@"
+    export TK_DIR="@USED_3RDPARTY_TK_DIR@"
-    export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@"
+    export FREETYPE_DIR="@USED_3RDPARTY_FREETYPE_DIR@"
-    export FREEIMAGE_DIR="@USED_3RDPARTY_FREEIMAGE_DIRS@"
+    export FREEIMAGE_DIR="@USED_3RDPARTY_FREEIMAGE_DIRS@"
-    export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
+    export TBB_DIR="@USED_3RDPARTY_TBB_DIR@"
-    export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
+    export VTK_DIR="@USED_3RDPARTY_VTK_DIR@"
-    export FFMPEG_DIR="@USED_3RDPARTY_FFMPEG_DIR@"
+    export FFMPEG_DIR="@USED_3RDPARTY_FFMPEG_DIR@"
-
+
-    if [ "x@USED_3RDPARTY_QT_DIR@" != "x" ]; then
+    if [ "x@USED_3RDPARTY_QT_DIR@" != "x" ]; then
-      export QTDIR="@USED_3RDPARTY_QT_DIR@"
+      export QTDIR="@USED_3RDPARTY_QT_DIR@"
-    fi
+    fi
-
+
-    export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
+    export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
-    export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
+    export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"
-
+
-    export CSF_OCCTBinPath="${CASROOT}/@INSTALL_DIR_BIN@"
+    export CSF_OCCTBinPath="${CASROOT}/@INSTALL_DIR_BIN@"
-    export CSF_OCCTLibPath="${CASROOT}/@INSTALL_DIR_LIB@"
+    export CSF_OCCTLibPath="${CASROOT}/@INSTALL_DIR_LIB@"
-    export CSF_OCCTIncludePath="${CASROOT}/@INSTALL_DIR_INCLUDE@"
+    export CSF_OCCTIncludePath="${CASROOT}/@INSTALL_DIR_INCLUDE@"
-    export CSF_OCCTResourcePath="${CASROOT}/@INSTALL_DIR_RESOURCE@"
+    export CSF_OCCTResourcePath="${CASROOT}/@INSTALL_DIR_RESOURCE@"
-    export CSF_OCCTDataPath="${CASROOT}/@INSTALL_DIR_DATA@"
+    export CSF_OCCTDataPath="${CASROOT}/@INSTALL_DIR_DATA@"
-    export CSF_OCCTSamplesPath="${CASROOT}/@INSTALL_DIR_SAMPLES@"
+    export CSF_OCCTSamplesPath="${CASROOT}/@INSTALL_DIR_SAMPLES@"
-    export CSF_OCCTTestsPath="${CASROOT}/@INSTALL_DIR_TESTS@"
+    export CSF_OCCTTestsPath="${CASROOT}/@INSTALL_DIR_TESTS@"
-    export CSF_OCCTDocPath="${CASROOT}/@INSTALL_DIR_DOC@"
+    export CSF_OCCTDocPath="${CASROOT}/@INSTALL_DIR_DOC@"
-  fi
+  fi
-fi
+fi
-
+

adm/templates/custom.sh.main

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
-
+
-@ADDITIONAL_CUSTOM_CONTENT@
+@ADDITIONAL_CUSTOM_CONTENT@
-
+

adm/templates/env.bat.in

@@ -1,195 +1,195 @@
-echo off
+echo off
-
+
-set "SCRIPTROOT=%~dp0"
+set "SCRIPTROOT=%~dp0"
-set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
+set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
-
+
-rem ----- Reset values to defaults -----
+rem ----- Reset values to defaults -----
-set "VCVER=@COMPILER@"
+set "VCVER=@COMPILER@"
-set "ARCH=@COMPILER_BITNESS@"
+set "ARCH=@COMPILER_BITNESS@"
-set "CASDEB="
+set "CASDEB="
-
+
-if not ["%1"]    == [""]      set "VCVER=%1"
+if not ["%1"]    == [""]      set "VCVER=%1"
-if not ["%2"]    == [""]      set "ARCH=%2"
+if not ["%2"]    == [""]      set "ARCH=%2"
-if /I ["%ARCH%"] == ["win32"] set "ARCH=32"
+if /I ["%ARCH%"] == ["win32"] set "ARCH=32"
-if /I ["%ARCH%"] == ["win64"] set "ARCH=64"
+if /I ["%ARCH%"] == ["win64"] set "ARCH=64"
-if /I ["%3"]     == ["debug"] set "CASDEB=d"
+if /I ["%3"]     == ["debug"] set "CASDEB=d"
-if /I ["%3"]     == ["d"]     set "CASDEB=d"
+if /I ["%3"]     == ["d"]     set "CASDEB=d"
-if /I ["%3"]     == ["i"]     set "CASDEB=i"
+if /I ["%3"]     == ["i"]     set "CASDEB=i"
-if /I ["%3"]     == ["relwithdeb"] set "CASDEB=i"
+if /I ["%3"]     == ["relwithdeb"] set "CASDEB=i"
-
+
-rem ----- Decode VCVER variable and define related ones -----
+rem ----- Decode VCVER variable and define related ones -----
-rem
+rem
-rem VCFMT - "vc" followed by full version number of Visual Studio toolset
+rem VCFMT - "vc" followed by full version number of Visual Studio toolset
-rem         (same as VCVER without optional suffix "-uwp")
+rem         (same as VCVER without optional suffix "-uwp")
-rem VCLIB - name of folder contining binaries
+rem VCLIB - name of folder contining binaries
-rem         (same as VCVER except without third version in number)
+rem         (same as VCVER except without third version in number)
-rem VCPROP - name of required Visual Studion Workload (starting with VS 2017)
+rem VCPROP - name of required Visual Studion Workload (starting with VS 2017)
-rem
+rem
-rem Note that for VS before 2015 (vc14) always
+rem Note that for VS before 2015 (vc14) always
-rem VCFMT=VCLIB=VCVER and VCPROP=NativeDesktop
+rem VCFMT=VCLIB=VCVER and VCPROP=NativeDesktop
-
+
-rem Since VS 2017, environment variables like VS100COMNTOOLS are not defined 
+rem Since VS 2017, environment variables like VS100COMNTOOLS are not defined 
-rem any more, we can only use vswhere.exe tool to find Visual Studio.
+rem any more, we can only use vswhere.exe tool to find Visual Studio.
-rem Add path to vswhere.exe
+rem Add path to vswhere.exe
-if /I not "%VCFMT%" == "gcc" (
+if /I not "%VCFMT%" == "gcc" (
-  set "PATH=%PATH%;%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
+  set "PATH=%PATH%;%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
-)
+)
-
+
-rem for vc10-12, interpretation is trivial
+rem for vc10-12, interpretation is trivial
-set VCFMT=%VCVER%
+set VCFMT=%VCVER%
-set VCLIB=%VCVER:~0,4%
+set VCLIB=%VCVER:~0,4%
-set VCPROP=NativeDesktop
+set VCPROP=NativeDesktop
-rem vc14 and later can have optional suffix "-uwp"
+rem vc14 and later can have optional suffix "-uwp"
-if "%VCVER:~-4%" == "-uwp" (
+if "%VCVER:~-4%" == "-uwp" (
-  set VCFMT=%VCVER:~0,-4%
+  set VCFMT=%VCVER:~0,-4%
-  set VCLIB=%VCLIB%-uwp
+  set VCLIB=%VCLIB%-uwp
-  set VCPROP=Universal
+  set VCPROP=Universal
-)
+)
-rem echo VCVER=%VCVER% VCFMT=%VCFMT% VCLIB=%VCLIB% VCPROP=%VCPROP%
+rem echo VCVER=%VCVER% VCFMT=%VCFMT% VCLIB=%VCLIB% VCPROP=%VCPROP%
-
+
-rem ----- Parsing of Visual Studio platform -----
+rem ----- Parsing of Visual Studio platform -----
-set "VisualStudioExpressName=VCExpress"
+set "VisualStudioExpressName=VCExpress"
-
+
-if not "%DevEnvDir%" == "" (
+if not "%DevEnvDir%" == "" (
-  rem If DevEnvDir is already defined (e.g. in custom.bat), use that value
+  rem If DevEnvDir is already defined (e.g. in custom.bat), use that value
-) else if /I "%VCFMT%" == "vc9" (
+) else if /I "%VCFMT%" == "vc9" (
-  set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
+  set "DevEnvDir=%VS90COMNTOOLS%..\IDE"
-) else if /I "%VCFMT%" == "vc10" (
+) else if /I "%VCFMT%" == "vc10" (
-  set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
+  set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
-) else if /I "%VCFMT%" == "vc11" (
+) else if /I "%VCFMT%" == "vc11" (
-  set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
+  set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
-  rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
+  rem Visual Studio Express starting from VS 2012 is called "for Windows Desktop"
-  rem and has a new name for executable - WDExpress
+  rem and has a new name for executable - WDExpress
-  set "VisualStudioExpressName=WDExpress"
+  set "VisualStudioExpressName=WDExpress"
-) else if /I "%VCFMT%" == "vc12" (
+) else if /I "%VCFMT%" == "vc12" (
-  set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
+  set "DevEnvDir=%VS120COMNTOOLS%..\IDE"
-  set "VisualStudioExpressName=WDExpress"
+  set "VisualStudioExpressName=WDExpress"
-) else if /I "%VCFMT%" == "vc14" (
+) else if /I "%VCFMT%" == "vc14" (
-  set "DevEnvDir=%VS140COMNTOOLS%..\IDE"
+  set "DevEnvDir=%VS140COMNTOOLS%..\IDE"
-) else if /I "%VCFMT%" == "vc141" (
+) else if /I "%VCFMT%" == "vc141" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "DevEnvDir=%%i\Common7\IDE\"
+    set "DevEnvDir=%%i\Common7\IDE\"
-  )
+  )
-) else if /I "%VCFMT%" == "vc142" (
+) else if /I "%VCFMT%" == "vc142" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "DevEnvDir=%%i\Common7\IDE\"
+    set "DevEnvDir=%%i\Common7\IDE\"
-  )  
+  )  
-) else if /I "%VCFMT%" == "vc143" (
+) else if /I "%VCFMT%" == "vc143" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[17.0,17.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[17.0,17.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "DevEnvDir=%%i\Common7\IDE\"
+    set "DevEnvDir=%%i\Common7\IDE\"
-  ) 
+  ) 
-) else if /I "%VCFMT%" == "gcc" (
+) else if /I "%VCFMT%" == "gcc" (
-  rem MinGW
+  rem MinGW
-) else (
+) else (
-  echo Error: wrong VS identifier
+  echo Error: wrong VS identifier
-  exit /B
+  exit /B
-)
+)
-
+
-rem ----- Parsing vcvarsall for qt samples and define PlatformToolset -----
+rem ----- Parsing vcvarsall for qt samples and define PlatformToolset -----
-if /I "%VCFMT%" == "vc9" (
+if /I "%VCFMT%" == "vc9" (
-  set "VCVARS=%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
+  set "VCVARS=%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"
-  set "VCPlatformToolSet=v90"
+  set "VCPlatformToolSet=v90"
-) else if /I "%VCFMT%" == "vc10" (
+) else if /I "%VCFMT%" == "vc10" (
-  set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
+  set "VCVARS=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"
-  set "VCPlatformToolSet=v100"
+  set "VCPlatformToolSet=v100"
-) else if /I "%VCFMT%" == "vc11" (
+) else if /I "%VCFMT%" == "vc11" (
-  set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
+  set "VCVARS=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"
-  set "VCPlatformToolSet=v110"
+  set "VCPlatformToolSet=v110"
-) else if /I "%VCFMT%" == "vc12" (
+) else if /I "%VCFMT%" == "vc12" (
-  set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
+  set "VCVARS=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
-  set "VCPlatformToolSet=v120"
+  set "VCPlatformToolSet=v120"
-) else if /I "%VCFMT%" == "vc14" (
+) else if /I "%VCFMT%" == "vc14" (
-  set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
+  set "VCVARS=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
-  set "VCPlatformToolSet=v140"
+  set "VCPlatformToolSet=v140"
-) else if /I "%VCFMT%" == "vc141" (
+) else if /I "%VCFMT%" == "vc141" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[15.0,15.99]" -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
-  )
+  )
-  set "VCPlatformToolSet=v141"
+  set "VCPlatformToolSet=v141"
-) else if /I "%VCFMT%" == "vc142" (
+) else if /I "%VCFMT%" == "vc142" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[16.0,16.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
-  ) 
+  ) 
-  set "VCPlatformToolSet=v142"
+  set "VCPlatformToolSet=v142"
-) else if /I "%VCFMT%" == "vc143" (
+) else if /I "%VCFMT%" == "vc143" (
-  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[17.0,17.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
+  for /f "usebackq delims=" %%i in (`vswhere.exe -version "[17.0,17.99]" -latest -requires Microsoft.VisualStudio.Workload.%VCPROP% -property installationPath`) do (
-    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+    set "VCVARS=%%i\VC\Auxiliary\Build\vcvarsall.bat"
-  ) 
+  ) 
-  set "VCPlatformToolSet=v142"  
+  set "VCPlatformToolSet=v142"  
-) else if /I "%VCFMT%" == "gcc" (
+) else if /I "%VCFMT%" == "gcc" (
-  rem MinGW
+  rem MinGW
-) else (
+) else (
-  echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
+  echo Error: first argument ^(%VCVER%^) should specify supported version of Visual C++,
-  echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
+  echo one of: vc10 ^(VS 2010 SP3^), vc11 ^(VS 2012 SP3^), vc12 ^(VS 2013^) or vc14 ^(VS 2015^)
-  exit
+  exit
-)
+)
-
+
-rem ----- For compatibility with external application using CASROOT -----
+rem ----- For compatibility with external application using CASROOT -----
-if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
+if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
-
+
-rem ----- Define path to 3rdparty products -----
+rem ----- Define path to 3rdparty products -----
-if ["%THIRDPARTY_DIR%"] == [""] set "THIRDPARTY_DIR=@3RDPARTY_DIR@"
+if ["%THIRDPARTY_DIR%"] == [""] set "THIRDPARTY_DIR=@3RDPARTY_DIR@"
-
+
-if ["%ARCH%"] == ["32"] set VCARCH=x86
+if ["%ARCH%"] == ["32"] set VCARCH=x86
-if ["%ARCH%"] == ["64"] set VCARCH=amd64
+if ["%ARCH%"] == ["64"] set VCARCH=amd64
-
+
-if /I ["%1"] == ["vc141"] set "VCVER=vc14"
+if /I ["%1"] == ["vc141"] set "VCVER=vc14"
-if /I ["%1"] == ["vc142"] set "VCVER=vc14"
+if /I ["%1"] == ["vc142"] set "VCVER=vc14"
-if /I ["%1"] == ["vc143"] set "VCVER=vc14"
+if /I ["%1"] == ["vc143"] set "VCVER=vc14"
-
+
-if exist "%CASROOT%\custom.bat" (
+if exist "%CASROOT%\custom.bat" (
-  call "%CASROOT%\custom.bat" %VCVER% %ARCH% %CASDEB%
+  call "%CASROOT%\custom.bat" %VCVER% %ARCH% %CASDEB%
-)
+)
-
+
-if not ["%QTDIR%"] == [""] (
+if not ["%QTDIR%"] == [""] (
-  set "PATH=%QTDIR%/bin;%PATH%"
+  set "PATH=%QTDIR%/bin;%PATH%"
-  set "QT_PLUGIN_PATH=%QTDIR%/plugins"
+  set "QT_PLUGIN_PATH=%QTDIR%/plugins"
-)
+)
-if not ["%TCL_DIR%"] == [""]           set "PATH=%TCL_DIR%;%PATH%"
+if not ["%TCL_DIR%"] == [""]           set "PATH=%TCL_DIR%;%PATH%"
-if not ["%TK_DIR%"] == [""]            set "PATH=%TK_DIR%;%PATH%"
+if not ["%TK_DIR%"] == [""]            set "PATH=%TK_DIR%;%PATH%"
-if not ["%FREETYPE_DIR%"] == [""]      set "PATH=%FREETYPE_DIR%;%PATH%"
+if not ["%FREETYPE_DIR%"] == [""]      set "PATH=%FREETYPE_DIR%;%PATH%"
-if not ["%FREEIMAGE_DIR%"] == [""]     set "PATH=%FREEIMAGE_DIR%;%PATH%"
+if not ["%FREEIMAGE_DIR%"] == [""]     set "PATH=%FREEIMAGE_DIR%;%PATH%"
-if not ["%EGL_DIR%"] == [""]           set "PATH=%EGL_DIR%;%PATH%"
+if not ["%EGL_DIR%"] == [""]           set "PATH=%EGL_DIR%;%PATH%"
-if not ["%GLES2_DIR%"] == [""]         set "PATH=%GLES2_DIR%;%PATH%"
+if not ["%GLES2_DIR%"] == [""]         set "PATH=%GLES2_DIR%;%PATH%"
-if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
+if not ["%TBB_DIR%"] == [""]           set "PATH=%TBB_DIR%;%PATH%"
-if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
+if not ["%VTK_DIR%"] == [""]           set "PATH=%VTK_DIR%;%PATH%"
-if not ["%FFMPEG_DIR%"] == [""]        set "PATH=%FFMPEG_DIR%;%PATH%"
+if not ["%FFMPEG_DIR%"] == [""]        set "PATH=%FFMPEG_DIR%;%PATH%"
-if not ["%OPENVR_DIR%"] == [""]        set "PATH=%OPENVR_DIR%;%PATH%"
+if not ["%OPENVR_DIR%"] == [""]        set "PATH=%OPENVR_DIR%;%PATH%"
-
+
-rem ----- Set path to 3rd party and OCCT libraries -----
+rem ----- Set path to 3rd party and OCCT libraries -----
-if not "%CSF_OCCTBinPath%" == "" (
+if not "%CSF_OCCTBinPath%" == "" (
-  set "PATH=%CSF_OCCTBinPath%;%PATH%"
+  set "PATH=%CSF_OCCTBinPath%;%PATH%"
-)
+)
-
+
-if not ["%TK_DIR%"] == ["%TCL_DIR%"] (
+if not ["%TK_DIR%"] == ["%TCL_DIR%"] (
-  if not ["%TK_DIR%"] == [""]  set "TK_LIBRARY=%TK_DIR%/../lib/tk%TK_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%"
+  if not ["%TCL_DIR%"] == [""] set "TCL_LIBRARY=%TCL_DIR%/../lib/tcl%TCL_VERSION_WITH_DOT%"
-)
+)
-
+
-rem ----- Set envoronment variables used by OCCT -----
+rem ----- Set envoronment variables used by OCCT -----
-set  CSF_LANGUAGE=us
+set  CSF_LANGUAGE=us
-set  MMGT_CLEAR=1
+set  MMGT_CLEAR=1
-set "CSF_SHMessage=%CSF_OCCTResourcePath%\SHMessage"
+set "CSF_SHMessage=%CSF_OCCTResourcePath%\SHMessage"
-set "CSF_MDTVTexturesDirectory=%CSF_OCCTResourcePath%\Textures"
+set "CSF_MDTVTexturesDirectory=%CSF_OCCTResourcePath%\Textures"
-set "CSF_ShadersDirectory=%CSF_OCCTResourcePath%\Shaders"
+set "CSF_ShadersDirectory=%CSF_OCCTResourcePath%\Shaders"
-set "CSF_XSMessage=%CSF_OCCTResourcePath%\XSMessage"
+set "CSF_XSMessage=%CSF_OCCTResourcePath%\XSMessage"
-set "CSF_TObjMessage=%CSF_OCCTResourcePath%\TObj"
+set "CSF_TObjMessage=%CSF_OCCTResourcePath%\TObj"
-set "CSF_StandardDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_StandardDefaults=%CSF_OCCTResourcePath%\StdResource"
-set "CSF_PluginDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_PluginDefaults=%CSF_OCCTResourcePath%\StdResource"
-set "CSF_XCAFDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_XCAFDefaults=%CSF_OCCTResourcePath%\StdResource"
-set "CSF_TObjDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_TObjDefaults=%CSF_OCCTResourcePath%\StdResource"
-set "CSF_StandardLiteDefaults=%CSF_OCCTResourcePath%\StdResource"
+set "CSF_StandardLiteDefaults=%CSF_OCCTResourcePath%\StdResource"
-set "CSF_IGESDefaults=%CSF_OCCTResourcePath%\XSTEPResource"
+set "CSF_IGESDefaults=%CSF_OCCTResourcePath%\XSTEPResource"
-set "CSF_STEPDefaults=%CSF_OCCTResourcePath%\XSTEPResource"
+set "CSF_STEPDefaults=%CSF_OCCTResourcePath%\XSTEPResource"
-set "CSF_XmlOcafResource=%CSF_OCCTResourcePath%\XmlOcafResource"
+set "CSF_XmlOcafResource=%CSF_OCCTResourcePath%\XmlOcafResource"
-set "CSF_MIGRATION_TYPES=%CSF_OCCTResourcePath%\StdResource\MigrationSheet.txt"
+set "CSF_MIGRATION_TYPES=%CSF_OCCTResourcePath%\StdResource\MigrationSheet.txt"
-
+
-rem ----- Draw Harness special stuff -----
+rem ----- Draw Harness special stuff -----
-if exist "%CSF_OCCTResourcePath%\DrawResources" (
+if exist "%CSF_OCCTResourcePath%\DrawResources" (
-  set "DRAWHOME=%CSF_OCCTResourcePath%\DrawResources"
+  set "DRAWHOME=%CSF_OCCTResourcePath%\DrawResources"
-  set "CSF_DrawPluginDefaults=%CSF_OCCTResourcePath%\DrawResources"
+  set "CSF_DrawPluginDefaults=%CSF_OCCTResourcePath%\DrawResources"
-
+
-  if exist "%CSF_OCCTResourcePath%\DrawResources\DrawDefault" (
+  if exist "%CSF_OCCTResourcePath%\DrawResources\DrawDefault" (
-    set "DRAWDEFAULT=%CSF_OCCTResourcePath%\DrawResources\DrawDefault"
+    set "DRAWDEFAULT=%CSF_OCCTResourcePath%\DrawResources\DrawDefault"
-  )
+  )
-)
+)

adm/templates/env.build.sh.in

@@ -1,137 +1,137 @@
-#!/bin/bash
+#!/bin/bash
-
+
-aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-
+
-# ----- For compatibility with external application using CASROOT -----
+# ----- For compatibility with external application using CASROOT -----
-if [ "${CASROOT}" == "" ]; then
+if [ "${CASROOT}" == "" ]; then
-  export CASROOT="${aScriptPath}"
+  export CASROOT="${aScriptPath}"
-fi
+fi
-
+
-# ----- Define path to 3rdparty products -----
+# ----- Define path to 3rdparty products -----
-export THIRDPARTY_DIR="@3RDPARTY_DIR@"
+export THIRDPARTY_DIR="@3RDPARTY_DIR@"
-
+
-# ----- Read script arguments -----
+# ----- Read script arguments -----
-shopt -s nocasematch
+shopt -s nocasematch
-export CASDEB="";
+export CASDEB="";
-if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
+if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
-if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
+if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
-if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
+if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
-if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
+if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
-shopt -u nocasematch
+shopt -u nocasematch
-
+
-# ----- Set path to 3rd party and OCCT libraries -----
+# ----- Set path to 3rd party and OCCT libraries -----
-anArch=`uname -m`
+anArch=`uname -m`
-if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
+if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
-  export ARCH="32";
+  export ARCH="32";
-else
+else
-  export ARCH="64";
+  export ARCH="64";
-fi
+fi
-
+
-aSystem=`uname -s`
+aSystem=`uname -s`
-if [ "$aSystem" == "Darwin" ]; then
+if [ "$aSystem" == "Darwin" ]; then
-  export WOKSTATION="mac";
+  export WOKSTATION="mac";
-  export ARCH="64";
+  export ARCH="64";
-else
+else
-  export WOKSTATION="lin";
+  export WOKSTATION="lin";
-fi
+fi
-
+
-# ----- Set local settings -----
+# ----- Set local settings -----
-if [ -e "${CASROOT}/custom.sh" ]; then
+if [ -e "${CASROOT}/custom.sh" ]; then
-  source "${CASROOT}/custom.sh" "${CASDEB}" "${ARCH}"
+  source "${CASROOT}/custom.sh" "${CASDEB}" "${ARCH}"
-fi
+fi
-
+
-THRDPARTY_PATH=""
+THRDPARTY_PATH=""
-if [ "$TCL_DIR" != "" ]; then
+if [ "$TCL_DIR" != "" ]; then
-  THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$TK_DIR" != "" ]; then
+if [ "$TK_DIR" != "" ]; then
-  THRDPARTY_PATH="${TK_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${TK_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$FREETYPE_DIR" != "" ]; then
+if [ "$FREETYPE_DIR" != "" ]; then
-  THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$FREEIMAGE_DIR" != "" ]; then
+if [ "$FREEIMAGE_DIR" != "" ]; then
-  THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$TBB_DIR" != "" ]; then
+if [ "$TBB_DIR" != "" ]; then
-  THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$VTK_DIR" != "" ]; then
+if [ "$VTK_DIR" != "" ]; then
-  THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$FFMPEG_DIR" != "" ]; then
+if [ "$FFMPEG_DIR" != "" ]; then
-  THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$QTDIR" != "" ]; then
+if [ "$QTDIR" != "" ]; then
-  THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$TK_DIR" != "$TCL_DIR" ]; then
+if [ "$TK_DIR" != "$TCL_DIR" ]; then
-  if [ "$TK_DIR" != "" ]; then
+  if [ "$TK_DIR" != "" ]; then
-    export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"
+    export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"
-  fi
+  fi
-  if [ "$TCL_DIR" != "" ]; then
+  if [ "$TCL_DIR" != "" ]; then
-    export TCL_LIBRARY="${TCL_DIR}/../lib/tcl${TCL_VERSION_WITH_DOT}"
+    export TCL_LIBRARY="${TCL_DIR}/../lib/tcl${TCL_VERSION_WITH_DOT}"
-  fi
+  fi
-fi
+fi
-
+
-if [ "$LD_LIBRARY_PATH" != "" ]; then
+if [ "$LD_LIBRARY_PATH" != "" ]; then
-  export LD_LIBRARY_PATH="${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
+  export LD_LIBRARY_PATH="${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
-else
+else
-  export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
+  export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$CSF_OCCTBinPath" != "" ]; then
+if [ "$CSF_OCCTBinPath" != "" ]; then
-  export PATH="${CSF_OCCTBinPath}:${PATH}"
+  export PATH="${CSF_OCCTBinPath}:${PATH}"
-fi
+fi
-
+
-if [ "$CSF_OCCTLibPath" != "" ]; then
+if [ "$CSF_OCCTLibPath" != "" ]; then
-  if [ "$LD_LIBRARY_PATH" != "" ]; then
+  if [ "$LD_LIBRARY_PATH" != "" ]; then
-    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
+    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
-  else
+  else
-    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}"
+    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}"
-  fi
+  fi
-fi
+fi
-
+
-if [ "$WOKSTATION" == "mac" ]; then
+if [ "$WOKSTATION" == "mac" ]; then
-  if [ "$DYLD_LIBRARY_PATH" != "" ]; then
+  if [ "$DYLD_LIBRARY_PATH" != "" ]; then
-    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
+    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
-  else
+  else
-    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
+    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
-  fi
+  fi
-fi
+fi
-
+
-# ----- Set envoronment variables used by OCCT -----
+# ----- Set envoronment variables used by OCCT -----
-export CSF_LANGUAGE=us
+export CSF_LANGUAGE=us
-export MMGT_CLEAR=1
+export MMGT_CLEAR=1
-export CSF_SHMessage="${CSF_OCCTResourcePath}/SHMessage"
+export CSF_SHMessage="${CSF_OCCTResourcePath}/SHMessage"
-export CSF_MDTVTexturesDirectory="${CSF_OCCTResourcePath}/Textures"
+export CSF_MDTVTexturesDirectory="${CSF_OCCTResourcePath}/Textures"
-export CSF_ShadersDirectory="${CSF_OCCTResourcePath}/Shaders"
+export CSF_ShadersDirectory="${CSF_OCCTResourcePath}/Shaders"
-export CSF_XSMessage="${CSF_OCCTResourcePath}/XSMessage"
+export CSF_XSMessage="${CSF_OCCTResourcePath}/XSMessage"
-export CSF_TObjMessage="${CSF_OCCTResourcePath}/TObj"
+export CSF_TObjMessage="${CSF_OCCTResourcePath}/TObj"
-export CSF_StandardDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_StandardDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_PluginDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_PluginDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_XCAFDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_XCAFDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_TObjDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_TObjDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_StandardLiteDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_StandardLiteDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_IGESDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
+export CSF_IGESDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
-export CSF_STEPDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
+export CSF_STEPDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
-export CSF_XmlOcafResource="${CSF_OCCTResourcePath}/XmlOcafResource"
+export CSF_XmlOcafResource="${CSF_OCCTResourcePath}/XmlOcafResource"
-export CSF_MIGRATION_TYPES="${CSF_OCCTResourcePath}/StdResource/MigrationSheet.txt"
+export CSF_MIGRATION_TYPES="${CSF_OCCTResourcePath}/StdResource/MigrationSheet.txt"
-
+
-# ----- Draw Harness special stuff -----
+# ----- Draw Harness special stuff -----
-if [ -e "${CSF_OCCTResourcePath}/DrawResources" ]; then
+if [ -e "${CSF_OCCTResourcePath}/DrawResources" ]; then
-  export DRAWHOME="${CSF_OCCTResourcePath}/DrawResources"
+  export DRAWHOME="${CSF_OCCTResourcePath}/DrawResources"
-  export CSF_DrawPluginDefaults="${CSF_OCCTResourcePath}/DrawResources"
+  export CSF_DrawPluginDefaults="${CSF_OCCTResourcePath}/DrawResources"
-
+
-  if [ -e "${CSF_OCCTResourcePath}/DrawResources/DrawDefault" ]; then
+  if [ -e "${CSF_OCCTResourcePath}/DrawResources/DrawDefault" ]; then
-    export DRAWDEFAULT="${CSF_OCCTResourcePath}/DrawResources/DrawDefault"
+    export DRAWDEFAULT="${CSF_OCCTResourcePath}/DrawResources/DrawDefault"
-  fi
+  fi
-fi
+fi

adm/templates/env.install.sh.in

@@ -1,139 +1,139 @@
-#!/bin/bash
+#!/bin/bash
-
+
-aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-
+
-# ----- For compatibility with external application using CASROOT -----
+# ----- For compatibility with external application using CASROOT -----
-if [ "${CASROOT}" == "" ]; then
+if [ "${CASROOT}" == "" ]; then
-  export CASROOT="@INSTALL_DIR@"
+  export CASROOT="@INSTALL_DIR@"
-fi
+fi
-
+
-# ----- Define path to 3rdparty products -----
+# ----- Define path to 3rdparty products -----
-if [ "${THIRDPARTY_DIR}" == "" ]; then
+if [ "${THIRDPARTY_DIR}" == "" ]; then
-  export THIRDPARTY_DIR="@3RDPARTY_DIR@"
+  export THIRDPARTY_DIR="@3RDPARTY_DIR@"
-fi
+fi
-
+
-# ----- Read script arguments -----
+# ----- Read script arguments -----
-shopt -s nocasematch
+shopt -s nocasematch
-export CASDEB="";
+export CASDEB="";
-if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
+if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
-if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
+if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
-if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
+if [[ "$1" == "relwithdeb" ]]; then export CASDEB="i"; fi
-if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
+if [[ "$1" == "i" ]]; then export CASDEB="i"; fi
-shopt -u nocasematch
+shopt -u nocasematch
-
+
-# ----- Set path to 3rd party and OCCT libraries -----
+# ----- Set path to 3rd party and OCCT libraries -----
-anArch=`uname -m`
+anArch=`uname -m`
-if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
+if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
-  export ARCH="32";
+  export ARCH="32";
-else
+else
-  export ARCH="64";
+  export ARCH="64";
-fi
+fi
-
+
-aSystem=`uname -s`
+aSystem=`uname -s`
-if [ "$aSystem" == "Darwin" ]; then
+if [ "$aSystem" == "Darwin" ]; then
-  export WOKSTATION="mac";
+  export WOKSTATION="mac";
-  export ARCH="64";
+  export ARCH="64";
-else
+else
-  export WOKSTATION="lin";
+  export WOKSTATION="lin";
-fi
+fi
-
+
-# ----- Set local settings -----
+# ----- Set local settings -----
-if [ -e "${CASROOT}/@INSTALL_DIR_SCRIPT@/custom.sh" ]; then
+if [ -e "${CASROOT}/@INSTALL_DIR_SCRIPT@/custom.sh" ]; then
-  source "${CASROOT}/@INSTALL_DIR_SCRIPT@/custom.sh" "${CASDEB}" "${ARCH}"
+  source "${CASROOT}/@INSTALL_DIR_SCRIPT@/custom.sh" "${CASDEB}" "${ARCH}"
-fi
+fi
-
+
-THRDPARTY_PATH=""
+THRDPARTY_PATH=""
-if [ "$TCL_DIR" != "" ]; then
+if [ "$TCL_DIR" != "" ]; then
-  THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$TK_DIR" != "" ]; then
+if [ "$TK_DIR" != "" ]; then
-  THRDPARTY_PATH="${TK_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${TK_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$FREETYPE_DIR" != "" ]; then
+if [ "$FREETYPE_DIR" != "" ]; then
-  THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$FREEIMAGE_DIR" != "" ]; then
+if [ "$FREEIMAGE_DIR" != "" ]; then
-  THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$TBB_DIR" != "" ]; then
+if [ "$TBB_DIR" != "" ]; then
-  THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$VTK_DIR" != "" ]; then
+if [ "$VTK_DIR" != "" ]; then
-  THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${VTK_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$FFMPEG_DIR" != "" ]; then
+if [ "$FFMPEG_DIR" != "" ]; then
-  THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${FFMPEG_DIR}:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$QTDIR" != "" ]; then
+if [ "$QTDIR" != "" ]; then
-  THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
+  THRDPARTY_PATH="${QTDIR}/lib:${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$TK_DIR" != "$TCL_DIR" ]; then
+if [ "$TK_DIR" != "$TCL_DIR" ]; then
-  if [ "$TK_DIR" != "" ]; then
+  if [ "$TK_DIR" != "" ]; then
-    export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"
+    export TK_LIBRARY="${TK_DIR}/../lib/tk${TK_VERSION_WITH_DOT}"
-  fi
+  fi
-  if [ "$TCL_DIR" != "" ]; then
+  if [ "$TCL_DIR" != "" ]; then
-    export TCL_LIBRARY="${TCL_DIR}/../lib/tcl${TCL_VERSION_WITH_DOT}"
+    export TCL_LIBRARY="${TCL_DIR}/../lib/tcl${TCL_VERSION_WITH_DOT}"
-  fi
+  fi
-fi
+fi
-
+
-if [ "$LD_LIBRARY_PATH" != "" ]; then
+if [ "$LD_LIBRARY_PATH" != "" ]; then
-  export LD_LIBRARY_PATH="${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
+  export LD_LIBRARY_PATH="${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
-else
+else
-  export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
+  export LD_LIBRARY_PATH="${THRDPARTY_PATH}"
-fi
+fi
-
+
-if [ "$CSF_OCCTBinPath" != "" ]; then
+if [ "$CSF_OCCTBinPath" != "" ]; then
-  export PATH="${CSF_OCCTBinPath}:${PATH}"
+  export PATH="${CSF_OCCTBinPath}:${PATH}"
-fi
+fi
-
+
-if [ "$CSF_OCCTLibPath" != "" ]; then
+if [ "$CSF_OCCTLibPath" != "" ]; then
-  if [ "$LD_LIBRARY_PATH" != "" ]; then
+  if [ "$LD_LIBRARY_PATH" != "" ]; then
-    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
+    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}:${LD_LIBRARY_PATH}"
-  else
+  else
-    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}"
+    export LD_LIBRARY_PATH="${CSF_OCCTLibPath}"
-  fi
+  fi
-fi
+fi
-
+
-if [ "$WOKSTATION" == "mac" ]; then
+if [ "$WOKSTATION" == "mac" ]; then
-  if [ "$DYLD_LIBRARY_PATH" != "" ]; then
+  if [ "$DYLD_LIBRARY_PATH" != "" ]; then
-    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
+    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
-  else
+  else
-    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
+    export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
-  fi
+  fi
-fi
+fi
-
+
-# ----- Set envoronment variables used by OCCT -----
+# ----- Set envoronment variables used by OCCT -----
-export CSF_LANGUAGE=us
+export CSF_LANGUAGE=us
-export MMGT_CLEAR=1
+export MMGT_CLEAR=1
-export CSF_SHMessage="${CSF_OCCTResourcePath}/SHMessage"
+export CSF_SHMessage="${CSF_OCCTResourcePath}/SHMessage"
-export CSF_MDTVTexturesDirectory="${CSF_OCCTResourcePath}/Textures"
+export CSF_MDTVTexturesDirectory="${CSF_OCCTResourcePath}/Textures"
-export CSF_ShadersDirectory="${CSF_OCCTResourcePath}/Shaders"
+export CSF_ShadersDirectory="${CSF_OCCTResourcePath}/Shaders"
-export CSF_XSMessage="${CSF_OCCTResourcePath}/XSMessage"
+export CSF_XSMessage="${CSF_OCCTResourcePath}/XSMessage"
-export CSF_TObjMessage="${CSF_OCCTResourcePath}/TObj"
+export CSF_TObjMessage="${CSF_OCCTResourcePath}/TObj"
-export CSF_StandardDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_StandardDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_PluginDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_PluginDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_XCAFDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_XCAFDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_TObjDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_TObjDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_StandardLiteDefaults="${CSF_OCCTResourcePath}/StdResource"
+export CSF_StandardLiteDefaults="${CSF_OCCTResourcePath}/StdResource"
-export CSF_IGESDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
+export CSF_IGESDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
-export CSF_STEPDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
+export CSF_STEPDefaults="${CSF_OCCTResourcePath}/XSTEPResource"
-export CSF_XmlOcafResource="${CSF_OCCTResourcePath}/XmlOcafResource"
+export CSF_XmlOcafResource="${CSF_OCCTResourcePath}/XmlOcafResource"
-export CSF_MIGRATION_TYPES="${CSF_OCCTResourcePath}/StdResource/MigrationSheet.txt"
+export CSF_MIGRATION_TYPES="${CSF_OCCTResourcePath}/StdResource/MigrationSheet.txt"
-
+
-# ----- Draw Harness special stuff -----
+# ----- Draw Harness special stuff -----
-if [ -e "${CSF_OCCTResourcePath}/DrawResources" ]; then
+if [ -e "${CSF_OCCTResourcePath}/DrawResources" ]; then
-  export DRAWHOME="${CSF_OCCTResourcePath}/DrawResources"
+  export DRAWHOME="${CSF_OCCTResourcePath}/DrawResources"
-  export CSF_DrawPluginDefaults="${CSF_OCCTResourcePath}/DrawResources"
+  export CSF_DrawPluginDefaults="${CSF_OCCTResourcePath}/DrawResources"
-
+
-  if [ -e "${CSF_OCCTResourcePath}/DrawResources/DrawDefault" ]; then
+  if [ -e "${CSF_OCCTResourcePath}/DrawResources/DrawDefault" ]; then
-    export DRAWDEFAULT="${CSF_OCCTResourcePath}/DrawResources/DrawDefault"
+    export DRAWDEFAULT="${CSF_OCCTResourcePath}/DrawResources/DrawDefault"
-  fi
+  fi
-fi
+fi

adm/templates/env.samples.bat.in

@@ -1,32 +1,32 @@
-@echo off
+@echo off
-
+
-if exist "%~dp0custom.bat" (
+if exist "%~dp0custom.bat" (
-  call "%~dp0custom.bat" %1 %2 %3
+  call "%~dp0custom.bat" %1 %2 %3
-)
+)
-
+
-call "@INSTALL_DIR_ABSOLUTE@\@INSTALL_DIR_SCRIPT@\env.bat" %1 %2 %3
+call "@INSTALL_DIR_ABSOLUTE@\@INSTALL_DIR_SCRIPT@\env.bat" %1 %2 %3
-if /I ["%1"] == ["vc141"] set "VCVER=vc141"
+if /I ["%1"] == ["vc141"] set "VCVER=vc141"
-if /I ["%1"] == ["vc142"] set "VCVER=vc142"
+if /I ["%1"] == ["vc142"] set "VCVER=vc142"
-if /I ["%1"] == ["vc143"] set "VCVER=vc143"
+if /I ["%1"] == ["vc143"] set "VCVER=vc143"
-set "BIN_DIR=win%ARCH%\%VCVER%\bind"
+set "BIN_DIR=win%ARCH%\%VCVER%\bind"
-set "LIB_DIR=win%ARCH%\%VCVER%\libd"
+set "LIB_DIR=win%ARCH%\%VCVER%\libd"
-
+
-if ["%CASDEB%"] == [""] (
+if ["%CASDEB%"] == [""] (
-  set "BIN_DIR=win%ARCH%\%VCVER%\bin"
+  set "BIN_DIR=win%ARCH%\%VCVER%\bin"
-  set "LIB_DIR=win%ARCH%\%VCVER%\lib"
+  set "LIB_DIR=win%ARCH%\%VCVER%\lib"
-)
+)
-
+
-set "PATH=%~dp0%BIN_DIR%;%PATH%"
+set "PATH=%~dp0%BIN_DIR%;%PATH%"
-
+
-if not "%QTDIR%" == "" (
+if not "%QTDIR%" == "" (
-  set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
+  set "RES_DIR=%~dp0win%ARCH%\%VCVER%\res"
-
+
-  set "CSF_ResourcesDefaults=!RES_DIR!"
+  set "CSF_ResourcesDefaults=!RES_DIR!"
-  set "CSF_TutorialResourcesDefaults=!RES_DIR!"
+  set "CSF_TutorialResourcesDefaults=!RES_DIR!"
-  set "CSF_IEResourcesDefaults=!RES_DIR!"
+  set "CSF_IEResourcesDefaults=!RES_DIR!"
-
+
-  set "PATH=%QTDIR%/bin;%PATH%"
+  set "PATH=%QTDIR%/bin;%PATH%"
-  set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"
+  set "QT_QPA_PLATFORM_PLUGIN_PATH=%QTDIR%\plugins\platforms"
-)
+)
-
+
-set "CSF_OCCTOverviewSampleCodePath=%~dp0..\..\OCCTOverview\code"
+set "CSF_OCCTOverviewSampleCodePath=%~dp0..\..\OCCTOverview\code"

adm/templates/env.samples.sh.in

@@ -1,24 +1,24 @@
-#!/bin/bash
+#!/bin/bash
-
+
-export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
+
-if [ -e "custom.sh" ]; then
+if [ -e "custom.sh" ]; then
-   source "custom.sh";
+   source "custom.sh";
-fi
+fi
-
+
-if [ -e "@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SCRIPT@/env.sh" ]; then
+if [ -e "@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SCRIPT@/env.sh" ]; then
-   source "@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SCRIPT@/env.sh";
+   source "@INSTALL_DIR_ABSOLUTE@/@INSTALL_DIR_SCRIPT@/env.sh";
-fi
+fi
-
+
-if test "${QTDIR}" == ""; then
+if test "${QTDIR}" == ""; then
-   echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script."
+   echo "Environment variable \"QTDIR\" not defined. Define it in \"custom.sh\" script."
-   exit 1
+   exit 1
-fi
+fi
-
+
-host=`uname -s`
+host=`uname -s`
-export STATION=$host
+export STATION=$host
-export RES_DIR=${aSamplePath}/${STATION}/res
+export RES_DIR=${aSamplePath}/${STATION}/res
-
+
-export PATH=${QTDIR}/bin:${PATH}
+export PATH=${QTDIR}/bin:${PATH}
-
+
-export "CSF_OCCTOverviewSampleCodePath=${aSamplePath}/../../OCCTOverview/code"
+export "CSF_OCCTOverviewSampleCodePath=${aSamplePath}/../../OCCTOverview/code"

adm/templates/header.in

@@ -1 +1 @@
-@OCCT_HEADER_FILE_CONTENT@
+@OCCT_HEADER_FILE_CONTENT@

adm/templates/occt_toolkit.rc.in

@@ -1,30 +1,30 @@
-#include <windows.h>
+#include <windows.h>
-#include <Standard_Version.hxx>
+#include <Standard_Version.hxx>
-
+
-VS_VERSION_INFO VERSIONINFO
+VS_VERSION_INFO VERSIONINFO
-FILEVERSION     OCC_VERSION_MAJOR, OCC_VERSION_MINOR, OCC_VERSION_MAINTENANCE, 0
+FILEVERSION     OCC_VERSION_MAJOR, OCC_VERSION_MINOR, OCC_VERSION_MAINTENANCE, 0
-PRODUCTVERSION  OCC_VERSION_MAJOR, OCC_VERSION_MINOR, OCC_VERSION_MAINTENANCE, 0
+PRODUCTVERSION  OCC_VERSION_MAJOR, OCC_VERSION_MINOR, OCC_VERSION_MAINTENANCE, 0
-FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
+#ifdef _DEBUG
-FILEFLAGS VS_FF_DEBUG
+FILEFLAGS VS_FF_DEBUG
-#endif
+#endif
-FILEOS          VOS_NT
+FILEOS          VOS_NT
-FILETYPE        VFT_DLL
+FILETYPE        VFT_DLL
-FILESUBTYPE     VFT2_UNKNOWN
+FILESUBTYPE     VFT2_UNKNOWN
-BEGIN
+BEGIN
-  BLOCK "StringFileInfo"
+  BLOCK "StringFileInfo"
-  BEGIN BLOCK "040904E4" // Language type = U.S English(0x0409) and Character Set = Windows, Multilingual(0x04E4)
+  BEGIN BLOCK "040904E4" // Language type = U.S English(0x0409) and Character Set = Windows, Multilingual(0x04E4)
-    BEGIN
+    BEGIN
-      VALUE "FileDescription", "@PROJECT_NAME@ Toolkit\000"
+      VALUE "FileDescription", "@PROJECT_NAME@ Toolkit\000"
-      VALUE "FileVersion",     OCC_VERSION_STRING_EXT "\000"
+      VALUE "FileVersion",     OCC_VERSION_STRING_EXT "\000"
-      VALUE "LegalCopyright",  "\251 OPEN CASCADE SAS\000"
+      VALUE "LegalCopyright",  "\251 OPEN CASCADE SAS\000"
-      VALUE "ProductName",     "Open CASCADE Technology\000"
+      VALUE "ProductName",     "Open CASCADE Technology\000"
-      VALUE "ProductVersion",  OCC_VERSION_STRING_EXT "\000"
+      VALUE "ProductVersion",  OCC_VERSION_STRING_EXT "\000"
-      VALUE "OfficialSite",    "www.opencascade.com\000"
+      VALUE "OfficialSite",    "www.opencascade.com\000"
-    END
+    END
-  END
+  END
-  BLOCK "VarFileInfo"
+  BLOCK "VarFileInfo"
-  BEGIN
+  BEGIN
-    VALUE "Translation", 0x0409, 0x04E4
+    VALUE "Translation", 0x0409, 0x04E4
-  END
+  END
-END
+END

adm/templates/template.vc10

@@ -1,278 +1,278 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
+    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
-    __UWP_PROPERTIES__
+    __UWP_PROPERTIES__
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>__VCVEREXT__</PlatformToolset>
+    <PlatformToolset>__VCVEREXT__</PlatformToolset>
-    <CharacterSet>__VCCHARSET__</CharacterSet>
+    <CharacterSet>__VCCHARSET__</CharacterSet>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>__VCVEREXT__</PlatformToolset>
+    <PlatformToolset>__VCVEREXT__</PlatformToolset>
-    <CharacterSet>__VCCHARSET__</CharacterSet>
+    <CharacterSet>__VCCHARSET__</CharacterSet>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>__VCVEREXT__</PlatformToolset>
+    <PlatformToolset>__VCVEREXT__</PlatformToolset>
-    <CharacterSet>__VCCHARSET__</CharacterSet>
+    <CharacterSet>__VCCHARSET__</CharacterSet>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>__VCVEREXT__</PlatformToolset>
+    <PlatformToolset>__VCVEREXT__</PlatformToolset>
-    <CharacterSet>__VCCHARSET__</CharacterSet>
+    <CharacterSet>__VCCHARSET__</CharacterSet>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
+  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\__VCVER__\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\__VCVER__\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\__VCVER__\obj\__TKNAM__\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\__VCVER__\obj\__TKNAM__\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\__VCVER__\bind\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\__VCVER__\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\__VCVER__\objd\__TKNAM__\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\__VCVER__\objd\__TKNAM__\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\__VCVER__\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\__VCVER__\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\__VCVER__\obj\__TKNAM__\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\__VCVER__\obj\__TKNAM__\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\__VCVER__\bind\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\__VCVER__\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\__VCVER__\objd\__TKNAM__\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\__VCVER__\objd\__TKNAM__\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-  </PropertyGroup>
+  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
+    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
+      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.tlb</TypeLibraryName>
-      <HeaderFileName>
+      <HeaderFileName>
-      </HeaderFileName>
+      </HeaderFileName>
-    </Midl>
+    </Midl>
-    <ClCompile>
+    <ClCompile>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
+      <StringPooling>true</StringPooling>
-      <ExceptionHandling>Async</ExceptionHandling>
+      <ExceptionHandling>Async</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\obj\__TKNAM__/</AssemblerListingLocation>
+      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\obj\__TKNAM__/</AssemblerListingLocation>
-      <ObjectFileName>.\..\..\..\win32\__VCVER__\obj\__TKNAM__/</ObjectFileName>
+      <ObjectFileName>.\..\..\..\win32\__VCVER__\obj\__TKNAM__/</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\obj\__TKNAM__/</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\obj\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
+      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <FloatingPointModel>Precise</FloatingPointModel>
+      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      __VCMPL32__
+      __VCMPL32__
-    </ClCompile>
+    </ClCompile>
-    <ResourceCompile>
+    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
+    </ResourceCompile>
-    <Link>
+    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
-      <OutputFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.dll</OutputFile>
+      <OutputFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
+      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\..\..\..\win32\__VCVER__\bin\__TKNAM__.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Console</SubSystem>
-      <ImportLibrary>..\..\..\win32\__VCVER__\lib\__TKNAM__.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\win32\__VCVER__\lib\__TKNAM__.lib</ImportLibrary>
-      __VCLNKREL__
+      __VCLNKREL__
-      __UWP_GENERATE_METADATA__
+      __UWP_GENERATE_METADATA__
-    </Link>
+    </Link>
-  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
+    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
+      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.tlb</TypeLibraryName>
-      <HeaderFileName>
+      <HeaderFileName>
-      </HeaderFileName>
+      </HeaderFileName>
-    </Midl>
+    </Midl>
-    <ClCompile>
+    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
+      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
+      <ExceptionHandling>Async</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
+      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
-      <ObjectFileName>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</ObjectFileName>
+      <ObjectFileName>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\objd\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
+      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
+      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <FloatingPointModel>Precise</FloatingPointModel>
+      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      __VCMPL32__
+      __VCMPL32__
-    </ClCompile>
+    </ClCompile>
-    <ResourceCompile>
+    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
+    </ResourceCompile>
-    <Link>
+    <Link>
-      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
-      <OutputFile>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll</OutputFile>
+      <OutputFile>.\..\..\..\win32\__VCVER__\bind\__TKNAM__.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\..\..\win32\__VCVER__\bind\__TKNAM__.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\win32\__VCVER__\bind\__TKNAM__.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Console</SubSystem>
-      <ImportLibrary>..\..\..\win32\__VCVER__\libd\__TKNAM__.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\win32\__VCVER__\libd\__TKNAM__.lib</ImportLibrary>
-      __UWP_GENERATE_METADATA__
+      __UWP_GENERATE_METADATA__
-    </Link>
+    </Link>
-  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
+    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>x64</TargetEnvironment>
+      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.tlb</TypeLibraryName>
-      <HeaderFileName>
+      <HeaderFileName>
-      </HeaderFileName>
+      </HeaderFileName>
-    </Midl>
+    </Midl>
-    <ClCompile>
+    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
+      <StringPooling>true</StringPooling>
-      <ExceptionHandling>Async</ExceptionHandling>
+      <ExceptionHandling>Async</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\obj\__TKNAM__/</AssemblerListingLocation>
+      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\obj\__TKNAM__/</AssemblerListingLocation>
-      <ObjectFileName>.\..\..\..\win64\__VCVER__\obj\__TKNAM__/</ObjectFileName>
+      <ObjectFileName>.\..\..\..\win64\__VCVER__\obj\__TKNAM__/</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\obj\__TKNAM__/</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\obj\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
+      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <FloatingPointModel>Precise</FloatingPointModel>
+      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      __VCMPL64__
+      __VCMPL64__
-    </ClCompile>
+    </ClCompile>
-    <ResourceCompile>
+    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
+    </ResourceCompile>
-    <Link>
+    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
-      <OutputFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.dll</OutputFile>
+      <OutputFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
+      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\..\..\..\win64\__VCVER__\bin\__TKNAM__.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Console</SubSystem>
-      <ImportLibrary>..\..\..\win64\__VCVER__\lib\__TKNAM__.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\win64\__VCVER__\lib\__TKNAM__.lib</ImportLibrary>
-      __VCLNKREL__
+      __VCLNKREL__
-      __UWP_GENERATE_METADATA__
+      __UWP_GENERATE_METADATA__
-    </Link>
+    </Link>
-  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
+    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>x64</TargetEnvironment>
+      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.tlb</TypeLibraryName>
-      <HeaderFileName>
+      <HeaderFileName>
-      </HeaderFileName>
+      </HeaderFileName>
-    </Midl>
+    </Midl>
-    <ClCompile>
+    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
+      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
+      <ExceptionHandling>Async</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
+      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</AssemblerListingLocation>
-      <ObjectFileName>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</ObjectFileName>
+      <ObjectFileName>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\objd\__TKNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
+      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
+      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <FloatingPointModel>Precise</FloatingPointModel>
+      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      __VCMPL64__
+      __VCMPL64__
-    </ClCompile>
+    </ClCompile>
-    <ResourceCompile>
+    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
+    </ResourceCompile>
-    <Link>
+    <Link>
-      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
-      <OutputFile>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll</OutputFile>
+      <OutputFile>.\..\..\..\win64\__VCVER__\bind\__TKNAM__.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\..\..\win64\__VCVER__\bind\__TKNAM__.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\win64\__VCVER__\bind\__TKNAM__.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Console</SubSystem>
-      <ImportLibrary>..\..\..\win64\__VCVER__\libd\__TKNAM__.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\win64\__VCVER__\libd\__TKNAM__.lib</ImportLibrary>
-      __UWP_GENERATE_METADATA__
+      __UWP_GENERATE_METADATA__
-    </Link>
+    </Link>
-  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
-  <ItemGroup>
+  <ItemGroup>
-__FILES__
+__FILES__
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ResourceCompile Include="__TKNAM__.rc" />
+    <ResourceCompile Include="__TKNAM__.rc" />
-  </ItemGroup>
+  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
+  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  </ImportGroup>
-</Project>
+</Project>

adm/templates/template.vc10x

@@ -1,259 +1,259 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
+    <ProjectGuid>__PROJECT_GUID__</ProjectGuid>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>__CONF__</ConfigurationType>
+    <ConfigurationType>__CONF__</ConfigurationType>
-    <PlatformToolset>__VCVEREXT__</PlatformToolset>
+    <PlatformToolset>__VCVEREXT__</PlatformToolset>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>__CONF__</ConfigurationType>
+    <ConfigurationType>__CONF__</ConfigurationType>
-    <PlatformToolset>__VCVEREXT__</PlatformToolset>
+    <PlatformToolset>__VCVEREXT__</PlatformToolset>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>__CONF__</ConfigurationType>
+    <ConfigurationType>__CONF__</ConfigurationType>
-    <PlatformToolset>__VCVEREXT__</PlatformToolset>
+    <PlatformToolset>__VCVEREXT__</PlatformToolset>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>__CONF__</ConfigurationType>
+    <ConfigurationType>__CONF__</ConfigurationType>
-    <PlatformToolset>__VCVEREXT__</PlatformToolset>
+    <PlatformToolset>__VCVEREXT__</PlatformToolset>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
+  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\__VCVER__\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\__VCVER__\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\__VCVER__\obj\__XQTNAM__\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\win32\__VCVER__\obj\__XQTNAM__\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\__VCVER__\bind\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\__VCVER__\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\__VCVER__\objd\__XQTNAM__\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\win32\__VCVER__\objd\__XQTNAM__\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\__VCVER__\bin\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\__VCVER__\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\__VCVER__\obj\__XQTNAM__\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\..\..\..\win64\__VCVER__\obj\__XQTNAM__\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\__VCVER__\bind\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\__VCVER__\bind\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\__VCVER__\objd\__XQTNAM__\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\..\..\..\win64\__VCVER__\objd\__XQTNAM__\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-  </PropertyGroup>
+  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
+    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
+      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\..\..\..\win32\__VCVER__\bin\__XQTNAM__.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\..\..\win32\__VCVER__\bin\__XQTNAM__.tlb</TypeLibraryName>
-      <HeaderFileName>
+      <HeaderFileName>
-      </HeaderFileName>
+      </HeaderFileName>
-    </Midl>
+    </Midl>
-    <ClCompile>
+    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
+      <StringPooling>true</StringPooling>
-      <ExceptionHandling>Async</ExceptionHandling>
+      <ExceptionHandling>Async</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\obj\__XQTNAM__/</AssemblerListingLocation>
+      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\obj\__XQTNAM__/</AssemblerListingLocation>
-      <ObjectFileName>.\..\..\..\win32\__VCVER__\obj\__XQTNAM__/</ObjectFileName>
+      <ObjectFileName>.\..\..\..\win32\__VCVER__\obj\__XQTNAM__/</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\obj\__XQTNAM__/</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\obj\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
+      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL32__
+      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL32__
-    </ClCompile>
+    </ClCompile>
-    <ResourceCompile>
+    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
+    </ResourceCompile>
-    <Link>
+    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
+      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\..\..\..\win32\__VCVER__\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\..\..\..\win32\__VCVER__\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Console</SubSystem>
-      <ImportLibrary>..\..\..\win32\__VCVER__\lib\__XQTNAM__.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\win32\__VCVER__\lib\__XQTNAM__.lib</ImportLibrary>
-      <AdditionalOptions>/LARGEADDRESSAWARE %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/LARGEADDRESSAWARE %(AdditionalOptions)</AdditionalOptions>
-      __VCLNKREL__
+      __VCLNKREL__
-    </Link>
+    </Link>
-  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
+    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
+      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\..\..\..\win32\__VCVER__\bind\__XQTNAM__.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\..\..\win32\__VCVER__\bind\__XQTNAM__.tlb</TypeLibraryName>
-      <HeaderFileName>
+      <HeaderFileName>
-      </HeaderFileName>
+      </HeaderFileName>
-    </Midl>
+    </Midl>
-    <ClCompile>
+    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
+      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
+      <ExceptionHandling>Async</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
+      <AssemblerListingLocation>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
-      <ObjectFileName>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</ObjectFileName>
+      <ObjectFileName>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win32\__VCVER__\objd\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
+      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
+      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL32__
+      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL32__
-    </ClCompile>
+    </ClCompile>
-    <ResourceCompile>
+    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
+    </ResourceCompile>
-    <Link>
+    <Link>
-      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\win32\__VCVER__\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\..\..\win32\__VCVER__\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\win32\__VCVER__\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Console</SubSystem>
-      <ImportLibrary>..\..\..\win32\__VCVER__\libd\__XQTNAM__.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\win32\__VCVER__\libd\__XQTNAM__.lib</ImportLibrary>
-      <AdditionalOptions>/LARGEADDRESSAWARE %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/LARGEADDRESSAWARE %(AdditionalOptions)</AdditionalOptions>
-    </Link>
+    </Link>
-  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
+    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>x64</TargetEnvironment>
+      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>.\..\..\..\win64\__VCVER__\bin\__XQTNAM__.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\..\..\win64\__VCVER__\bin\__XQTNAM__.tlb</TypeLibraryName>
-      <HeaderFileName>
+      <HeaderFileName>
-      </HeaderFileName>
+      </HeaderFileName>
-    </Midl>
+    </Midl>
-    <ClCompile>
+    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
+      <StringPooling>true</StringPooling>
-      <ExceptionHandling>Async</ExceptionHandling>
+      <ExceptionHandling>Async</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\obj\__XQTNAM__/</AssemblerListingLocation>
+      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\obj\__XQTNAM__/</AssemblerListingLocation>
-      <ObjectFileName>.\..\..\..\win64\__VCVER__\obj\__XQTNAM__/</ObjectFileName>
+      <ObjectFileName>.\..\..\..\win64\__VCVER__\obj\__XQTNAM__/</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\obj\__XQTNAM__/</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\obj\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
+      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL64__
+      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL64__
-    </ClCompile>
+    </ClCompile>
-    <ResourceCompile>
+    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;No_Exception;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
+    </ResourceCompile>
-    <Link>
+    <Link>
-      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP__</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
+      <GenerateDebugInformation>__VCReleasePDB__</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\..\..\..\win64\__VCVER__\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>.\..\..\..\win64\__VCVER__\bin\__XQTNAM__.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Console</SubSystem>
-      <ImportLibrary>..\..\..\win64\__VCVER__\lib\__XQTNAM__.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\win64\__VCVER__\lib\__XQTNAM__.lib</ImportLibrary>
-      __VCLNKREL__
+      __VCLNKREL__
-    </Link>
+    </Link>
-  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
+    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>x64</TargetEnvironment>
+      <TargetEnvironment>x64</TargetEnvironment>
-      <TypeLibraryName>.\..\..\..\win64\__VCVER__\bind\__XQTNAM__.tlb</TypeLibraryName>
+      <TypeLibraryName>.\..\..\..\win64\__VCVER__\bind\__XQTNAM__.tlb</TypeLibraryName>
-      <HeaderFileName>
+      <HeaderFileName>
-      </HeaderFileName>
+      </HeaderFileName>
-    </Midl>
+    </Midl>
-    <ClCompile>
+    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
+      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Async</ExceptionHandling>
+      <ExceptionHandling>Async</ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
+      <AssemblerListingLocation>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</AssemblerListingLocation>
-      <ObjectFileName>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</ObjectFileName>
+      <ObjectFileName>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>.\..\..\..\win64\__VCVER__\objd\__XQTNAM__/</ProgramDataBaseFileName>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>Default</CompileAs>
+      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
+      <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL64__
+      <FloatingPointModel>Precise</FloatingPointModel>__VCMPL64__
-    </ClCompile>
+    </ClCompile>
-    <ResourceCompile>
+    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\inc;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;__TKDEFINES__;$(CSF_DEFINES);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
+    </ResourceCompile>
-    <Link>
+    <Link>
-      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
+      <AdditionalDependencies>__TKDEP_DEBUG__</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\win64\__VCVER__\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\..\..\win64\__VCVER__\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>..\..\..\win64\__VCVER__\bind\__XQTNAM__.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Console</SubSystem>
-      <ImportLibrary>..\..\..\win64\__VCVER__\libd\__XQTNAM__.lib</ImportLibrary>
+      <ImportLibrary>..\..\..\win64\__VCVER__\libd\__XQTNAM__.lib</ImportLibrary>
-    </Link>
+    </Link>
-  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
-  <ItemGroup>
+  <ItemGroup>
-__FILES__
+__FILES__
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ResourceCompile Include="__XQTNAM__.rc" />
+    <ResourceCompile Include="__XQTNAM__.rc" />
-  </ItemGroup>
+  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
+  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  </ImportGroup>
-</Project>
+</Project>

adm/templates/template.vc7

@@ -1,160 +1,160 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="7.10"
+	Version="7.10"
-	Name="__TKNAM__"
+	Name="__TKNAM__"
-	SccProjectName=""
+	SccProjectName=""
-	SccLocalPath="">
+	SccLocalPath="">
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"/>
+			Name="Win32"/>
-	</Platforms>
+	</Platforms>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\win32\vc7\bin"
+			OutputDirectory=".\..\..\..\win32\vc7\bin"
-			IntermediateDirectory=".\..\..\..\win32\vc7\obj\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc7\obj\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-				StringPooling="TRUE"
+				StringPooling="TRUE"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
+				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\..\..\..\win32\vc7\obj\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc7\obj\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win32\vc7\obj\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc7\obj\__TKNAM__/"
-				ObjectFile=".\..\..\..\win32\vc7\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc7\obj\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc7\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc7\obj\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="TRUE"/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\..\win32\vc7\bin\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win32\vc7\bin\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\win32\vc7\lib;$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc7\lib;$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile=".\..\..\..\win32\vc7\bin\__TKNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win32\vc7\bin\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				ImportLibrary="..\..\..\win32\vc7\lib\__TKNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc7\lib\__TKNAM__.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
+				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc7\bin\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc7\bin\__TKNAM__.tlb"
-				HeaderFileName=""/>
+				HeaderFileName=""/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"/>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-				Culture="1036"/>
+				Culture="1036"/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCWebDeploymentTool"/>
-			<Tool
+			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\win32\vc7\bind"
+			OutputDirectory=".\..\..\..\win32\vc7\bind"
-			IntermediateDirectory=".\..\..\..\win32\vc7\objd\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc7\objd\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			ManagedExtensions="FALSE"
+			ManagedExtensions="FALSE"
-			WholeProgramOptimization="FALSE">
+			WholeProgramOptimization="FALSE">
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc7\objd\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__TKNAM__/"
-				ObjectFile=".\..\..\..\win32\vc7\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc7\objd\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc7\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc7\objd\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
+				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="0"/>
+				CompileAs="0"/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\..\win32\vc7\bind\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win32\vc7\bind\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\win32\vc7\libd;$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc7\libd;$(CSF_OPT_LIB32D)"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\..\win32\vc7\bind\__TKNAM__.pdb"
+				ProgramDatabaseFile="..\..\..\win32\vc7\bind\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				ImportLibrary="..\..\..\win32\vc7\libd\__TKNAM__.lib"/>
+				ImportLibrary="..\..\..\win32\vc7\libd\__TKNAM__.lib"/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
+				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc7\bind\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc7\bind\__TKNAM__.tlb"
-				HeaderFileName=""/>
+				HeaderFileName=""/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"/>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-				Culture="1036"/>
+				Culture="1036"/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCWebDeploymentTool"/>
-			<Tool
+			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Source files"
+			Name="Source files"
-			Filter="">
+			Filter="">
-__FILES__
+__FILES__
-			<File RelativePath="__TKNAM__.rc"></File>
+			<File RelativePath="__TKNAM__.rc"></File>
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

adm/templates/template.vc7x

@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="7.10"
+	Version="7.10"
-	Name="__XQTNAM__"
+	Name="__XQTNAM__"
-	ProjectGUID="{193A5B07-7F8B-4280-9F4E-32D5F326DFC5}"
+	ProjectGUID="{193A5B07-7F8B-4280-9F4E-32D5F326DFC5}"
-	SccProjectName=""
+	SccProjectName=""
-	SccLocalPath="">
+	SccLocalPath="">
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"/>
+			Name="Win32"/>
-	</Platforms>
+	</Platforms>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\win32\vc7\bind"
+			OutputDirectory=".\..\..\..\win32\vc7\bind"
-			IntermediateDirectory=".\..\..\..\win32\vc7\objd\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc7\objd\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc7\objd\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"/>
+				DebugInformationFormat="3"/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\win32\vc7\libd;$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc7\libd;$(CSF_OPT_LIB32D)"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\..\win32\vc7\bind\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win32\vc7\bind\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win32\vc7\libd\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc7\libd\__XQTNAM__.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
+				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc7\bind\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc7\bind\__XQTNAM__.tlb"
-				HeaderFileName=""/>
+				HeaderFileName=""/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"/>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-				Culture="1033"/>
+				Culture="1033"/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCWebDeploymentTool"/>
-			<Tool
+			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\win32\vc7\bin"
+			OutputDirectory=".\..\..\..\win32\vc7\bin"
-			IntermediateDirectory=".\..\..\..\win32\vc7\obj\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc7\obj\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-				StringPooling="TRUE"
+				StringPooling="TRUE"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
+				EnableFunctionLevelLinking="TRUE"
-				AssemblerListingLocation=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc7\obj\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="TRUE"/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\..\win32\vc7\lib;$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc7\lib;$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile=".\..\..\..\win32\vc7\bin\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win32\vc7\bin\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win32\vc7\lib\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc7\lib\__XQTNAM__.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
+				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc7\bin\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc7\bin\__XQTNAM__.tlb"
-				HeaderFileName=""/>
+				HeaderFileName=""/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"/>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-				Culture="1033"/>
+				Culture="1033"/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCWebDeploymentTool"/>
-			<Tool
+			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
+			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Source Files"
+			Name="Source Files"
-			Filter="">
+			Filter="">
-__FILES__
+__FILES__
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

adm/templates/template.vc8

@@ -1,428 +1,428 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8.00"
-	Name="__TKNAM__"
+	Name="__TKNAM__"
-	ProjectGUID="__PROJECT_GUID__"
+	ProjectGUID="__PROJECT_GUID__"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\win32\vc8\bin"
+			OutputDirectory=".\..\..\..\win32\vc8\bin"
-			IntermediateDirectory=".\..\..\..\win32\vc8\obj\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc8\obj\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc8\bin\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc8\bin\__TKNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				StringPooling="true"
+				StringPooling="true"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				PrecompiledHeaderFile=".\..\..\..\win32\vc8\obj\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc8\obj\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win32\vc8\obj\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc8\obj\__TKNAM__/"
-				ObjectFile=".\..\..\..\win32\vc8\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc8\obj\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				EnableEnhancedInstructionSet="2"
+				EnableEnhancedInstructionSet="2"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-				Culture="1036"
+				Culture="1036"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\..\win32\vc8\bin\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win32\vc8\bin\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win32\vc8\lib;$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc8\lib;$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile=".\..\..\..\win32\vc8\bin\__TKNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win32\vc8\bin\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				ImportLibrary="..\..\..\win32\vc8\lib\__TKNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc8\lib\__TKNAM__.lib"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-			<Tool
+			<Tool
- 				Name="VCALinkTool"
+ 				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCWebDeploymentTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\win32\vc8\bind"
+			OutputDirectory=".\..\..\..\win32\vc8\bind"
-			IntermediateDirectory=".\..\..\..\win32\vc8\objd\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc8\objd\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			ManagedExtensions="0"
+			ManagedExtensions="0"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc8\bind\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc8\bind\__TKNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				PrecompiledHeaderFile=".\..\..\..\win32\vc8\objd\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc8\objd\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win32\vc8\objd\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc8\objd\__TKNAM__/"
-				ObjectFile=".\..\..\..\win32\vc8\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc8\objd\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc8\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc8\objd\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="0"
+				CompileAs="0"
-				EnableEnhancedInstructionSet="2"
+				EnableEnhancedInstructionSet="2"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-				Culture="1036"
+				Culture="1036"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\..\win32\vc8\bind\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win32\vc8\bind\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win32\vc8\libd;$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc8\libd;$(CSF_OPT_LIB32D)"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\..\win32\vc8\bind\__TKNAM__.pdb"
+				ProgramDatabaseFile="..\..\..\win32\vc8\bind\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				ImportLibrary="..\..\..\win32\vc8\libd\__TKNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc8\libd\__TKNAM__.lib"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCWebDeploymentTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			OutputDirectory=".\..\..\..\win64\vc8\bin"
+			OutputDirectory=".\..\..\..\win64\vc8\bin"
-			IntermediateDirectory=".\..\..\..\win64\vc8\obj\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win64\vc8\obj\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win64\vc8\bin\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win64\vc8\bin\__TKNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="/favor:blend"
+				AdditionalOptions="/favor:blend"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				StringPooling="true"
+				StringPooling="true"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				PrecompiledHeaderFile=".\..\..\..\win64\vc8\obj\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win64\vc8\obj\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win64\vc8\obj\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win64\vc8\obj\__TKNAM__/"
-				ObjectFile=".\..\..\..\win64\vc8\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win64\vc8\obj\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-				Culture="1036"
+				Culture="1036"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\..\win64\vc8\bin\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win64\vc8\bin\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win64\vc8\lib;$(CSF_OPT_LIB64)"
+				AdditionalLibraryDirectories="..\..\..\win64\vc8\lib;$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile=".\..\..\..\win64\vc8\bin\__TKNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win64\vc8\bin\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				ImportLibrary="..\..\..\win64\vc8\lib\__TKNAM__.lib"
+				ImportLibrary="..\..\..\win64\vc8\lib\__TKNAM__.lib"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-			<Tool
+			<Tool
- 				Name="VCALinkTool"
+ 				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCWebDeploymentTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\win64\vc8\bind"
+			OutputDirectory=".\..\..\..\win64\vc8\bind"
-			IntermediateDirectory=".\..\..\..\win64\vc8\objd\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win64\vc8\objd\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			ManagedExtensions="0"
+			ManagedExtensions="0"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win64\vc8\bind\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win64\vc8\bind\__TKNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="/favor:blend"
+				AdditionalOptions="/favor:blend"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				PrecompiledHeaderFile=".\..\..\..\win64\vc8\objd\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win64\vc8\objd\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win64\vc8\objd\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win64\vc8\objd\__TKNAM__/"
-				ObjectFile=".\..\..\..\win64\vc8\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win64\vc8\objd\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win64\vc8\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc8\objd\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="0"
+				CompileAs="0"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-				Culture="1036"
+				Culture="1036"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="__TKDEP__ opengl32.lib ws2_32.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\..\..\..\win64\vc8\bind\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win64\vc8\bind\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win64\vc8\libd;$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="..\..\..\win64\vc8\libd;$(CSF_OPT_LIB64D)"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\..\win64\vc8\bind\__TKNAM__.pdb"
+				ProgramDatabaseFile="..\..\..\win64\vc8\bind\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				ImportLibrary="..\..\..\win64\vc8\libd\__TKNAM__.lib"
+				ImportLibrary="..\..\..\win64\vc8\libd\__TKNAM__.lib"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCWebDeploymentTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Source files"
+			Name="Source files"
-			>
+			>
-__FILES__
+__FILES__
-			<File RelativePath="__TKNAM__.rc"></File>
+			<File RelativePath="__TKNAM__.rc"></File>
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

adm/templates/template.vc8x

@@ -1,413 +1,413 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8.00"
-	Name="__XQTNAM__"
+	Name="__XQTNAM__"
-	ProjectGUID="__PROJECT_GUID__"
+	ProjectGUID="__PROJECT_GUID__"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\win32\vc8\bind"
+			OutputDirectory=".\..\..\..\win32\vc8\bind"
-			IntermediateDirectory=".\..\..\..\win32\vc8\objd\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc8\objd\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc8\bind\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc8\bind\__XQTNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				AssemblerListingLocation=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc8\objd\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				EnableEnhancedInstructionSet="2"
+				EnableEnhancedInstructionSet="2"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES);"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES);"
-				Culture="1033"
+				Culture="1033"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win32\vc8\libd;$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc8\libd;$(CSF_OPT_LIB32D)"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\..\win32\vc8\bind\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win32\vc8\bind\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win32\vc8\libd\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc8\libd\__XQTNAM__.lib"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCWebDeploymentTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\win32\vc8\bin"
+			OutputDirectory=".\..\..\..\win32\vc8\bin"
-			IntermediateDirectory=".\..\..\..\win32\vc8\obj\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc8\obj\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc8\bin\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc8\bin\__XQTNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES);"
-				StringPooling="true"
+				StringPooling="true"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				AssemblerListingLocation=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc8\obj\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				EnableEnhancedInstructionSet="2"
+				EnableEnhancedInstructionSet="2"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES);"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES);"
-				Culture="1033"
+				Culture="1033"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win32\vc8\lib;$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc8\lib;$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile=".\..\..\..\win32\vc8\bin\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win32\vc8\bin\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win32\vc8\lib\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc8\lib\__XQTNAM__.lib"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCWebDeploymentTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\win64\vc8\bind"
+			OutputDirectory=".\..\..\..\win64\vc8\bind"
-			IntermediateDirectory=".\..\..\..\win64\vc8\objd\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win64\vc8\objd\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win64\vc8\bind\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win64\vc8\bind\__XQTNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="/favor:blend"
+				AdditionalOptions="/favor:blend"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				AssemblerListingLocation=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc8\objd\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-				Culture="1033"
+				Culture="1033"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				OutputFile=".\..\..\..\win64\vc8\bind\__XQTNAM__.__XQTEXT__"
+				OutputFile=".\..\..\..\win64\vc8\bind\__XQTNAM__.__XQTEXT__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win64\vc8\libd;$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="..\..\..\win64\vc8\libd;$(CSF_OPT_LIB64D)"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\..\win64\vc8\bind\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win64\vc8\bind\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win64\vc8\libd\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win64\vc8\libd\__XQTNAM__.lib"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCWebDeploymentTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			OutputDirectory=".\..\..\..\win64\vc8\bin"
+			OutputDirectory=".\..\..\..\win64\vc8\bin"
-			IntermediateDirectory=".\..\..\..\win64\vc8\obj\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win64\vc8\obj\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win64\vc8\bin\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win64\vc8\bin\__XQTNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="/favor:blend"
+				AdditionalOptions="/favor:blend"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				StringPooling="true"
+				StringPooling="true"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				AssemblerListingLocation=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc8\obj\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-				Culture="1033"
+				Culture="1033"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				OutputFile=".\..\..\..\win64\vc8\bin\__XQTNAM__.__XQTEXT__"
+				OutputFile=".\..\..\..\win64\vc8\bin\__XQTNAM__.__XQTEXT__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win64\vc8\lib;$(CSF_OPT_LIB64)"
+				AdditionalLibraryDirectories="..\..\..\win64\vc8\lib;$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile=".\..\..\..\win64\vc8\bin\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win64\vc8\bin\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win64\vc8\lib\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win64\vc8\lib\__XQTNAM__.lib"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCWebDeploymentTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Source Files"
+			Name="Source Files"
-			>
+			>
-__FILES__
+__FILES__
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

adm/templates/template.vc9

@@ -1,419 +1,419 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	Name="__TKNAM__"
+	Name="__TKNAM__"
-	ProjectGUID="__PROJECT_GUID__"
+	ProjectGUID="__PROJECT_GUID__"
-	TargetFrameworkVersion="0"
+	TargetFrameworkVersion="0"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\win32\vc9\bin"
+			OutputDirectory=".\..\..\..\win32\vc9\bin"
-			IntermediateDirectory=".\..\..\..\win32\vc9\obj\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc9\obj\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
+			CharacterSet="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc9\bin\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc9\bin\__TKNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="-MP /bigobj"
+				AdditionalOptions="-MP /bigobj"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				StringPooling="true"
+				StringPooling="true"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="2"
+				EnableEnhancedInstructionSet="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				PrecompiledHeaderFile=".\..\..\..\win32\vc9\obj\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc9\obj\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__TKNAM__/"
-				ObjectFile=".\..\..\..\win32\vc9\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc9\obj\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ ws2_32.lib"
+				AdditionalDependencies="__TKDEP__ ws2_32.lib"
-				OutputFile=".\..\..\..\win32\vc9\bin\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win32\vc9\bin\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win32\vc9\lib;$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc9\lib;$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile=".\..\..\..\win32\vc9\bin\__TKNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win32\vc9\bin\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				ImportLibrary="..\..\..\win32\vc9\lib\__TKNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc9\lib\__TKNAM__.lib"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\win32\vc9\bind"
+			OutputDirectory=".\..\..\..\win32\vc9\bind"
-			IntermediateDirectory=".\..\..\..\win32\vc9\objd\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc9\objd\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
+			CharacterSet="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc9\bind\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc9\bind\__TKNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="-MP"
+				AdditionalOptions="-MP"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				EnableEnhancedInstructionSet="2"
+				EnableEnhancedInstructionSet="2"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				PrecompiledHeaderFile=".\..\..\..\win32\vc9\objd\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win32\vc9\objd\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__TKNAM__/"
-				ObjectFile=".\..\..\..\win32\vc9\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win32\vc9\objd\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc9\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc9\objd\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="0"
+				CompileAs="0"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ ws2_32.lib"
+				AdditionalDependencies="__TKDEP__ ws2_32.lib"
-				OutputFile=".\..\..\..\win32\vc9\bind\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win32\vc9\bind\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win32\vc9\libd;$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc9\libd;$(CSF_OPT_LIB32D)"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\..\win32\vc9\bind\__TKNAM__.pdb"
+				ProgramDatabaseFile="..\..\..\win32\vc9\bind\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				ImportLibrary="..\..\..\win32\vc9\libd\__TKNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc9\libd\__TKNAM__.lib"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			OutputDirectory=".\..\..\..\win64\vc9\bin"
+			OutputDirectory=".\..\..\..\win64\vc9\bin"
-			IntermediateDirectory=".\..\..\..\win64\vc9\obj\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win64\vc9\obj\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
+			CharacterSet="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win64\vc9\bin\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win64\vc9\bin\__TKNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="-MP -favor:blend"
+				AdditionalOptions="-MP -favor:blend"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				StringPooling="true"
+				StringPooling="true"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				PrecompiledHeaderFile=".\..\..\..\win64\vc9\obj\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win64\vc9\obj\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__TKNAM__/"
-				ObjectFile=".\..\..\..\win64\vc9\obj\__TKNAM__/"
+				ObjectFile=".\..\..\..\win64\vc9\obj\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ ws2_32.lib"
+				AdditionalDependencies="__TKDEP__ ws2_32.lib"
-				OutputFile=".\..\..\..\win64\vc9\bin\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win64\vc9\bin\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win64\vc9\lib;$(CSF_OPT_LIB64)"
+				AdditionalLibraryDirectories="..\..\..\win64\vc9\lib;$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile=".\..\..\..\win64\vc9\bin\__TKNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win64\vc9\bin\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				ImportLibrary="..\..\..\win64\vc9\lib\__TKNAM__.lib"
+				ImportLibrary="..\..\..\win64\vc9\lib\__TKNAM__.lib"
-				TargetMachine="X64"
+				TargetMachine="X64"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\win64\vc9\bind"
+			OutputDirectory=".\..\..\..\win64\vc9\bind"
-			IntermediateDirectory=".\..\..\..\win64\vc9\objd\__TKNAM__"
+			IntermediateDirectory=".\..\..\..\win64\vc9\objd\__TKNAM__"
-			ConfigurationType="2"
+			ConfigurationType="2"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
+			CharacterSet="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win64\vc9\bind\__TKNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win64\vc9\bind\__TKNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="-MP -favor:blend"
+				AdditionalOptions="-MP -favor:blend"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				PrecompiledHeaderFile=".\..\..\..\win64\vc9\objd\__TKNAM__\__TKNAM__.pch"
+				PrecompiledHeaderFile=".\..\..\..\win64\vc9\objd\__TKNAM__\__TKNAM__.pch"
-				AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__TKNAM__/"
+				AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__TKNAM__/"
-				ObjectFile=".\..\..\..\win64\vc9\objd\__TKNAM__/"
+				ObjectFile=".\..\..\..\win64\vc9\objd\__TKNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win64\vc9\objd\__TKNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc9\objd\__TKNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
+				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="0"
+				CompileAs="0"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__ ws2_32.lib"
+				AdditionalDependencies="__TKDEP__ ws2_32.lib"
-				OutputFile=".\..\..\..\win64\vc9\bind\__TKNAM__.dll"
+				OutputFile=".\..\..\..\win64\vc9\bind\__TKNAM__.dll"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win64\vc9\libd;$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="..\..\..\win64\vc9\libd;$(CSF_OPT_LIB64D)"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\..\win64\vc9\bind\__TKNAM__.pdb"
+				ProgramDatabaseFile="..\..\..\win64\vc9\bind\__TKNAM__.pdb"
-				SubSystem="2"
+				SubSystem="2"
-				ImportLibrary="..\..\..\win64\vc9\libd\__TKNAM__.lib"
+				ImportLibrary="..\..\..\win64\vc9\libd\__TKNAM__.lib"
-				TargetMachine="X64"
+				TargetMachine="X64"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Source files"
+			Name="Source files"
-			>
+			>
-__FILES__
+__FILES__
-			<File RelativePath="__TKNAM__.rc"></File>
+			<File RelativePath="__TKNAM__.rc"></File>
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

adm/templates/template.vc9x

@@ -1,400 +1,400 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	Name="__XQTNAM__"
+	Name="__XQTNAM__"
-	ProjectGUID="__PROJECT_GUID__"
+	ProjectGUID="__PROJECT_GUID__"
-	TargetFrameworkVersion="0"
+	TargetFrameworkVersion="0"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			OutputDirectory=".\..\..\..\win32\vc9\bin"
+			OutputDirectory=".\..\..\..\win32\vc9\bin"
-			IntermediateDirectory=".\..\..\..\win32\vc9\obj\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc9\obj\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc9\bin\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc9\bin\__XQTNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="-MP"
+				AdditionalOptions="-MP"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				StringPooling="true"
+				StringPooling="true"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="2"
+				EnableEnhancedInstructionSet="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc9\obj\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win32\vc9\lib;$(CSF_OPT_LIB32)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc9\lib;$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile=".\..\..\..\win32\vc9\bin\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win32\vc9\bin\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win32\vc9\lib\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc9\lib\__XQTNAM__.lib"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			OutputDirectory=".\..\..\..\win32\vc9\bind"
+			OutputDirectory=".\..\..\..\win32\vc9\bind"
-			IntermediateDirectory=".\..\..\..\win32\vc9\objd\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win32\vc9\objd\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win32\vc9\bind\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win32\vc9\bind\__XQTNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="-MP"
+				AdditionalOptions="-MP"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				EnableEnhancedInstructionSet="2"
+				EnableEnhancedInstructionSet="2"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win32\vc9\objd\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win32\vc9\libd;$(CSF_OPT_LIB32D)"
+				AdditionalLibraryDirectories="..\..\..\win32\vc9\libd;$(CSF_OPT_LIB32D)"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\..\win32\vc9\bind\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win32\vc9\bind\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win32\vc9\libd\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win32\vc9\libd\__XQTNAM__.lib"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			OutputDirectory=".\..\..\..\win64\vc9\bin"
+			OutputDirectory=".\..\..\..\win64\vc9\bin"
-			IntermediateDirectory=".\..\..\..\win64\vc9\obj\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win64\vc9\obj\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win64\vc9\bin\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win64\vc9\bin\__XQTNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="-MP -favor:blend"
+				AdditionalOptions="-MP -favor:blend"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="2"
+				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				StringPooling="true"
+				StringPooling="true"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc9\obj\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
+				PreprocessorDefinitions="NDEBUG;No_Exception;$(CSF_DEFINES)"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				OutputFile=".\..\..\..\win64\vc9\bin\__XQTNAM__.__XQTEXT__"
+				OutputFile=".\..\..\..\win64\vc9\bin\__XQTNAM__.__XQTEXT__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win64\vc9\lib;$(CSF_OPT_LIB64)"
+				AdditionalLibraryDirectories="..\..\..\win64\vc9\lib;$(CSF_OPT_LIB64)"
-				ProgramDatabaseFile=".\..\..\..\win64\vc9\bin\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win64\vc9\bin\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win64\vc9\lib\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win64\vc9\lib\__XQTNAM__.lib"
-				TargetMachine="X64"
+				TargetMachine="X64"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			OutputDirectory=".\..\..\..\win64\vc9\bind"
+			OutputDirectory=".\..\..\..\win64\vc9\bind"
-			IntermediateDirectory=".\..\..\..\win64\vc9\objd\__XQTNAM__"
+			IntermediateDirectory=".\..\..\..\win64\vc9\objd\__XQTNAM__"
-			ConfigurationType="__CONF__"
+			ConfigurationType="__CONF__"
-			UseOfMFC="0"
+			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCustomBuildTool"
+				Name="VCCustomBuildTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXMLDataGeneratorTool"
+				Name="VCXMLDataGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
+				Name="VCWebServiceProxyGeneratorTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCMIDLTool"
+				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
+				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\win64\vc9\bind\__XQTNAM__.tlb"
+				TypeLibraryName=".\..\..\..\win64\vc9\bind\__XQTNAM__.tlb"
-				HeaderFileName=""
+				HeaderFileName=""
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				AdditionalOptions="-MP -favor:blend"
+				AdditionalOptions="-MP -favor:blend"
-				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;$(CSF_DEFINES)"
-				ExceptionHandling="2"
+				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				FloatingPointModel="0"
+				FloatingPointModel="0"
-				AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
+				AssemblerListingLocation=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
-				ObjectFile=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
+				ObjectFile=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
-				ProgramDataBaseFileName=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
+				ProgramDataBaseFileName=".\..\..\..\win64\vc9\objd\__XQTNAM__/"
-				WarningLevel="4"
+				WarningLevel="4"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManagedResourceCompilerTool"
+				Name="VCManagedResourceCompilerTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCResourceCompilerTool"
+				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
+				AdditionalIncludeDirectories="..\..\..\inc;$(CSF_OPT_INC)"
-				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
+				PreprocessorDefinitions="_DEBUG;$(CSF_DEFINES)"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPreLinkEventTool"
+				Name="VCPreLinkEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies="__TKDEP__"
+				AdditionalDependencies="__TKDEP__"
-				OutputFile=".\..\..\..\win64\vc9\bind\__XQTNAM__.__XQTEXT__"
+				OutputFile=".\..\..\..\win64\vc9\bind\__XQTNAM__.__XQTEXT__"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\win64\vc9\libd;$(CSF_OPT_LIB64D)"
+				AdditionalLibraryDirectories="..\..\..\win64\vc9\libd;$(CSF_OPT_LIB64D)"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\..\..\..\win64\vc9\bind\__XQTNAM__.pdb"
+				ProgramDatabaseFile=".\..\..\..\win64\vc9\bind\__XQTNAM__.pdb"
-				SubSystem="1"
+				SubSystem="1"
-				ImportLibrary="..\..\..\win64\vc9\libd\__XQTNAM__.lib"
+				ImportLibrary="..\..\..\win64\vc9\libd\__XQTNAM__.lib"
-				TargetMachine="X64"
+				TargetMachine="X64"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCALinkTool"
+				Name="VCALinkTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCManifestTool"
+				Name="VCManifestTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCXDCMakeTool"
+				Name="VCXDCMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCBscMakeTool"
+				Name="VCBscMakeTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCFxCopTool"
+				Name="VCFxCopTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCAppVerifierTool"
+				Name="VCAppVerifierTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCPostBuildEventTool"
+				Name="VCPostBuildEventTool"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Source Files"
+			Name="Source Files"
-			>
+			>
-__FILES__
+__FILES__
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

adm/templates/template.xcscheme

@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
+<Scheme
-   version = "1.3">
+   version = "1.3">
-   <BuildAction
+   <BuildAction
-      parallelizeBuildables = "YES"
+      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
+      <BuildActionEntries>
-         <BuildActionEntry
+         <BuildActionEntry
-            buildForTesting = "YES"
+            buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "YES"
-            buildForProfiling = "YES"
+            buildForProfiling = "YES"
-            buildForArchiving = "YES"
+            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "YES">
-            <BuildableReference
+            <BuildableReference
-               BuildableIdentifier = "primary"
+               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "__TOOLKIT_GUID__"
+               BlueprintIdentifier = "__TOOLKIT_GUID__"
-               BuildableName = "lib__TOOLKIT_NAME__.dylib"
+               BuildableName = "lib__TOOLKIT_NAME__.dylib"
-               BlueprintName = "__TOOLKIT_NAME__"
+               BlueprintName = "__TOOLKIT_NAME__"
-               ReferencedContainer = "container:__TOOLKIT_NAME__.xcodeproj">
+               ReferencedContainer = "container:__TOOLKIT_NAME__.xcodeproj">
-            </BuildableReference>
+            </BuildableReference>
-         </BuildActionEntry>
+         </BuildActionEntry>
-      </BuildActionEntries>
+      </BuildActionEntries>
-   </BuildAction>
+   </BuildAction>
-   <TestAction
+   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      buildConfiguration = "Debug">
-      <Testables>
+      <Testables>
-      </Testables>
+      </Testables>
-   </TestAction>
+   </TestAction>
-   <LaunchAction
+   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
+      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
+      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
+      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
+      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
+      allowLocationSimulation = "YES">
-      <AdditionalOptions>
+      <AdditionalOptions>
-      </AdditionalOptions>
+      </AdditionalOptions>
-   </LaunchAction>
+   </LaunchAction>
-   <ProfileAction
+   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
+      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
+      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
+      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
+      debugDocumentVersioning = "YES">
-   </ProfileAction>
+   </ProfileAction>
-   <AnalyzeAction
+   <AnalyzeAction
-      buildConfiguration = "Debug">
+      buildConfiguration = "Debug">
-   </AnalyzeAction>
+   </AnalyzeAction>
-   <ArchiveAction
+   <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
+      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
+   </ArchiveAction>
-</Scheme>
+</Scheme>

adm/templates/uwp.toolchain.config.cmake

@@ -1,5 +1,5 @@
-# A toolchain file to configure a Visual Studio generator for a Windows 10 Universal Application (UWP)
+# A toolchain file to configure a Visual Studio generator for a Windows 10 Universal Application (UWP)
-# Specify the CMAKE_SYSTEM_VERSION variable to be 10.0 to build with the latest available Windows 10 SDK.
+# Specify the CMAKE_SYSTEM_VERSION variable to be 10.0 to build with the latest available Windows 10 SDK.
-
+
-set (CMAKE_SYSTEM_NAME WindowsStore)
+set (CMAKE_SYSTEM_NAME WindowsStore)
-set (CMAKE_SYSTEM_VERSION 10.0)
+set (CMAKE_SYSTEM_VERSION 10.0)

adm/templates/vcproj.user.vc9x

@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioUserFile
+<VisualStudioUserFile
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	ShowAllFiles="false"
+	ShowAllFiles="false"
-	>
+	>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			>
+			>
-			<DebugSettings
+			<DebugSettings
-				Environment="PATH=..\..\..\win32\vc9\bin;$(CSF_OPT_BIN32);$(PATH)"
+				Environment="PATH=..\..\..\win32\vc9\bin;$(CSF_OPT_BIN32);$(PATH)"
-				EnvironmentMerge="true"
+				EnvironmentMerge="true"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			>
+			>
-			<DebugSettings
+			<DebugSettings
-				Environment="PATH=..\..\..\win64\vc9\bin;$(CSF_OPT_BIN64);$(PATH)"
+				Environment="PATH=..\..\..\win64\vc9\bin;$(CSF_OPT_BIN64);$(PATH)"
-				EnvironmentMerge="true"
+				EnvironmentMerge="true"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			>
+			>
-			<DebugSettings
+			<DebugSettings
-				Environment="PATH=..\..\..\win32\vc9\bind;$(CSF_OPT_BIN32D);$(PATH)"
+				Environment="PATH=..\..\..\win32\vc9\bind;$(CSF_OPT_BIN32D);$(PATH)"
-				EnvironmentMerge="true"
+				EnvironmentMerge="true"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			>
+			>
-			<DebugSettings
+			<DebugSettings
-				Environment="PATH=..\..\..\win64\vc9\bind;$(CSF_OPT_BIN64D);$(PATH)"
+				Environment="PATH=..\..\..\win64\vc9\bind;$(CSF_OPT_BIN64D);$(PATH)"
-				EnvironmentMerge="true"
+				EnvironmentMerge="true"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-</VisualStudioUserFile>
+</VisualStudioUserFile>

adm/templates/vcxproj.user.vc10x

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerEnvironment>PATH=..\..\..\win32\__VCVER__\bind;$(CSF_OPT_BIN32D);$(PATH)</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=..\..\..\win32\__VCVER__\bind;$(CSF_OPT_BIN32D);$(PATH)</LocalDebuggerEnvironment>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\..</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\..</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerEnvironment>PATH=..\..\..\win32\__VCVER__\bin;$(CSF_OPT_BIN32);$(PATH)</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=..\..\..\win32\__VCVER__\bin;$(CSF_OPT_BIN32);$(PATH)</LocalDebuggerEnvironment>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\..</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\..</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LocalDebuggerEnvironment>PATH=..\..\..\win64\__VCVER__\bin;$(CSF_OPT_BIN64);$(PATH)</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=..\..\..\win64\__VCVER__\bin;$(CSF_OPT_BIN64);$(PATH)</LocalDebuggerEnvironment>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\..</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\..</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerEnvironment>PATH=..\..\..\win64\__VCVER__\bind;$(CSF_OPT_BIN64D);$(PATH)</LocalDebuggerEnvironment>
+    <LocalDebuggerEnvironment>PATH=..\..\..\win64\__VCVER__\bind;$(CSF_OPT_BIN64D);$(PATH)</LocalDebuggerEnvironment>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\..</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory>$(ProjectDir)\..\..\..\..</LocalDebuggerWorkingDirectory>
-  </PropertyGroup>
+  </PropertyGroup>
 </Project>

adm/upgrade_sample_orig.dat

@@ -1,67 +1,67 @@
-// This is sample C++ file intended for testing and verifyig automatic upgrade 
+// This is sample C++ file intended for testing and verifyig automatic upgrade 
-// script. Copy it with extension .cxx and apply upgrade procedure to see
+// script. Copy it with extension .cxx and apply upgrade procedure to see
-// the result, as follows:
+// the result, as follows:
-// > upgrade.bat -src=./adm -inc=./src -recurse -all
+// > upgrade.bat -src=./adm -inc=./src -recurse -all
-
+
-// Include of Geom_Line.hxx and Geom_Plane.hxx should be added below
+// Include of Geom_Line.hxx and Geom_Plane.hxx should be added below
-#include <gp.hxx>
+#include <gp.hxx>
-
+
-//========================================================================
+//========================================================================
-// OCCT 7.0
+// OCCT 7.0
-//========================================================================
+//========================================================================
-
+
-//------------------------------------------------------------------------
+//------------------------------------------------------------------------
-// Option -rtti
+// Option -rtti
-//------------------------------------------------------------------------
+//------------------------------------------------------------------------
-
+
-// Should be replaced by <Standard_Type.hxx>
+// Should be replaced by <Standard_Type.hxx>
-#include <Standard_DefineHandle.hxx>
+#include <Standard_DefineHandle.hxx>
-
+
-class A_0
+class A_0
-{
+{
-}
+}
-
+
-class B_1 : 
+class B_1 : 
-public A_0
+public A_0
-{
+{
-  // second argument "A_0" should be added
+  // second argument "A_0" should be added
-  DEFINE_STANDARD_RTTI(B_1)
+  DEFINE_STANDARD_RTTI(B_1)
-};
+};
-
+
-class C_2 : public Standard_Transient, B_1
+class C_2 : public Standard_Transient, B_1
-{
+{
-  // second argument "Standard_Transient" should be added
+  // second argument "Standard_Transient" should be added
-  DEFINE_STANDARD_RTTI(C_2)
+  DEFINE_STANDARD_RTTI(C_2)
-};
+};
-
+
-void for_rtti ()
+void for_rtti ()
-{
+{
-  Handle(Geom_Curve) aCurve = new Geom_Line (gp::Origin(), gp::DZ());
+  Handle(Geom_Curve) aCurve = new Geom_Line (gp::Origin(), gp::DZ());
-  Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast (aCurve);
+  Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast (aCurve);
-}
+}
-
+
-// should be removed
+// should be removed
-IMPLEMENT_DOWNCAST(A)
+IMPLEMENT_DOWNCAST(A)
-IMPLEMENT_STANDARD_RTTIEXT(A, B)
+IMPLEMENT_STANDARD_RTTIEXT(A, B)
-
+
-//------------------------------------------------------------------------
+//------------------------------------------------------------------------
-// Option -fwd
+// Option -fwd
-//------------------------------------------------------------------------
+//------------------------------------------------------------------------
-
+
-// force safe mode used for Qt objects
+// force safe mode used for Qt objects
-Q_OBJECT
+Q_OBJECT
-slots:
+slots:
-
+
-// these includes should be recognized as corresponding to forward declarations 
+// these includes should be recognized as corresponding to forward declarations 
-#include <occt/TColStd_HArray1OfReal.hxx>
+#include <occt/TColStd_HArray1OfReal.hxx>
-
+
-// these declarations should be just removed
+// these declarations should be just removed
-class Handle(TColStd_HArray1OfReal);
+class Handle(TColStd_HArray1OfReal);
-
+
-// should be replaced by include of corresponding header
+// should be replaced by include of corresponding header
-class TColStd_Array1OfReal;
+class TColStd_Array1OfReal;
-class Handle(Geom_Curve);
+class Handle(Geom_Curve);
-
+
-// check that trailing spaces at the following line are preserved
+// check that trailing spaces at the following line are preserved
-void ff();       
+void ff();       
-
+

data/occ/SurfaceFromPoints/sol1.dat

@@ -1,14 +1,14 @@
-0 0 0
+0 0 0
-0 5 0
+0 5 0
-0 10 0
+0 10 0
-5 10 0
+5 10 0
-10 10 0
+10 10 0
-10 5 0
+10 5 0
-10 0 0
+10 0 0
-5 0 0
+5 0 0
-2.5 2.5 5
+2.5 2.5 5
-2.5 7.5 5
+2.5 7.5 5
-5 2.5 0
+5 2.5 0
-5 7.5 0
+5 7.5 0
-7.5 2.5 -3
+7.5 2.5 -3
 7.5 7.5 -3

data/occ/SurfaceFromPoints/sol2.dat

@@ -1,36 +1,36 @@
-0	0	0
+0	0	0
-10	0	0
+10	0	0
-20	0	0
+20	0	0
-30	0	0
+30	0	0
-40	0	0
+40	0	0
-50	0	0
+50	0	0
-0	10	0
+0	10	0
-10	10	2.6
+10	10	2.6
-20	10	4.5
+20	10	4.5
-30	10	6.3
+30	10	6.3
-40	10	2.4
+40	10	2.4
-50	10	4.5
+50	10	4.5
-0	20	6.1
+0	20	6.1
-10	20	2.6
+10	20	2.6
-20	20	.8
+20	20	.8
-30	20	0
+30	20	0
-40	20	2.1
+40	20	2.1
-50	20	4.6
+50	20	4.6
-0	30	8.2
+0	30	8.2
-10	30	3.7
+10	30	3.7
-20	30	3
+20	30	3
-30	30	2.9
+30	30	2.9
-40	30	9.3
+40	30	9.3
-50	30	4.6
+50	30	4.6
-0	40	9.3
+0	40	9.3
-10	40	5.5
+10	40	5.5
-20	40	2.7
+20	40	2.7
-30	40	4.5
+30	40	4.5
-40	40	9.2
+40	40	9.2
-50	40	.8
+50	40	.8
-0	50	0.1
+0	50	0.1
-10	50	3.4
+10	50	3.4
-20	50	6.1
+20	50	6.1
-30	50	0
+30	50	0
-40	50	0
+40	50	0
-50	50	0
+50	50	0

dox/DoxygenLayout.xml

@@ -1,188 +1,188 @@
-<doxygenlayout version="1.0">
+<doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.3.1 -->
+  <!-- Generated by doxygen 1.8.3.1 -->
-  <!-- Navigation index tabs for HTML output -->
+  <!-- Navigation index tabs for HTML output -->
-  <navindex>
+  <navindex>
-    <tab type="mainpage" visible="yes" title="Introduction"/>
+    <tab type="mainpage" visible="yes" title="Introduction"/>
-    <tab type="pages" visible="yes" title="Documents" intro="This section contains links to all OCCT documents that are available at the moment"/>
+    <tab type="pages" visible="yes" title="Documents" intro="This section contains links to all OCCT documents that are available at the moment"/>
-    <tab type="modules" visible="yes" title="" intro=""/>
+    <tab type="modules" visible="yes" title="" intro=""/>
-    <tab type="namespaces" visible="yes" title="">
+    <tab type="namespaces" visible="yes" title="">
-      <tab type="namespacelist" visible="no" title="" intro=""/>
+      <tab type="namespacelist" visible="no" title="" intro=""/>
-      <tab type="namespacemembers" visible="yes" title="" intro=""/>
+      <tab type="namespacemembers" visible="yes" title="" intro=""/>
-    </tab>
+    </tab>
-    <tab type="classes" visible="yes" title="Reference Manual">
+    <tab type="classes" visible="yes" title="Reference Manual">
-      <tab type="classlist" visible="no" title="" intro=""/>
+      <tab type="classlist" visible="no" title="" intro=""/>
-      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
-      <tab type="hierarchy" visible="no" title="" intro=""/>
+      <tab type="hierarchy" visible="no" title="" intro=""/>
-      <tab type="classmembers" visible="no" title="" intro=""/>
+      <tab type="classmembers" visible="no" title="" intro=""/>
-    </tab>
+    </tab>
-    <tab type="files" visible="no" title="Files">
+    <tab type="files" visible="no" title="Files">
-      <tab type="filelist" visible="yes" title="" intro=""/>
+      <tab type="filelist" visible="yes" title="" intro=""/>
-      <tab type="globals" visible="yes" title="" intro=""/>
+      <tab type="globals" visible="yes" title="" intro=""/>
-    </tab>
+    </tab>
-    <tab type="examples" visible="no" title="" intro=""/>  
+    <tab type="examples" visible="no" title="" intro=""/>  
-  </navindex>
+  </navindex>
-
+
-  <!-- Layout definition for a class page -->
+  <!-- Layout definition for a class page -->
-  <class>
+  <class>
-    <briefdescription visible="yes"/>
+    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
-    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
-    <memberdecl>
+    <memberdecl>
-      <nestedclasses visible="yes" title=""/>
+      <nestedclasses visible="yes" title=""/>
-      <publictypes title=""/>
+      <publictypes title=""/>
-      <publicslots title=""/>
+      <publicslots title=""/>
-      <signals title=""/>
+      <signals title=""/>
-      <publicmethods title=""/>
+      <publicmethods title=""/>
-      <publicstaticmethods title=""/>
+      <publicstaticmethods title=""/>
-      <publicattributes title=""/>
+      <publicattributes title=""/>
-      <publicstaticattributes title=""/>
+      <publicstaticattributes title=""/>
-      <protectedtypes title=""/>
+      <protectedtypes title=""/>
-      <protectedslots title=""/>
+      <protectedslots title=""/>
-      <protectedmethods title=""/>
+      <protectedmethods title=""/>
-      <protectedstaticmethods title=""/>
+      <protectedstaticmethods title=""/>
-      <protectedattributes title=""/>
+      <protectedattributes title=""/>
-      <protectedstaticattributes title=""/>
+      <protectedstaticattributes title=""/>
-      <packagetypes title=""/>
+      <packagetypes title=""/>
-      <packagemethods title=""/>
+      <packagemethods title=""/>
-      <packagestaticmethods title=""/>
+      <packagestaticmethods title=""/>
-      <packageattributes title=""/>
+      <packageattributes title=""/>
-      <packagestaticattributes title=""/>
+      <packagestaticattributes title=""/>
-      <properties title=""/>
+      <properties title=""/>
-      <events title=""/>
+      <events title=""/>
-      <privatetypes title=""/>
+      <privatetypes title=""/>
-      <privateslots title=""/>
+      <privateslots title=""/>
-      <privatemethods title=""/>
+      <privatemethods title=""/>
-      <privatestaticmethods title=""/>
+      <privatestaticmethods title=""/>
-      <privateattributes title=""/>
+      <privateattributes title=""/>
-      <privatestaticattributes title=""/>
+      <privatestaticattributes title=""/>
-      <friends title=""/>
+      <friends title=""/>
-      <related title="" subtitle=""/>
+      <related title="" subtitle=""/>
-      <membergroups visible="yes"/>
+      <membergroups visible="yes"/>
-    </memberdecl>
+    </memberdecl>
-    <detaileddescription title=""/>
+    <detaileddescription title=""/>
-    <memberdef>
+    <memberdef>
-      <inlineclasses title=""/>
+      <inlineclasses title=""/>
-      <typedefs title=""/>
+      <typedefs title=""/>
-      <enums title=""/>
+      <enums title=""/>
-      <constructors title=""/>
+      <constructors title=""/>
-      <functions title=""/>
+      <functions title=""/>
-      <related title=""/>
+      <related title=""/>
-      <variables title=""/>
+      <variables title=""/>
-      <properties title=""/>
+      <properties title=""/>
-      <events title=""/>
+      <events title=""/>
-    </memberdef>
+    </memberdef>
-    <allmemberslink visible="yes"/>
+    <allmemberslink visible="yes"/>
-    <usedfiles visible="$SHOW_USED_FILES"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
-    <authorsection visible="yes"/>
+    <authorsection visible="yes"/>
-  </class>
+  </class>
-
+
-  <!-- Layout definition for a namespace page -->
+  <!-- Layout definition for a namespace page -->
-  <namespace>
+  <namespace>
-    <briefdescription visible="yes"/>
+    <briefdescription visible="yes"/>
-    <memberdecl>
+    <memberdecl>
-      <nestednamespaces visible="yes" title=""/>
+      <nestednamespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
+      <classes visible="yes" title=""/>
-      <typedefs title=""/>
+      <typedefs title=""/>
-      <enums title=""/>
+      <enums title=""/>
-      <functions title=""/>
+      <functions title=""/>
-      <variables title=""/>
+      <variables title=""/>
-      <membergroups visible="yes"/>
+      <membergroups visible="yes"/>
-    </memberdecl>
+    </memberdecl>
-    <detaileddescription title=""/>
+    <detaileddescription title=""/>
-    <memberdef>
+    <memberdef>
-      <inlineclasses title=""/>
+      <inlineclasses title=""/>
-      <typedefs title=""/>
+      <typedefs title=""/>
-      <enums title=""/>
+      <enums title=""/>
-      <functions title=""/>
+      <functions title=""/>
-      <variables title=""/>
+      <variables title=""/>
-    </memberdef>
+    </memberdef>
-    <authorsection visible="yes"/>
+    <authorsection visible="yes"/>
-  </namespace>
+  </namespace>
-
+
-  <!-- Layout definition for a file page -->
+  <!-- Layout definition for a file page -->
-  <file>
+  <file>
-    <briefdescription visible="yes"/>
+    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
-    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
-    <sourcelink visible="yes"/>
+    <sourcelink visible="yes"/>
-    <memberdecl>
+    <memberdecl>
-      <classes visible="yes" title=""/>
+      <classes visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
-      <defines title=""/>
+      <defines title=""/>
-      <typedefs title=""/>
+      <typedefs title=""/>
-      <enums title=""/>
+      <enums title=""/>
-      <functions title=""/>
+      <functions title=""/>
-      <variables title=""/>
+      <variables title=""/>
-      <membergroups visible="yes"/>
+      <membergroups visible="yes"/>
-    </memberdecl>
+    </memberdecl>
-    <detaileddescription title=""/>
+    <detaileddescription title=""/>
-    <memberdef>
+    <memberdef>
-      <inlineclasses title=""/>
+      <inlineclasses title=""/>
-      <defines title=""/>
+      <defines title=""/>
-      <typedefs title=""/>
+      <typedefs title=""/>
-      <enums title=""/>
+      <enums title=""/>
-      <functions title=""/>
+      <functions title=""/>
-      <variables title=""/>
+      <variables title=""/>
-    </memberdef>
+    </memberdef>
-    <authorsection/>
+    <authorsection/>
-  </file>
+  </file>
-
+
-  <!-- Layout definition for a group page -->
+  <!-- Layout definition for a group page -->
-  <group>
+  <group>
-    <briefdescription visible="yes"/>
+    <briefdescription visible="yes"/>
-    <groupgraph visible="$GROUP_GRAPHS"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
-    <memberdecl>
+    <memberdecl>
-      <nestedgroups visible="yes" title=""/>
+      <nestedgroups visible="yes" title=""/>
-      <dirs visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
-      <files visible="yes" title=""/>
+      <files visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
+      <classes visible="yes" title=""/>
-      <defines title=""/>
+      <defines title=""/>
-      <typedefs title=""/>
+      <typedefs title=""/>
-      <enums title=""/>
+      <enums title=""/>
-      <enumvalues title=""/>
+      <enumvalues title=""/>
-      <functions title=""/>
+      <functions title=""/>
-      <variables title=""/>
+      <variables title=""/>
-      <signals title=""/>
+      <signals title=""/>
-      <publicslots title=""/>
+      <publicslots title=""/>
-      <protectedslots title=""/>
+      <protectedslots title=""/>
-      <privateslots title=""/>
+      <privateslots title=""/>
-      <events title=""/>
+      <events title=""/>
-      <properties title=""/>
+      <properties title=""/>
-      <friends title=""/>
+      <friends title=""/>
-      <membergroups visible="yes"/>
+      <membergroups visible="yes"/>
-    </memberdecl>
+    </memberdecl>
-    <detaileddescription title=""/>
+    <detaileddescription title=""/>
-    <memberdef>
+    <memberdef>
-      <pagedocs/>
+      <pagedocs/>
-      <inlineclasses title=""/>
+      <inlineclasses title=""/>
-      <defines title=""/>
+      <defines title=""/>
-      <typedefs title=""/>
+      <typedefs title=""/>
-      <enums title=""/>
+      <enums title=""/>
-      <enumvalues title=""/>
+      <enumvalues title=""/>
-      <functions title=""/>
+      <functions title=""/>
-      <variables title=""/>
+      <variables title=""/>
-      <signals title=""/>
+      <signals title=""/>
-      <publicslots title=""/>
+      <publicslots title=""/>
-      <protectedslots title=""/>
+      <protectedslots title=""/>
-      <privateslots title=""/>
+      <privateslots title=""/>
-      <events title=""/>
+      <events title=""/>
-      <properties title=""/>
+      <properties title=""/>
-      <friends title=""/>
+      <friends title=""/>
-    </memberdef>
+    </memberdef>
-    <authorsection visible="yes"/>
+    <authorsection visible="yes"/>
-  </group>
+  </group>
-
+
-  <!-- Layout definition for a directory page -->
+  <!-- Layout definition for a directory page -->
-  <directory>
+  <directory>
-    <briefdescription visible="yes"/>
+    <briefdescription visible="yes"/>
-    <directorygraph visible="yes"/>
+    <directorygraph visible="yes"/>
-    <memberdecl>
+    <memberdecl>
-      <dirs visible="yes"/>
+      <dirs visible="yes"/>
-      <files visible="yes"/>
+      <files visible="yes"/>
-    </memberdecl>
+    </memberdecl>
-    <detaileddescription title=""/>
+    <detaileddescription title=""/>
-  </directory>
+  </directory>
-</doxygenlayout>
+</doxygenlayout>

dox/FILES_HTML.txt

@@ -45,6 +45,7 @@ user_guides/visualization/visualization.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
+user_guides/de_wrapper/de_wrapper.md
 user_guides/ocaf/ocaf.md
 user_guides/draw_test_harness/draw_test_harness.md
 user_guides/inspector/inspector.md

dox/FILES_PDF.txt

@@ -20,6 +20,7 @@ user_guides/vis/vis.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
+user_guides/de_wrapper/de_wrapper.md
 user_guides/inspector/inspector.md
 user_guides/draw_test_harness/draw_test_harness.md
 

dox/resources/occt_pdf_template.tex

@@ -1,151 +1,151 @@
-\batchmode
+\batchmode
-\nonstopmode
+\nonstopmode
-\documentclass[oneside]{article}
+\documentclass[oneside]{article}
-\n
+\n
-% Packages required by doxygen
+% Packages required by doxygen
-\usepackage{calc}
+\usepackage{calc}
-\usepackage{doxygen}
+\usepackage{doxygen}
-\usepackage{graphicx}
+\usepackage{graphicx}
-\usepackage[utf8]{inputenc}
+\usepackage[utf8]{inputenc}
-\usepackage{makeidx}
+\usepackage{makeidx}
-\usepackage{multicol}
+\usepackage{multicol}
-\usepackage{multirow}
+\usepackage{multirow}
-\usepackage{textcomp}
+\usepackage{textcomp}
-\usepackage{amsmath}
+\usepackage{amsmath}
-\usepackage[table]{xcolor}
+\usepackage[table]{xcolor}
-\usepackage{indentfirst}
+\usepackage{indentfirst}
-
+
-% Font selection
+% Font selection
-\usepackage[T1]{fontenc}
+\usepackage[T1]{fontenc}
-\usepackage{mathptmx}
+\usepackage{mathptmx}
-\usepackage[scaled=.90]{helvet}
+\usepackage[scaled=.90]{helvet}
-\usepackage{courier}
+\usepackage{courier}
-\usepackage{amssymb}
+\usepackage{amssymb}
-\usepackage{sectsty}
+\usepackage{sectsty}
-\renewcommand{\familydefault}{\sfdefault}
+\renewcommand{\familydefault}{\sfdefault}
-\allsectionsfont{%
+\allsectionsfont{%
-  \fontseries{bc}\selectfont%
+  \fontseries{bc}\selectfont%
-  \color{darkgray}%
+  \color{darkgray}%
-}
+}
-\renewcommand{\DoxyLabelFont}{%
+\renewcommand{\DoxyLabelFont}{%
-  \fontseries{bc}\selectfont%
+  \fontseries{bc}\selectfont%
-  \color{darkgray}%
+  \color{darkgray}%
-}
+}
-\newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
+\newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
-
+
-% Page & text layout
+% Page & text layout
-\usepackage{geometry}
+\usepackage{geometry}
-\geometry{%
+\geometry{%
-  a4paper,%
+  a4paper,%
-  top=2.5cm,%
+  top=2.5cm,%
-  bottom=2.5cm,%
+  bottom=2.5cm,%
-  left=2.5cm,%
+  left=2.5cm,%
-  right=2.5cm%
+  right=2.5cm%
-}
+}
-\tolerance=750
+\tolerance=750
-\hfuzz=15pt
+\hfuzz=15pt
-\hbadness=750
+\hbadness=750
-\setlength{\emergencystretch}{15pt}
+\setlength{\emergencystretch}{15pt}
-\setlength{\parindent}{0cm}
+\setlength{\parindent}{0cm}
-\setlength{\parskip}{0.2cm}
+\setlength{\parskip}{0.2cm}
-\makeatletter
+\makeatletter
-\renewcommand{\paragraph}{%
+\renewcommand{\paragraph}{%
-  \@startsection{paragraph}{4}{0ex}{-1.0ex}{1.0ex}{%
+  \@startsection{paragraph}{4}{0ex}{-1.0ex}{1.0ex}{%
-    \normalfont\normalsize\bfseries\SS@parafont%
+    \normalfont\normalsize\bfseries\SS@parafont%
-  }%
+  }%
-}
+}
-\renewcommand{\subparagraph}{%
+\renewcommand{\subparagraph}{%
-  \@startsection{subparagraph}{5}{0ex}{-1.0ex}{1.0ex}{%
+  \@startsection{subparagraph}{5}{0ex}{-1.0ex}{1.0ex}{%
-    \normalfont\normalsize\bfseries\SS@subparafont%
+    \normalfont\normalsize\bfseries\SS@subparafont%
-  }%
+  }%
-}
+}
-\makeatother
+\makeatother
-
+
-% Headers & footers
+% Headers & footers
-\usepackage{fancyhdr}
+\usepackage{fancyhdr}
-\pagestyle{fancyplain}
+\pagestyle{fancyplain}
-\fancyhead[LE]{\fancyplain{}{\bfseries\thepage}}
+\fancyhead[LE]{\fancyplain{}{\bfseries\thepage}}
-\fancyhead[CE]{\fancyplain{}{}}
+\fancyhead[CE]{\fancyplain{}{}}
-\fancyhead[RE]{\fancyplain{}{\bfseries\leftmark}}
+\fancyhead[RE]{\fancyplain{}{\bfseries\leftmark}}
-\fancyhead[LO]{\fancyplain{}{\bfseries\rightmark}}
+\fancyhead[LO]{\fancyplain{}{\bfseries\rightmark}}
-\fancyhead[CO]{\fancyplain{}{}}
+\fancyhead[CO]{\fancyplain{}{}}
-\fancyhead[RO]{\fancyplain{}{\bfseries\thepage}}
+\fancyhead[RO]{\fancyplain{}{\bfseries\thepage}}
-\fancyfoot[LE]{\fancyplain{}{}}
+\fancyfoot[LE]{\fancyplain{}{}}
-\fancyfoot[CE]{\fancyplain{}{}}
+\fancyfoot[CE]{\fancyplain{}{}}
-\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize (c) Open CASCADE DEFYEAR}}
+\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize (c) Open CASCADE DEFYEAR}}
-\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize (c) Open CASCADE DEFYEAR}}
+\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize (c) Open CASCADE DEFYEAR}}
-\fancyfoot[CO]{\fancyplain{}{}}
+\fancyfoot[CO]{\fancyplain{}{}}
-\fancyfoot[RO]{\fancyplain{}{}}
+\fancyfoot[RO]{\fancyplain{}{}}
-\renewcommand{\footrulewidth}{0.4pt}
+\renewcommand{\footrulewidth}{0.4pt}
-\renewcommand{\sectionmark}[1]{%
+\renewcommand{\sectionmark}[1]{%
-  \markright{\thesection\ #1}%
+  \markright{\thesection\ #1}%
-}
+}
-
+
-% Indices & bibliography
+% Indices & bibliography
-\usepackage{natbib}
+\usepackage{natbib}
-\usepackage[titles]{tocloft}
+\usepackage[titles]{tocloft}
-\renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}}
+\renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}}
-\setcounter{tocdepth}{3}
+\setcounter{tocdepth}{3}
-\setcounter{secnumdepth}{5}
+\setcounter{secnumdepth}{5}
-\makeindex
+\makeindex
-
+
-% Hyperlinks (required, but should be loaded last)
+% Hyperlinks (required, but should be loaded last)
-\usepackage{ifpdf}
+\usepackage{ifpdf}
-\ifpdf
+\ifpdf
-  \usepackage[pdftex,pagebackref=true]{hyperref}
+  \usepackage[pdftex,pagebackref=true]{hyperref}
-\else
+\else
-  \usepackage[ps2pdf,pagebackref=true]{hyperref}
+  \usepackage[ps2pdf,pagebackref=true]{hyperref}
-\fi
+\fi
-\hypersetup{%
+\hypersetup{%
-  colorlinks=true,%
+  colorlinks=true,%
-  linkcolor=blue,%
+  linkcolor=blue,%
-  citecolor=black,%
+  citecolor=black,%
-  urlcolor=blue,%
+  urlcolor=blue,%
-  unicode%
+  unicode%
-}
+}
-
+
-% Custom commands
+% Custom commands
-\newcommand{\clearemptydoublepage}{%
+\newcommand{\clearemptydoublepage}{%
-  \newpage{\pagestyle{empty}\cleardoublepage}%
+  \newpage{\pagestyle{empty}\cleardoublepage}%
-}
+}
-
+
-
+
-%===== C O N T E N T S =====
+%===== C O N T E N T S =====
-
+
-\begin{document}
+\begin{document}
-
+
-% Titlepage & ToC
+% Titlepage & ToC
-\hypersetup{pageanchor=false}
+\hypersetup{pageanchor=false}
-\pagenumbering{roman}
+\pagenumbering{roman}
-\begin{titlepage}
+\begin{titlepage}
-\vspace*{7cm}
+\vspace*{7cm}
-\begin{center}%
+\begin{center}%
-\includegraphics[width=0.75\textwidth, height=0.2\textheight]{../../../dox/resources/occt_logo.png}\\
+\includegraphics[width=0.75\textwidth, height=0.2\textheight]{../../../dox/resources/occt_logo.png}\\
-{\Large Open C\-A\-S\-C\-A\-D\-E Technology \\\\\Large DEFCASVERSION }\\
+{\Large Open C\-A\-S\-C\-A\-D\-E Technology \\\\\Large DEFCASVERSION }\\
-\vspace*{1cm}
+\vspace*{1cm}
-{\Large DEFDOCLABEL}\\
+{\Large DEFDOCLABEL}\\
-\vspace*{1cm}
+\vspace*{1cm}
-\vspace*{0.5cm}
+\vspace*{0.5cm}
-{\small \today}\
+{\small \today}\
-\end{center}
+\end{center}
-\end{titlepage}
+\end{titlepage}
-\clearpage
+\clearpage
-\pagenumbering{roman}
+\pagenumbering{roman}
-\newpage
+\newpage
-\pagenumbering{arabic}
+\pagenumbering{arabic}
-    \begingroup
+    \begingroup
-    \hypersetup{pageanchor=true, linkcolor=black, colorlinks=true}
+    \hypersetup{pageanchor=true, linkcolor=black, colorlinks=true}
-    \tableofcontents
+    \tableofcontents
-    \endgroup
+    \endgroup
-
+
-\let\stdsection\section
+\let\stdsection\section
-  \renewcommand\section{\pagebreak\stdsection}
+  \renewcommand\section{\pagebreak\stdsection}
-\hypertarget{DEFFILENAME}{}
+\hypertarget{DEFFILENAME}{}
-\input{DEFFILENAME}
+\input{DEFFILENAME}
-
+
-% Index
+% Index
-\newpage
+\newpage
-\phantomsection
+\phantomsection
-\addcontentsline{toc}{part}{Index}
+\addcontentsline{toc}{part}{Index}
-\printindex\n
+\printindex\n
-\end{document}
+\end{document}

dox/resources/occt_rm.doxyfile

@@ -1,46 +1,46 @@
-DOXYFILE_ENCODING      = UTF-8
+DOXYFILE_ENCODING      = UTF-8
-CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
+OUTPUT_LANGUAGE        = English
-MULTILINE_CPP_IS_BRIEF = YES
+MULTILINE_CPP_IS_BRIEF = YES
-INHERIT_DOCS           = YES
+INHERIT_DOCS           = YES
-REPEAT_BRIEF           = YES
+REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = NO
+ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
+INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
+FULL_PATH_NAMES        = NO
-OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_FOR_C  = YES
-SUBGROUPING            = YES
+SUBGROUPING            = YES
-DISTRIBUTE_GROUP_DOC   = YES
+DISTRIBUTE_GROUP_DOC   = YES
-EXTRACT_ALL            = YES
+EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = NO
+EXTRACT_PRIVATE        = NO
-EXTRACT_LOCAL_CLASSES  = NO
+EXTRACT_LOCAL_CLASSES  = NO
-EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_LOCAL_METHODS  = NO
-HIDE_FRIEND_COMPOUNDS  = YES
+HIDE_FRIEND_COMPOUNDS  = YES
-HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_MEMBERS     = NO
-INLINE_INFO            = YES
+INLINE_INFO            = YES
-VERBATIM_HEADERS       = NO
+VERBATIM_HEADERS       = NO
-QUIET                  = YES
+QUIET                  = YES
-WARNINGS               = NO
+WARNINGS               = NO
-ENABLE_PREPROCESSING   = YES
+ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = YES
+MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
+EXPAND_ONLY_PREDEF     = YES
-PREDEFINED             = Standard_EXPORT Standard_NODISCARD Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC "Standard_DEPRECATED=//! @deprecated "
+PREDEFINED             = Standard_EXPORT Standard_NODISCARD Standard_OVERRIDE:=override __Standard_API __Draw_API Handle(a):=Handle<a> DEFINE_STANDARD_ALLOC DEFINE_NCOLLECTION_ALLOC "Standard_DEPRECATED=//! @deprecated "
-GENERATE_HTML          = YES
+GENERATE_HTML          = YES
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = NO
-SEARCH_INCLUDES        = YES
+SEARCH_INCLUDES        = YES
-ALLEXTERNALS           = NO
+ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = NO
+EXTERNAL_GROUPS        = NO
-COLLABORATION_GRAPH    = NO
+COLLABORATION_GRAPH    = NO
-ENABLE_PREPROCESSING   = YES
+ENABLE_PREPROCESSING   = YES
-INCLUDE_FILE_PATTERNS  = *.hxx *.pxx
+INCLUDE_FILE_PATTERNS  = *.hxx *.pxx
-EXCLUDE_PATTERNS       = */Handle_*.hxx
+EXCLUDE_PATTERNS       = */Handle_*.hxx
-SKIP_FUNCTION_MACROS   = YES
+SKIP_FUNCTION_MACROS   = YES
-INLINE_SOURCES         = NO
+INLINE_SOURCES         = NO
-HAVE_DOT               = YES
+HAVE_DOT               = YES
-DOT_GRAPH_MAX_NODES    = 100
+DOT_GRAPH_MAX_NODES    = 100
-INCLUDE_GRAPH          = NO
+INCLUDE_GRAPH          = NO
-INCLUDED_BY_GRAPH      = NO
+INCLUDED_BY_GRAPH      = NO
-DOT_MULTI_TARGETS      = YES
+DOT_MULTI_TARGETS      = YES
-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT       = png
-GENERATE_LEGEND        = YES
+GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
+DOT_CLEANUP            = YES
-GRAPHICAL_HIERARCHY    = NO
+GRAPHICAL_HIERARCHY    = NO

dox/resources/occt_ug_html.doxyfile

@@ -1,59 +1,59 @@
-DOXYFILE_ENCODING      = UTF-8
+DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "Open CASCADE Technology"
+PROJECT_NAME           = "Open CASCADE Technology"
-PROJECT_BRIEF          = 
+PROJECT_BRIEF          = 
-CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
+OUTPUT_LANGUAGE        = English
-ABBREVIATE_BRIEF       = 
+ABBREVIATE_BRIEF       = 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = YES
-INHERIT_DOCS           = YES
+INHERIT_DOCS           = YES
-TAB_SIZE               = 4
+TAB_SIZE               = 4
-MARKDOWN_SUPPORT       = YES
+MARKDOWN_SUPPORT       = YES
-EXTRACT_ALL            = YES
+EXTRACT_ALL            = YES
-CASE_SENSE_NAMES       = NO
+CASE_SENSE_NAMES       = NO
-INLINE_INFO            = YES
+INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS       = YES
-WARNINGS               = YES
+WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
+WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
+WARN_NO_PARAMDOC       = NO
-INPUT_ENCODING         = UTF-8
+INPUT_ENCODING         = UTF-8
-FILE_PATTERNS          = *.md *.dox 
+FILE_PATTERNS          = *.md *.dox 
-RECURSIVE              = YES
+RECURSIVE              = YES
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = NO
-INLINE_SOURCES         = YES
+INLINE_SOURCES         = YES
-GENERATE_DOCSET        = NO
+GENERATE_DOCSET        = NO
-GENERATE_CHI           = NO
+GENERATE_CHI           = NO
-GENERATE_QHP           = NO
+GENERATE_QHP           = NO
-GENERATE_ECLIPSEHELP   = NO
+GENERATE_ECLIPSEHELP   = NO
-GENERATE_RTF           = NO
+GENERATE_RTF           = NO
-GENERATE_MAN           = NO
+GENERATE_MAN           = NO
-GENERATE_XML           = NO
+GENERATE_XML           = NO
-GENERATE_DOCBOOK       = NO
+GENERATE_DOCBOOK       = NO
-GENERATE_AUTOGEN_DEF   = NO
+GENERATE_AUTOGEN_DEF   = NO
-GENERATE_PERLMOD       = NO
+GENERATE_PERLMOD       = NO
-STRIP_CODE_COMMENTS    = NO
+STRIP_CODE_COMMENTS    = NO
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = NO
-GENERATE_HTMLHELP      = NO
+GENERATE_HTMLHELP      = NO
-GENERATE_HTML          = YES
+GENERATE_HTML          = YES
-HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_HUE    = 220
-HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_SAT    = 100
-HTML_COLORSTYLE_GAMMA  = 80
+HTML_COLORSTYLE_GAMMA  = 80
-HTML_TIMESTAMP         = YES
+HTML_TIMESTAMP         = YES
-HTML_DYNAMIC_SECTIONS  = YES
+HTML_DYNAMIC_SECTIONS  = YES
-HTML_INDEX_NUM_ENTRIES = 100
+HTML_INDEX_NUM_ENTRIES = 100
-DISABLE_INDEX          = YES
+DISABLE_INDEX          = YES
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = YES
-ENUM_VALUES_PER_LINE   = 8
+ENUM_VALUES_PER_LINE   = 8
-TREEVIEW_WIDTH         = 250
+TREEVIEW_WIDTH         = 250
-EXTERNAL_PAGES         = NO
+EXTERNAL_PAGES         = NO
-SEARCHDATA_FILE        = searchdata.xml
+SEARCHDATA_FILE        = searchdata.xml
-SKIP_FUNCTION_MACROS   = YES
+SKIP_FUNCTION_MACROS   = YES
-FORMULA_FONTSIZE       = 12
+FORMULA_FONTSIZE       = 12
-FORMULA_TRANSPARENT    = YES
+FORMULA_TRANSPARENT    = YES
-USE_MATHJAX            = YES
+USE_MATHJAX            = YES
-MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_FORMAT         = HTML-CSS
-
+
-# Define alias for inserting images in uniform way (both HTML and PDF)
+# Define alias for inserting images in uniform way (both HTML and PDF)
-ALIASES += figure{1}="\image html \1"
+ALIASES += figure{1}="\image html \1"
-ALIASES += figure{2}="\image html \1 \2"
+ALIASES += figure{2}="\image html \1 \2"
-ALIASES += figure{3}="\image html \1 \2"
+ALIASES += figure{3}="\image html \1 \2"

dox/resources/occt_ug_pdf.doxyfile

@@ -1,52 +1,52 @@
-DOXYFILE_ENCODING      = UTF-8
+DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "Open CASCADE Technology"
+PROJECT_NAME           = "Open CASCADE Technology"
-PROJECT_BRIEF          = 
+PROJECT_BRIEF          = 
-CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
+OUTPUT_LANGUAGE        = English
-ABBREVIATE_BRIEF       = 
+ABBREVIATE_BRIEF       = 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = YES
-INHERIT_DOCS           = YES
+INHERIT_DOCS           = YES
-TAB_SIZE               = 4
+TAB_SIZE               = 4
-MARKDOWN_SUPPORT       = YES
+MARKDOWN_SUPPORT       = YES
-EXTRACT_ALL            = YES
+EXTRACT_ALL            = YES
-CASE_SENSE_NAMES       = NO
+CASE_SENSE_NAMES       = NO
-INLINE_INFO            = YES
+INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS       = YES
-WARNINGS               = YES
+WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
+WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
+WARN_NO_PARAMDOC       = NO
-INPUT_ENCODING         = UTF-8
+INPUT_ENCODING         = UTF-8
-FILE_PATTERNS          = *.md *.dox 
+FILE_PATTERNS          = *.md *.dox 
-RECURSIVE              = YES
+RECURSIVE              = YES
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = NO
-INLINE_SOURCES         = YES
+INLINE_SOURCES         = YES
-GENERATE_DOCSET        = NO
+GENERATE_DOCSET        = NO
-GENERATE_CHI           = NO
+GENERATE_CHI           = NO
-GENERATE_QHP           = NO
+GENERATE_QHP           = NO
-GENERATE_ECLIPSEHELP   = NO
+GENERATE_ECLIPSEHELP   = NO
-GENERATE_RTF           = NO
+GENERATE_RTF           = NO
-GENERATE_MAN           = NO
+GENERATE_MAN           = NO
-GENERATE_XML           = NO
+GENERATE_XML           = NO
-GENERATE_DOCBOOK       = NO
+GENERATE_DOCBOOK       = NO
-GENERATE_AUTOGEN_DEF   = NO
+GENERATE_AUTOGEN_DEF   = NO
-GENERATE_PERLMOD       = NO
+GENERATE_PERLMOD       = NO
-STRIP_CODE_COMMENTS    = NO
+STRIP_CODE_COMMENTS    = NO
-GENERATE_HTMLHELP      = NO
+GENERATE_HTMLHELP      = NO
-GENERATE_HTML          = NO
+GENERATE_HTML          = NO
-DISABLE_INDEX          = YES
+DISABLE_INDEX          = YES
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = NO
-PREDEFINED             = PDF_ONLY
+PREDEFINED             = PDF_ONLY
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = YES
-COMPACT_LATEX          = YES
+COMPACT_LATEX          = YES
-PDF_HYPERLINKS         = YES
+PDF_HYPERLINKS         = YES
-USE_PDFLATEX           = YES
+USE_PDFLATEX           = YES
-LATEX_BATCHMODE        = YES
+LATEX_BATCHMODE        = YES
-LATEX_OUTPUT           = latex
+LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
+LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
+MAKEINDEX_CMD_NAME     = makeindex
-
+
-# Define alias for inserting images in uniform way (both HTML and PDF)
+# Define alias for inserting images in uniform way (both HTML and PDF)
-ALIASES += figure{1}="\image latex \1 \n"
+ALIASES += figure{1}="\image latex \1 \n"
-ALIASES += figure{2}="\image latex \1 \2 \n"
+ALIASES += figure{2}="\image latex \1 \2 \n"
-ALIASES += figure{3}="\image latex \1 \2 width=\3 \n"
+ALIASES += figure{3}="\image latex \1 \2 width=\3 \n"

dox/user_guides/de_wrapper/de_wrapper.md

@@ -0,0 +1,413 @@
+Data Exchange Wrapper (DE_Wrapper)  {#occt_user_guides__de_wrapper}
+============================
+
+@tableofcontents
+
+@section occt_de_wrapper_1 Introduction
+
+This guide explains how to use the **Data Exchange Wrapper** (DE Wrapper).
+It provides basic directions on setup, usage and file creation via DE_Wrapper.
+
+The Data Exchange Wrapper (DE Wrapper) module allows reading and writing supported CAD formats to shape objects or special XDE documents, setting up the transfer process for all CAD files.
+
+It is also possible to add support for new CAD formats by prototyping existing tools.
+
+The DE Wrapper component requires @ref occt_user_guides__xde "XDE" toolkit for operation.
+
+This guide mainly explains how to convert CAD files to Open CASCADE Technology (OCCT) shapes and vice versa.
+This guide principally deals with the following OCCT classes:
+  * The Provider class, which loads CAD files and translates their contents to OCCT shapes or XDE documents, or translates OCCT shapes or XDE documents to CAD entities and then writes those entities to a CAD file.
+  * The Configuration class, which contains all information for the transfer process, such as the units, tolerance, and all internal information for the OCC readers or writers.
+  * The wrapper class, which contains all loaded configuration objects with own CAD format, reads or writes CAD files in the format derived from file extension or contents and saves or loads configuration settings for loaded configuration objects.
+
+@section occt_de_wrapper_2 Supported CAD formats
+
+| CAD format | Extensions | RW support | Thread Safety | Presentation | Package |
+| :--------- | :--------- | :--------- | :----------- | :----------- | :------ |
+| STEP | .stp, .step .stepz | RW | No | BRep, Mesh | STEPCAFControl |
+| XCAF | .xbf | RW | Yes | BRep, Mesh | DEXCAFCascade |
+| BREP | .brep | RW | Yes | BRep, Mesh | DEBRepCascade |
+| IGES | .igs, .iges | RW | No | BRep | IGESCAFControl |
+| OBJ | .obj | RW | Yes | Mesh | RWObj |
+| STL | .stl | RW | Yes | Mesh | RWStl |
+| PLY | .ply | W | Yes | Mesh | RWPly |
+| GLTF | .glTF .glb | RW | Yes | Mesh | RWGltf |
+| VRML | .wrl .vrml | RW | Yes | Mesh | Vrml |
+
+**Note** :
+  * The format names in the first column match the FormatName values used for configuration nodes.
+  * The VendorName for all listed CAD formats is "OCC".
+
+@section occt_de_wrapper_3 DE Session Configuration
+
+Any providers can have their own read/write parameters. The transfer process is set up using DE configuration nodes, which hold all relevant parameters. There are two ways to change the parameter values: directly from code or by an external resource file/string.
+The session is a global or static DE_Wrapper object that stores registered DE configuration nodes and wraps DE commands to work with them. It has some configuration parameters of its own and also keeps track of loaded nodes and specilal global parameters.
+
+@subsection occt_de_wrapper_3_1 Getting a DE session. Code sample
+
+Working with a DE session requires a DE_Wrapper object to be loaded or created first.
+
+Getting the global DE_Wrapping object:
+~~~~{.cpp}
+Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+~~~~
+Creating a local DE_Wrapper:
+~~~~{.cpp}
+Handle(DE_Wrapper) aSession = new DE_Wrapper();
+~~~~
+It is recommended to create a local one-time copy to work with the session, if no global changes are intended.
+~~~~{.cpp}
+Handle(DE_Wrapper) aOneTimeSession = aSession->Copy();
+~~~~
+@subsection occt_de_wrapper_3_2 Configuration resource
+
+Configuration resource is an external file or string of the following format:
+~~~~{.cpp}
+global.priority.STEP :   OCC DTK
+global.general.length.unit :     1
+provider.STEP.OCC.read.precision.val :   0.0001
+~~~~
+
+@subsubsection occt_de_wrapper_3_2_1 Configuration resource: graph of scopes
+   * **global.** is a scope of global parameters
+     *  **priority.** is a scope of priority to use vendors with their providers.
+     *  **general.** is a scope of global configuration parameter values
+     *  <strong>"..."</strong> is an internal configuration with any internal scopes
+     *  <strong>". : "</strong> is a separator of key-value
+     *  __...__ parameter value, can't contain new line symbols.
+   * **provider.** is a scope of configuration providers
+     *  **STEP.** is a scope of CAD format to configure
+     *  **OCC.** is a scope of a vendor or provider
+     *  <strong>"..."</strong> is an internal configuration with any internal scopes
+     *  <strong>". : "</strong> is a separator of key-value
+     *  <strong>"..."</strong> parameter value, can't contain new line symbols.
+
+@subsubsection occt_de_wrapper_3_2_2 Loading configuration resources. Configuring DE Session
+
+The resource should be loaded after the registration of all providers that should be configured. The resource only impacts registered parameters. To configure a new registered provider it is necessary to load the resource again. Parameters not present in the resource will remain unchanged.
+
+There are two ways to check what parameters are available:
+* C++: Open ConfigureNode file and check the InternalParameter field. Each parameter will be described with a comment. To check the global parameters, use the DE_Wrapper class public methods.
+* Resource: Register all available Nodes to the session, then save the configuration and view all existing parameters.
+
+There are two options for loading a resource: recursive and global parameters only. Recursive is the default option to configure all global parameters (units, priority, enable status) and all registered providers. Non-recursive configures only global parameters and ignores all provider settings. This option is the best for updating provider priority.
+
+@subsubsection occt_de_wrapper_3_2_3 Loading configuration resources. Code sample
+
+Configuring using a resource string:
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  TCollection_AsciiString aString =
+    "global.priority.STEP :   OCC DTK\n"
+    "global.general.length.unit : 1\n"
+    "provider.STEP.OCC.read.precision.val : 0.\n";
+  Standard_Boolean aIsRecursive = Standard_True;
+  if (!aSession->Load(aString, aIsRecursive))
+  {
+    Message::SendFail() << "Error: configuration is incorrect";
+  }
+~~~~
+Configuring using a resource file:
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  TCollection_AsciiString aPathToFile = "";
+  Standard_Boolean aIsRecursive = Standard_True;
+  if (!aSession->Load(aPathToFile, aIsRecursive))
+  {
+    Message::SendFail() << "Error: configuration is incorrect";
+  }
+~~~~
+@subsubsection occt_de_wrapper_3_2_4 Loading configuration resources. DRAW sample
+
+Configuring using a resource string:
+~~~~{.cpp}
+set conf "
+global.priority.STEP :   OCC
+global.general.length.unit :     1
+provider.STEP.OCC.read.iges.bspline.continuity :         1
+provider.STEP.OCC.read.precision.mode :  0
+provider.STEP.OCC.read.precision.val :   0.0001
+"
+LoadConfiguration ${conf} -recursive on
+~~~~
+
+Configuring using a resource file:
+~~~~{.cpp}
+set pathToFile ""
+LoadConfiguration ${pathToFile} -recursive on
+~~~~
+
+@subsubsection occt_de_wrapper_3_2_5 Saving configuration resources. Dump of configuration DE Session
+
+Saving the configuration of a DE Session involves dumping all parameters of registered providers.
+If a parameter did not change during the session, its value remains as default.
+
+There are two ways to save a resource: recursive and global parameters only. Recursive is the way to dump all registered provider information. Non-recursive dumps only global parameters, for example, save priority of vendors or the length unit.
+
+It is possible to filter what vendors or providers to save by providing the correct name of the vendor or provider.
+
+@subsubsection occt_de_wrapper_3_2_6 Saving configuration resources. Code sample
+
+Dump to resource string. If the vendors list is empty, saves all vendors. If the providers list is empty, saves all providers of valid vendors.
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  TColStd_ListOfAsciiString aFormats;
+  TColStd_ListOfAsciiString aVendors;
+  aFormats.Appends("STEP");
+  aVendors.Appends("OCC");
+  Standard_Boolean aIsRecursive = Standard_True;
+  TCollection_AsciiString aConf = aSession->aConf->Save(aIsRecursive, aFormats, aVendors);
+~~~~
+Configure using a resource file. If the vendors list is empty, saves all vendors. If the providers list is empty, saves all providers of valid vendors.
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  TCollection_AsciiString aPathToFile = "";
+  TColStd_ListOfAsciiString aFormats;
+  TColStd_ListOfAsciiString aVendors;
+  aFormats.Appends("STEP");
+  aVendors.Appends("OCC");
+  Standard_Boolean aIsRecursive = Standard_True;
+  if (!aSession->Save(aPathToFile, aIsRecursive, aFormats,aVendors))
+  {
+    Message::SendFail() << "Error: configuration is not saved";
+  }
+~~~~
+@subsubsection occt_de_wrapper_3_2_7 Saving configuration resources. DRAW sample
+
+Dump configuration to string. If no list of vendors is passed or it is empty, all vendors are saved. If no providers list is passed or it is empty, all providers of valid vendors are saved.
+~~~~{.cpp}
+set vendors "OCC"
+set format "STEP"
+set dump_conf [DumpConfiguration -recursive on -format ${format} -vendor ${vendors}]
+~~~~
+
+Dump configuration to file. If no vendors list are set as an argument or it is empty, saves all vendors. If no providers list as argument or it is empty, saves all providers of valid vendors:
+~~~~{.cpp}
+set vendors "OCC"
+set format "STEP"
+set pathToFile ""
+DumpConfiguration -path ${pathToFile} -recursive on -format ${format} -vendor ${vendors}
+~~~~
+
+@subsection occt_de_wrapper_3_3 Registering providers
+
+To transfer a CAD file using DE Wrapper, it is necessary to register a CAD provider.
+The provider contains internal and global parameters that have default values in the creation stage.
+All registered providers are set to the map with information about its vendor and kept as smart handles. Therefore, it is possible to change the values via handle from external code.
+
+@subsubsection occt_de_wrapper_3_3_1 Registering providers. Code sample
+
+It is nesessary to register only one ConfigurationNode for all needed formats.
+~~~~{.cpp}
+Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+Handle(DE_ConfigurationNode) aNode = new STEPCAFControl_ConfigurationNode();
+aSession->Bind(aNode);
+~~~~
+@subsubsection occt_de_wrapper_3_3_2 Registering providers. DRAW Sample
+
+Use DRAW with all providers registered by the following command:
+~~~~{.cpp}
+pload XDE
+~~~~
+
+@subsubsection occt_de_wrapper_3_3_3 Realtime initialization. Code sample
+
+It is possible to change a paramater from code using a smart pointer.
+
+~~~~{.cpp}
+// global variable
+static Handle(STEPCAFControl_ConfigurationNode) THE_STEP_NODE;
+
+static Handle(DE_ConfigurationNode) RegisterStepNode()
+{
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  if (!THE_STEP_NODE.IsNull())
+  {
+    return THE_STEP_NODE;
+  }
+
+  THE_STEP_NODE = new STEPCAFControl_ConfigurationNode();
+  aSession->Bind(THE_STEP_NODE);
+  return THE_STEP_NODE;
+}
+
+// Change parameter value
+THE_STEP_NODE->InternalParameters.ReadRelationship = false;
+THE_STEP_NODE->InternalParameters.ReadName = false;
+THE_STEP_NODE->InternalParameters.ReadProps = false;
+~~~~
+
+@subsection occt_de_wrapper_3_4 Priority of Vendors
+
+DE session is able to work with several vendors with the same supported CAD format. To choose the preffered vendor for each format, use a special priority list.
+
+If the high priority vendor's provider is not supported, a transfer operation is needed (write/read), then the next vendor will be chosen.
+
+@subsubsection occt_de_wrapper_3_4_1 Priority of Vendors. Code sample
+
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  TCollection_AsciiString aFormat = "STEP";
+  TColStd_ListOfAsciiString aVendors;
+  aVendors.Appends("OCC"); // high priority
+  aVendors.Appends("DTK");
+  // Flag to disable not choosen vendors, in this case configuration is possible
+  // otherwise, lower their priority and continue to check ability to transfer
+  Standard_Boolean aToDisable = Standard_True;
+  aSession->ChangePriority(aFormat, aVendors, aToDisable);
+~~~~
+
+@subsubsection occt_de_wrapper_3_4_2 Priority of Vendors. DRAW Sample
+
+It is recommended to disable recursion and update only global parameters.
+~~~~{.cpp}
+set conf "
+global.priority.STEP :   OCC DTK
+"
+LoadConfiguration ${conf} -recursive off
+~~~~
+
+@section occt_de_wrapper_4 Transfer of CAD files
+
+To transfer from a CAD file to OCC or from OCC to a CAD file, it is necessary to use a configured DE_Wrapper object. It can be local, one-time or global. Global configuration of DE_Wrapper propagates to all nodes via transfer. There are two options for transferring: using OCC shape or XCAF document. It is possible to work only with real path to/from the file. Streaming is not supported (yet).
+
+The format of input/output file is automatically determined by its extension or contents.
+
+@subsection occt_de_wrapper_4_1 Transfer of CAD files. Code samples
+
+Reading STEP file to Shape.
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  TCollection_AsciiString aPathToFile = "example.stp";
+  TopoDS_Shape aShRes;
+  if (!aSession->Read(aPathToFile, aShRes))
+  {
+    Message::SendFail() << "Error: Can't read file";
+  }
+~~~~
+
+Writing Shape to STEP file.
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  TCollection_AsciiString aPathToFile = "example.stp";
+  TopoDS_Shape aShFrom = ...;
+  if (!aSession->Write(aPathToFile, aShRes))
+  {
+    Message::SendFail() << "Error: Can't write file";
+  }
+~~~~
+
+Reading STEP file into XCAF document.
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  TCollection_AsciiString aPathToFile = "example.stp";
+  Handle(TDocStd_Document) aDoc = ...;
+  if (!aSession->Read(aPathToFile, aDoc))
+  {
+    Message::SendFail() << "Error: Can't read file";
+  }
+~~~~
+
+Writing XCAF document into STEP.
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
+  TCollection_AsciiString aPathToFile = "example.stp";
+  Handle(TDocStd_Document) aDoc = ...;
+  if (!aSession->Write(aPathToFile, aDoc))
+  {
+    Message::SendFail() << "Error: Can't write file";
+  }
+~~~~
+
+@subsection occt_de_wrapper_4_2 Transfer of CAD files. DRAW samples
+
+Reading a STEP file into a Shape.
+~~~~{.cpp}
+set fileName "sample.stp"
+readfile shape ${fileName}
+~~~~
+
+Writing a Shape into STEP.
+~~~~{.cpp}
+set fileName "sample.stp"
+writefile shape ${fileName}
+~~~~
+
+Reading STEP into XCAF document.
+~~~~{.cpp}
+set fileName "sample.stp"
+ReadFile D ${fileName}
+~~~~
+
+Writing XCAF document into STEP.
+~~~~{.cpp}
+set fileName "sample.stp"
+WriteFile D ${fileName}
+~~~~
+
+@subsection occt_de_wrapper_4_3 Transfer using DE Provider. Code sample
+
+It is possible to read and write CAD files directly from a special provider.
+
+~~~~{.cpp}
+// Creating or getting node
+Handle(STEPCAFControl_ConfigurationNode) aNode = new STEPCAFControl_ConfigurationNode();
+// Creationg an one-time provider
+Handle(DE_Provider) aProvider = aNode->BuildProvider();
+// Setting configuration with all parameters
+aProvider->SetNode(aNode);
+if (!aProvider->Read(...))
+{
+  Message::SendFail() << "Error: Can't read STEP file";
+}
+if (!aProvider->Write(...))
+{
+  Message::SendFail() << "Error: Can't write STEP file";
+}
+~~~~
+
+@subsection occt_de_wrapper_4_4 Temporary configuration via transfer
+
+It is possible to change the configuration of only one transfer operation. To avoid changing parameters in a session, one-time clone of the session can be created and used for transfer. This way is recommended for use in multithreaded mode.
+
+@subsubsection occt_de_wrapper_4_4_1 Temporary configuration via transfer. Code sample
+
+Code sample to configure via transfer.
+~~~~{.cpp}
+  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper()->Copy();
+  TCollection_AsciiString aString =
+    "global.priority.STEP :   OCC DTK\n"
+    "global.general.length.unit : 1\n"
+    "provider.STEP.OCC.read.precision.val : 0.\n";
+  if (!aSession->Load(aString, aIsRecursive))
+  {
+    Message::SendFail() << "Error: configuration is incorrect";
+  }
+  TCollection_AsciiString aPathToFile = "example.stp";
+  TopoDS_Shape aShRes;
+  if (!aSession->Read(aPathToFile, aShRes))
+  {
+    Message::SendFail() << "Error: Can't read file";
+  }
+~~~~
+
+@subsubsection occt_de_wrapper_4_4_2 Temporary configuration via transfer. DRAW sample
+
+Code sample to configure via transfer within DRAW command.
+~~~~{.cpp}
+set fileName "sample.stp"
+readfile S5 $filename -conf "global.general.length.unit : 1000 "
+~~~~
+
+Code sample to configure via transfer as variable.
+~~~~{.cpp}
+set fileName "sample.stp"
+set conf "
+global.priority.STEP :   OCC
+global.general.length.unit :     1
+provider.STEP.OCC.read.iges.bspline.continuity :         1
+provider.STEP.OCC.read.precision.mode :  0
+provider.STEP.OCC.read.precision.val :   0.0001
+"
+readfile S5 $filename -conf ${conf}
+~~~~

dox/user_guides/user_guides.md

@@ -13,6 +13,7 @@ OCCT User Guides are organized by OCCT modules:
 * @subpage occt_user_guides__iges "IGES Translator"
 * @subpage occt_user_guides__step "STEP Translator"
 * @subpage occt_user_guides__xde "Extended Data Exchange (XDE)"
+* @subpage occt_user_guides__de_wrapper "Data Exchange Wrapper (DE Wrapper)"
 * @subpage occt_user_guides__ocaf "Open CASCADE Application Framework (OCAF)"
 * @subpage occt_user_guides__test_harness "DRAW Test Harness"
 * @subpage occt_user_guides__inspector "Inspector"

genconf

@@ -1,15 +1,15 @@
-#!/bin/bash
+#!/bin/bash
-
+
-# Helper script to configure environment for genproj tool.
+# Helper script to configure environment for genproj tool.
-# Running it requires that Tcl should be in the PATH
+# Running it requires that Tcl should be in the PATH
-
+
-# initialize environment
+# initialize environment
-aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-if [ ! -e "${aScriptPath}/env.sh" ]; then 
+if [ ! -e "${aScriptPath}/env.sh" ]; then 
-  cat ${aScriptPath}/adm/templates/env.sh | sed -e '/__CASROOT__/d' > ${aScriptPath}/env.sh
+  cat ${aScriptPath}/adm/templates/env.sh | sed -e '/__CASROOT__/d' > ${aScriptPath}/env.sh
-fi
+fi
-
+
-if [ -e "${aScriptPath}/custom.sh" ]; then source "${aScriptPath}/custom.sh"; fi
+if [ -e "${aScriptPath}/custom.sh" ]; then source "${aScriptPath}/custom.sh"; fi
-
+
-# run GUI tool
+# run GUI tool
-tclsh "${aScriptPath}/adm/genconf.tcl"
+tclsh "${aScriptPath}/adm/genconf.tcl"

gendoc

@@ -1,19 +1,19 @@
-#!/bin/bash
+#!/bin/bash
-
+
-# Helper script to run generation of OCCT documentation on Linux.
+# Helper script to run generation of OCCT documentation on Linux.
-# Running it requires that Tcl, Doxygen, and MikTex (for PDF generation) should be in the PATH
+# Running it requires that Tcl, Doxygen, and MikTex (for PDF generation) should be in the PATH
-
+
-anArgs=$*
+anArgs=$*
-anOldPath="$PATH"
+anOldPath="$PATH"
-anOldLd="$LD_LIBRARY_PATH"
+anOldLd="$LD_LIBRARY_PATH"
-anOldDyLd="$DYLD_LIBRARY_PATH"
+anOldDyLd="$DYLD_LIBRARY_PATH"
-
+
-# go to the script directory
+# go to the script directory
-aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-if [ -e "${aScriptPath}/env.sh" ]; then source "${aScriptPath}/env.sh"; fi
+if [ -e "${aScriptPath}/env.sh" ]; then source "${aScriptPath}/env.sh"; fi
-
+
-tclsh "${aScriptPath}/adm/start.tcl" gendoc $anArgs
+tclsh "${aScriptPath}/adm/start.tcl" gendoc $anArgs
-
+
-export PATH="$anOldPath"
+export PATH="$anOldPath"
-export LD_LIBRARY_PATH="$anOldLd"
+export LD_LIBRARY_PATH="$anOldLd"
-export DYLD_LIBRARY_PATH="$anOldDyLd"
+export DYLD_LIBRARY_PATH="$anOldDyLd"

genproj

@@ -1,47 +1,47 @@
-#!/bin/bash
+#!/bin/bash
-
+
-# Helper script to run generation of CBP/XCode projects on Linux / OS X.
+# Helper script to run generation of CBP/XCode projects on Linux / OS X.
-# Running it requires that Tcl should be in the PATH
+# Running it requires that Tcl should be in the PATH
-
+
-anOldPath="$PATH"
+anOldPath="$PATH"
-anOldLd="$LD_LIBRARY_PATH"
+anOldLd="$LD_LIBRARY_PATH"
-anOldDyLd="$DYLD_LIBRARY_PATH"
+anOldDyLd="$DYLD_LIBRARY_PATH"
-
+
-# go to the script directory
+# go to the script directory
-aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
+aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
-if [ ! -e "${aScriptPath}/env.sh" ]; then 
+if [ ! -e "${aScriptPath}/env.sh" ]; then 
-cat ${aScriptPath}/adm/templates/env.sh | sed -e '/__CASROOT__/d' > ${aScriptPath}/env.sh
+cat ${aScriptPath}/adm/templates/env.sh | sed -e '/__CASROOT__/d' > ${aScriptPath}/env.sh
-fi
+fi
-
+
-aSystem=`uname -s`
+aSystem=`uname -s`
-aTarget="$1"
+aTarget="$1"
-anOpt2=$2
+anOpt2=$2
-anOpt3=$3
+anOpt3=$3
-anOpt4=$4
+anOpt4=$4
-anOpt5=$5
+anOpt5=$5
-
+
-if [ ! -e "${aScriptPath}/custom.sh" ]; then
+if [ ! -e "${aScriptPath}/custom.sh" ]; then
-  tclsh "${aScriptPath}/adm/genconf.tcl"
+  tclsh "${aScriptPath}/adm/genconf.tcl"
-fi
+fi
-
+
-if [ ! -e "${aScriptPath}/custom.sh" ]; then
+if [ ! -e "${aScriptPath}/custom.sh" ]; then
-  echo "Error: custom.sh is not present."
+  echo "Error: custom.sh is not present."
-  echo "Run the script again to generate custom.sh, or create it manually"
+  echo "Run the script again to generate custom.sh, or create it manually"
-  exit 1
+  exit 1
-fi
+fi
-source "${aScriptPath}/custom.sh"
+source "${aScriptPath}/custom.sh"
-
+
-if [ -e "${aScriptPath}/env.sh" ]; then source "${aScriptPath}/env.sh"; fi
+if [ -e "${aScriptPath}/env.sh" ]; then source "${aScriptPath}/env.sh"; fi
-
+
-if [ "$aTarget" == "" ]; then aTarget=$PRJFMT; fi;
+if [ "$aTarget" == "" ]; then aTarget=$PRJFMT; fi;
-if [ "$aTarget" == "" ]; then
+if [ "$aTarget" == "" ]; then
-  aTarget="cbp"
+  aTarget="cbp"
-  if [ "$aSystem" == "Darwin" ]; then aTarget="xcd"; fi;
+  if [ "$aSystem" == "Darwin" ]; then aTarget="xcd"; fi;
-fi
+fi
-
+
-cd $aScriptPath
+cd $aScriptPath
-tclsh "./adm/start.tcl" genproj ${aTarget} -solution "OCCT" $anOpt2 $anOpt3 $anOpt4 $anOpt5
+tclsh "./adm/start.tcl" genproj ${aTarget} -solution "OCCT" $anOpt2 $anOpt3 $anOpt4 $anOpt5
-
+
-export PATH="$anOldPath"
+export PATH="$anOldPath"
-export LD_LIBRARY_PATH="$anOldLd"
+export LD_LIBRARY_PATH="$anOldLd"
-export DYLD_LIBRARY_PATH="$anOldDyLd"
+export DYLD_LIBRARY_PATH="$anOldDyLd"

get.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-problem_file=upgrade.bat
-
-list="master integration"
-echo "Getting commit hash"
-for name in $list ; do
-    echo $name
-    export shorthash_$name=$(git rev-parse --short $name)
-    echo shorthash_$name=$(eval echo "\$shorthash_${name}")
-done
-
-echo "Getting list of commits between master and integration"
-list=$(git rev-list --ancestry-path ${shorthash_master}..${shorthash_integration})
-
-echo "Getting commit whose hash matches the hash of commit with problematic file"
-for hash in $list ; do    
-    list_changed_files=$(git diff-tree --no-commit-id --name-only -r $hash | sed 's/\// /g' | awk '{ print $NF }')
-    for changed_file in $list_changed_files; do
-        if [ "$problem_file" == "$changed_file" ] ; then
-            echo Reverting: 
-            echo $(git log -1 --format=oneline $hash)
-            # git revert $hash
-            hash=$(echo $hash | head -c 10)
-            echo $hash
-            git rebase --onto $hash^ $hash
-        fi
-    done
-done

samples/CSharp/WPF_D3D/About.xaml

@@ -1,18 +1,18 @@
-<Window
+<Window
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	x:Class="IE_WPF_D3D.AboutDialog"
+	x:Class="IE_WPF_D3D.AboutDialog"
-	x:Name="Window"
+	x:Name="Window"
-	xmlns:local="clr-namespace:IE_WPF_D3D"
+	xmlns:local="clr-namespace:IE_WPF_D3D"
-	Title="About Import/Export Sample"
+	Title="About Import/Export Sample"
-	Width="312" Height="285">
+	Width="312" Height="285">
-	
+	
-	<StackPanel Orientation="Vertical">
+	<StackPanel Orientation="Vertical">
-		<Label Content="Import/Export Sample," HorizontalAlignment="Center"/>
+		<Label Content="Import/Export Sample," HorizontalAlignment="Center"/>
-		<Label Content="Open CASCADE Technology " HorizontalAlignment="Center"/>
+		<Label Content="Open CASCADE Technology " HorizontalAlignment="Center"/>
-		<Image Source="occ_logo.bmp" Width="194" Height="100" />
+		<Image Source="occ_logo.bmp" Width="194" Height="100" />
-		<Label Content="Copyright (C) 2004-2013, Open CASCADE S.A.S" HorizontalAlignment="Center"/>
+		<Label Content="Copyright (C) 2004-2013, Open CASCADE S.A.S" HorizontalAlignment="Center"/>
-		<Label Content="http://www.opencascade.com" HorizontalAlignment="Center"/>
+		<Label Content="http://www.opencascade.com" HorizontalAlignment="Center"/>
-		<Button Content="OK" HorizontalAlignment="Center" Width="75" Command="local:IECommands.AboutOk"/>
+		<Button Content="OK" HorizontalAlignment="Center" Width="75" Command="local:IECommands.AboutOk"/>
-	</StackPanel>	
+	</StackPanel>	
 </Window>

samples/CSharp/WPF_D3D/App.xaml

@@ -1,14 +1,14 @@
-<Application x:Class="IE_WPF_D3D.App"
+<Application x:Class="IE_WPF_D3D.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    StartupUri="MainWindow.xaml">
+    StartupUri="MainWindow.xaml">
-    <Application.Resources>
+    <Application.Resources>
-         
+         
-    	<ResourceDictionary>
+    	<ResourceDictionary>
-    		<ResourceDictionary.MergedDictionaries>
+    		<ResourceDictionary.MergedDictionaries>
-    			<ResourceDictionary Source="Simple Styles.xaml"/>
+    			<ResourceDictionary Source="Simple Styles.xaml"/>
-    		</ResourceDictionary.MergedDictionaries>
+    		</ResourceDictionary.MergedDictionaries>
-    	</ResourceDictionary>
+    	</ResourceDictionary>
-         
+         
-    </Application.Resources>
+    </Application.Resources>
-</Application>
+</Application>