]> OCCT Git - occt-copy.git/commitdiff
0026591: Header collecting in CMake configuration process does not consider 'patch...
authoribs <ibs@opencascade.com>
Thu, 6 Aug 2015 17:59:26 +0000 (20:59 +0300)
committerbugmaster <bugmaster@opencascade.com>
Thu, 3 Sep 2015 12:14:40 +0000 (15:14 +0300)
"patch" functionality fixed (except mfc samples)
CMake variable descriptions updated and their width realigned

63 files changed:
CMakeLists.txt
adm/cmake/occt_macros.cmake
adm/cmake/occt_toolkit.cmake
adm/cmake/vardescr.cmake
dox/dev_guides/building/cmake/cmake.md
src/DRAWEXE/CMakeLists.txt
src/FWOSPlugin/CMakeLists.txt
src/TKBO/CMakeLists.txt
src/TKBRep/CMakeLists.txt
src/TKBin/CMakeLists.txt
src/TKBinL/CMakeLists.txt
src/TKBinTObj/CMakeLists.txt
src/TKBinXCAF/CMakeLists.txt
src/TKBool/CMakeLists.txt
src/TKCAF/CMakeLists.txt
src/TKCDF/CMakeLists.txt
src/TKDCAF/CMakeLists.txt
src/TKDraw/CMakeLists.txt
src/TKFeat/CMakeLists.txt
src/TKFillet/CMakeLists.txt
src/TKG2d/CMakeLists.txt
src/TKG3d/CMakeLists.txt
src/TKGeomAlgo/CMakeLists.txt
src/TKGeomBase/CMakeLists.txt
src/TKHLR/CMakeLists.txt
src/TKIGES/CMakeLists.txt
src/TKIVtk/CMakeLists.txt
src/TKIVtkDraw/CMakeLists.txt
src/TKLCAF/CMakeLists.txt
src/TKMath/CMakeLists.txt
src/TKMesh/CMakeLists.txt
src/TKMeshVS/CMakeLists.txt
src/TKOffset/CMakeLists.txt
src/TKOpenGl/CMakeLists.txt
src/TKPrim/CMakeLists.txt
src/TKQADraw/CMakeLists.txt
src/TKSTEP/CMakeLists.txt
src/TKSTEP209/CMakeLists.txt
src/TKSTEPAttr/CMakeLists.txt
src/TKSTEPBase/CMakeLists.txt
src/TKSTL/CMakeLists.txt
src/TKService/CMakeLists.txt
src/TKShHealing/CMakeLists.txt
src/TKTObj/CMakeLists.txt
src/TKTObjDRAW/CMakeLists.txt
src/TKTopAlgo/CMakeLists.txt
src/TKTopTest/CMakeLists.txt
src/TKV3d/CMakeLists.txt
src/TKVRML/CMakeLists.txt
src/TKViewerTest/CMakeLists.txt
src/TKVoxel/CMakeLists.txt
src/TKXCAF/CMakeLists.txt
src/TKXDEDRAW/CMakeLists.txt
src/TKXDEIGES/CMakeLists.txt
src/TKXDESTEP/CMakeLists.txt
src/TKXMesh/CMakeLists.txt
src/TKXSBase/CMakeLists.txt
src/TKXSDRAW/CMakeLists.txt
src/TKXml/CMakeLists.txt
src/TKXmlL/CMakeLists.txt
src/TKXmlTObj/CMakeLists.txt
src/TKXmlXCAF/CMakeLists.txt
src/TKernel/CMakeLists.txt

index 11978c493ccd9d8e8358a1759f7c92bcfe3e96cc..85c57effed231c1d640ca436adc373e1f341ec59 100644 (file)
@@ -6,10 +6,10 @@ set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FO
 
 # macro: include patched file if it exists
 macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
-  if (NOT "${APPLY_OCCT_PATCH_DIR}" STREQUAL "" AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake")
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake")
     include (${APPLY_OCCT_PATCH_DIR}/${BEING_INCLUDED_FILE}.cmake)
   else()
-    include (${BEING_INCLUDED_FILE}.cmake)
+    include (${CMAKE_SOURCE_DIR}/${BEING_INCLUDED_FILE}.cmake)
   endif()
 endmacro()
 
@@ -143,7 +143,7 @@ if ("${3RDPARTY_DIR}" STREQUAL "")
 endif()
 
 # search for CSF_TclLibs variable in EXTERNLIB of each being used toolkit
-OCCT_IS_PRODUCT_REQUIRED(CSF_TclLibs USE_TCL)
+OCCT_IS_PRODUCT_REQUIRED (CSF_TclLibs USE_TCL)
 
 if ("${USE_TCL}" STREQUAL ON)
   message (STATUS "Info: tcl is used by OCCT")
@@ -154,7 +154,7 @@ else()
 endif()
 
 # search for CSF_FREETYPE variable in EXTERNLIB of each being used toolkit
-OCCT_IS_PRODUCT_REQUIRED(CSF_FREETYPE USE_FREETYPE)
+OCCT_IS_PRODUCT_REQUIRED (CSF_FREETYPE USE_FREETYPE)
 
 if ("${USE_FREETYPE}" STREQUAL ON)
   message (STATUS "Info: freetype is used by OCCT")
@@ -169,6 +169,9 @@ endif()
 if (USE_VTK)
   add_definitions (-DHAVE_VTK)
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
+else()
+  OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
+  OCCT_CHECK_AND_UNSET ("INSTALL_VTK")
 endif()
 
 # GLX
@@ -227,7 +230,8 @@ if (BUILD_DOC_OcctOverview)
 
   if (INSTALL_DOC_OcctOverview)
     install (DIRECTORY "${CMAKE_BINARY_DIR}/doc/overview" DESTINATION  "${INSTALL_DIR}/doc")
-    install (FILES "${CMAKE_SOURCE_DIR}/dox/resources/overview.html" DESTINATION  "${INSTALL_DIR}")
+
+    OCCT_INSTALL_FILE_OR_DIR ("dox/resources/overview.html" "${INSTALL_DIR}")
   endif()
 
   OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/doxygen")
@@ -294,8 +298,9 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
 
 if (WIN32) 
-  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
-  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG   "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
 endif()
 
 if ("${INSTALL_DIR}" STREQUAL "")
@@ -309,13 +314,8 @@ endif()
 
 message (STATUS "\nInfo: Collecting all OCCT header files into ${CMAKE_BINARY_DIR}/inc ...")
 
-# (!) patch is not taken into account COLLECT_AND_INSTALL_OCCT_HEADER_FILES
 # collect all the headers to <binary dir>/inc folder
-COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}")
-# apply patched header files
-#if (NOT "${APPLY_OCCT_PATCH_DIR}" STREQUAL "")
-#  COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${APPLY_OCCT_PATCH_DIR}" "${CMAKE_SOURCE_DIR}/adm/templates/header.in" "${CMAKE_BINARY_DIR}")
-#endif()
+COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}")
 
 OCCT_INSTALL_FILE_OR_DIR ("data" "${INSTALL_DIR}")
 OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR}/samples")
@@ -335,7 +335,7 @@ else()
 endif()
 
 # DRAW.BAT or DRAW.SH
-if (NOT "${APPLY_OCCT_PATCH_DIR}" STREQUAL "" AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
+if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
   install (FILES "${APPLY_OCCT_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR}" PERMISSIONS
           OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
 else()
@@ -372,7 +372,7 @@ OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME
 
 if (BUILD_MODULE_OcctMfcSamples)
   OCCT_INSTALL_FILE_OR_DIR ("adm/templates/sample.bat" "${INSTALL_DIR}")
-  OCCT_COPY_FILE_OR_DIR ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
+  OCCT_COPY_FILE_OR_DIR    ("adm/templates/sample.bat" "${CMAKE_BINARY_DIR}")
 endif()
 
 # env script for draw in building environment
@@ -404,8 +404,8 @@ install (FILES "${CMAKE_BINARY_DIR}/env.install.relwithdebinfo.${SCRIPT_EXT}"
          RENAME "env.${SCRIPT_EXT}")
 
 # copy DrawAppliInit from OCCT source to build directory
-if (EXISTS "${CMAKE_SOURCE_DIR}/DrawAppliInit" AND NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
-  file (COPY "${CMAKE_SOURCE_DIR}/DrawAppliInit" DESTINATION "${CMAKE_BINARY_DIR}")
+if (NOT EXISTS "${CMAKE_BINARY_DIR}/DrawAppliInit")
+  OCCT_COPY_FILE_OR_DIR (DrawAppliInit "${CMAKE_BINARY_DIR}")
 endif()
 
 # RESOURCES
@@ -422,17 +422,11 @@ endforeach()
 
 # include patched toolkit projects or original ones
 foreach (BUILD_TOOLKIT ${BUILD_TOOLKITS})
-  if (NOT "${APPLY_OCCT_PATCH_DIR}" STREQUAL "" AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${BUILD_TOOLKIT}")
-    add_subdirectory(${APPLY_OCCT_PATCH_DIR}/src/${BUILD_TOOLKIT})
-  elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${BUILD_TOOLKIT}")
-    add_subdirectory (${CMAKE_SOURCE_DIR}/src/${BUILD_TOOLKIT})
-  else()
-    message (STATUS "${BUILD_TOOLKIT} is not included")
-  endif()
+  OCCT_ADD_SUBDIRECTORY ("src/${BUILD_TOOLKIT}")
 endforeach()
 
 if (BUILD_DOC_OcctOverview)
-  add_subdirectory (dox)
+  OCCT_ADD_SUBDIRECTORY (dox)
 endif()
 
 # patch DRAWEXE
@@ -452,7 +446,7 @@ if (MSVC AND 3RDPARTY_DLL_DIRS)
       set (X_COMPILER_BITNESS "Win32")
     endif()
 
-    configure_file (${CMAKE_SOURCE_DIR}/adm/templates/DRAWEXE.vcxproj.user.in ${CMAKE_BINARY_DIR}/src/DRAWEXE/DRAWEXE.vcxproj.user @ONLY)
+    OCCT_CONFIGURE ("adm/templates/DRAWEXE.vcxproj.user.in" "${CMAKE_BINARY_DIR}/src/DRAWEXE/DRAWEXE.vcxproj.user")
   endif()
 endif()
 
index 38d5cdd205180b7a8e424a715126560cc181baf3..68d3ef5d454276d7303ad5c58b88074394825e61 100644 (file)
@@ -80,6 +80,29 @@ function (SUBDIRECTORY_NAMES MAIN_DIRECTORY RESULT)
   set (${RESULT} ${LOCAL_RESULT} PARENT_SCOPE)
 endfunction()
 
+function (OCCT_ORIGIN_AND_PATCHED_FILES RELATIVE_PATH SEARCH_TEMPLATE RESULT)
+
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}")
+    file (GLOB FOUND_FILES "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
+  endif()
+
+  file (GLOB ORIGIN_FILES "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${SEARCH_TEMPLATE}")
+  foreach (ORIGIN_FILE ${ORIGIN_FILES})
+    # check for existence of patched version of current file
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}")
+      get_filename_component (ORIGIN_FILE_NAME "${ORIGIN_FILE}" NAME)
+      if (EXISTS "${APPLY_OCCT_PATCH_DIR}/${RELATIVE_PATH}/${ORIGIN_FILE_NAME}")
+        continue()
+      endif()
+    endif()
+
+    # append origin version if patched one is not found
+    list (APPEND FOUND_FILES ${ORIGIN_FILE})
+  endforeach()
+
+  set (${RESULT} ${FOUND_FILES} PARENT_SCOPE)
+endfunction()
+
 function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
   OCCT_MAKE_COMPILER_SHORT_NAME()
   OCCT_MAKE_COMPILER_BITNESS()
@@ -147,17 +170,27 @@ macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE BUILD_NAME INSTALL_NAME
   install(FILES "${OCCT_BINARY_DIR}/${BUILD_NAME}" DESTINATION  "${DESTINATION_PATH}" RENAME ${INSTALL_NAME})
 endmacro()
 
-macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_OCCT_DIR TEMPLATE_HEADER_PATH ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOOLKITS)
+macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARGET_OCCT_DIR OCCT_BUILD_TOOLKITS)
   set (OCCT_SOURCE_DIRS)
 
+  # consider patched header.in template
+  set (TEMPLATE_HEADER_PATH "${CMAKE_SOURCE_DIR}/adm/templates/header.in")
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/header.in")
+    set (TEMPLATE_HEADER_PATH "${APPLY_OCCT_PATCH_DIR}/adm/templates/header.in")
+  endif()
+
+  set (ROOT_OCCT_DIR ${CMAKE_SOURCE_DIR})
+
   foreach (OCCT_USED_TOOLKIT ${OCCT_BUILD_TOOLKITS})
     # append parent folder
     list (APPEND OCCT_SOURCE_DIRS ${OCCT_USED_TOOLKIT})
 
     # append all required package folders
     set (OCCT_USED_TOOLKIT_DEPS)
-    if (EXISTS "${ROOT_OCCT_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
-      file (STRINGS "${ROOT_OCCT_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_USED_TOOLKIT_DEPS)
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
+      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_USED_TOOLKIT_DEPS)
+    elseif (EXISTS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES")
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_USED_TOOLKIT}/PACKAGES" OCCT_USED_TOOLKIT_DEPS)
     endif()
 
     foreach (OCCT_USED_TOOLKIT_DEP ${OCCT_USED_TOOLKIT_DEPS})
@@ -166,9 +199,8 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_OCCT_DIR TEMPLATE_HEADER_PATH
   endforeach()
 
   foreach (OCCT_SOURCE_DIR ${OCCT_SOURCE_DIRS})
-    # get all header files from each src folder 
-    file (GLOB OCCT_HEADER_FILES "${ROOT_OCCT_DIR}/src/${OCCT_SOURCE_DIR}/*.[hgl]xx" "${ROOT_OCCT_DIR}/src/${OCCT_SOURCE_DIR}/*.h")
-
+    # get all header files from each src folder
+    file (GLOB OCCT_HEADER_FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_SOURCE_DIR}/*.[hgl]xx" "${CMAKE_SOURCE_DIR}/src/${OCCT_SOURCE_DIR}/*.h")
     install (FILES ${OCCT_HEADER_FILES} DESTINATION "${INSTALL_DIR}/inc")
 
     # create new file including found header
@@ -176,12 +208,26 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_OCCT_DIR TEMPLATE_HEADER_PATH
       get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
       configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
     endforeach()
+
+    # consider pathed the source files
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_SOURCE_DIR}")
+      file (GLOB PATCHED_OCCT_HEADER_FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_SOURCE_DIR}/*.[hgl]xx" "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_SOURCE_DIR}/*.h")
+      install (FILES ${PATCHED_OCCT_HEADER_FILES} DESTINATION "${INSTALL_DIR}/inc")
+
+      # create new patched file including found header
+      foreach (OCCT_HEADER_FILE ${PATCHED_OCCT_HEADER_FILES})
+        get_filename_component (HEADER_FILE_NAME ${OCCT_HEADER_FILE} NAME)
+        configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/inc/${HEADER_FILE_NAME}" @ONLY)
+      endforeach()
+    endif()
   endforeach()
 endmacro()
 
 macro (OCCT_COPY_FILE_OR_DIR BEING_COPIED_OBJECT DESTINATION_PATH)
   # first of all, copy original files
-  file (COPY "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+  if (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}")
+    file (COPY "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}" DESTINATION  "${DESTINATION_PATH}")
+  endif()
 
   if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_COPIED_OBJECT}")
     # secondly, rewrite original files with patched ones
@@ -197,6 +243,16 @@ macro (OCCT_CONFIGURE BEING_CONGIRUGED_FILE FINAL_NAME)
   endif()
 endmacro()
 
+macro (OCCT_ADD_SUBDIRECTORY BEING_ADDED_DIRECTORY)
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
+    add_subdirectory(${APPLY_OCCT_PATCH_DIR}/${BEING_ADDED_DIRECTORY})
+  elseif (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt")
+    add_subdirectory (${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY})
+  else()
+    message (STATUS "${BEING_ADDED_DIRECTORY} directory is not included")
+  endif()
+endmacro()
+
 function (OCCT_IS_PRODUCT_REQUIRED CSF_VAR_NAME USE_PRODUCT)
   set (${USE_PRODUCT} OFF PARENT_SCOPE)
 
index 2be865c7e94291f113d2082950c64521375bd5c0..96f9fc66d26f3f16012509cbe92545db5ce9f624 100644 (file)
@@ -1,26 +1,11 @@
 # script for each OCCT toolkit
 
 # Get all used packages from toolkit
-foreach (TOOLKIT_MODULE ${TOOLKIT_MODULES})
+foreach (OCCT_PACKAGE ${TOOLKIT_MODULES})
   if (WIN32)
-    list (APPEND PRECOMPILED_DEFS "-D__${TOOLKIT_MODULE}_DLL")
+    list (APPEND PRECOMPILED_DEFS "-D__${OCCT_PACKAGE}_DLL")
   endif()
-  list (APPEND COMPILER_DIRECTORIES "${OCCT_SOURCE_DIR}/src/${TOOLKIT_MODULE}")
-endforeach()
-string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
-
-# Get from toolkits EXTERNLIB all used libs
-OCCT_TOOLKIT_DEP (${PROJECT_NAME} ${PROJECT_NAME}_DEPS)
-foreach (PROJECT_DEP ${${PROJECT_NAME}_DEPS})
-  IS_OCCT_TOOLKIT (${PROJECT_DEP} OCCT_MODULES FOUND_TOOLKIT)
-  if ("${FOUND_TOOLKIT}" STREQUAL "ON")
-    list (APPEND USED_LIBS "${PROJECT_DEP}")
-  endif()
-endforeach()
-
-# Get all source files from used packages
-foreach (CMP_DIR ${COMPILER_DIRECTORIES})
-  get_filename_component (CMP_DIR_NAME ${CMP_DIR} NAME)
+  # ${OCCT_SOURCE_DIR}/src/${OCCT_PACKAGE}
 
   set (SOURCE_FILES)
   set (HEADER_FILES)
@@ -29,12 +14,12 @@ foreach (CMP_DIR ${COMPILER_DIRECTORIES})
   if (${REBUILD_PLATFORM_DEPENDENT_CODE})
 
     # flex files
-    file (GLOB SOURCE_FILES_FLEX "${CMP_DIR}/*[.]lex") 
+    OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
     list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)
     list (SORT SOURCE_FILES_FLEX)
 
     # bison files
-    file (GLOB SOURCE_FILES_BISON "${CMP_DIR}/*[.]yacc") 
+    OCCT_ORIGIN_AND_PATCHED_FILES ("src/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
     list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
     list (SORT SOURCE_FILES_BISON)
 
@@ -64,31 +49,65 @@ foreach (CMP_DIR ${COMPILER_DIRECTORIES})
     endif()
   endif()
 
-  # header files 
-  file (STRINGS "${CMP_DIR}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
-  file (STRINGS "${CMP_DIR}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
-  file (STRINGS "${CMP_DIR}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
-  list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
+  # header files
+  if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES")
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_M   REGEX ".+[.]h")
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_LXX REGEX ".+[.]lxx")
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" HEADER_FILES_GXX REGEX ".+[.]gxx")
 
-  foreach(HEADER_FILE ${HEADER_FILES})
-    list (APPEND USED_INCFILES ${CMP_DIR}/${HEADER_FILE})
-    SOURCE_GROUP ("Header Files\\${CMP_DIR_NAME}" FILES ${CMP_DIR}/${HEADER_FILE})
-  endforeach()
+    file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
+    if(APPLE)
+      file (STRINGS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
+    endif()
+  else()
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_M   REGEX ".+[.]h")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_LXX REGEX ".+[.]lxx")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     HEADER_FILES_GXX REGEX ".+[.]gxx")
 
-  # source files
-  file (STRINGS "${CMP_DIR}/FILES" SOURCE_FILES_C REGEX ".+[.]c")
+    file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"     SOURCE_FILES_C REGEX ".+[.]c")
+    if(APPLE)
+      file (STRINGS "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/FILES"   SOURCE_FILES_M REGEX ".+[.]mm")
+    endif()
+  endif()
+  
+  list (APPEND HEADER_FILES ${HEADER_FILES_M} ${HEADER_FILES_LXX} ${SOURCE_FILES_GXX})
   list (APPEND SOURCE_FILES ${SOURCE_FILES_C})
-
   if(APPLE)
-    file (STRINGS "${CMP_DIR}/FILES" SOURCE_FILES_M REGEX ".+[.]mm")
     list (APPEND SOURCE_FILES ${SOURCE_FILES_M})
   endif()
 
+  foreach(HEADER_FILE ${HEADER_FILES})
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      list (APPEND USED_INCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+    else()
+      list (APPEND USED_INCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+      SOURCE_GROUP ("Header Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${HEADER_FILE}")
+    endif()
+  endforeach()
+
   foreach(SOURCE_FILE ${SOURCE_FILES})
-    list (APPEND USED_SRCFILES ${CMP_DIR}/${SOURCE_FILE})
-    SOURCE_GROUP ("Source Files\\${CMP_DIR_NAME}" FILES ${CMP_DIR}/${SOURCE_FILE})
+    if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      message (STATUS "Info. consider patched file: ${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      list (APPEND USED_SRCFILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${APPLY_OCCT_PATCH_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+    else()
+      list (APPEND USED_SRCFILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+      SOURCE_GROUP ("Source Files\\${OCCT_PACKAGE}" FILES "${CMAKE_SOURCE_DIR}/src/${OCCT_PACKAGE}/${SOURCE_FILE}")
+    endif()
   endforeach()
 endforeach()
+string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}")
+
+# Get from toolkits EXTERNLIB all used libs
+OCCT_TOOLKIT_DEP (${PROJECT_NAME} ${PROJECT_NAME}_DEPS)
+foreach (PROJECT_DEP ${${PROJECT_NAME}_DEPS})
+  IS_OCCT_TOOLKIT (${PROJECT_DEP} OCCT_MODULES FOUND_TOOLKIT)
+  if ("${FOUND_TOOLKIT}" STREQUAL "ON")
+    list (APPEND USED_LIBS "${PROJECT_DEP}")
+  endif()
+endforeach()
 
 # Create project for toolkit
 list (FIND BUILD_TOOLKITS ${PROJECT_NAME} CURRENT_PROJECT_IS_BUILT)
index ad3f9acf32c6e04c810b73e512a82f3ce4a0b473..a16e83c782c80df07da06267f82ee0b5f039bb13 100644 (file)
 # variable description
 
 # 
-set (APPLY_OCCT_PATCH_DIR_DESCR "The directory contaning patched OCCT sources that should be used")
-set (BUILD_LIBRARY_TYPE_DESCR "The type of further OCCT libraries: shared or static")
+set (APPLY_OCCT_PATCH_DIR_DESCR 
+"Points to the directory recognized as a 'patch' for OCCT. If specified,
+the files from this directory take precedence over the corresponding native
+OCCT sources. This way you are able to introduce patches to Open CASCADE
+Technology not affecting the original source distribution")
 
-set (REBUILD_PLATFORM_DEPENDENT_CODE_DESCR "OCCT has already compiled platform-depending code and it can be rebult once again (*.yacc/*.lex)")
+
+set (BUILD_LIBRARY_TYPE_DESCR 
+"Specifies the type of library to be created. 'Shared' libraries
+are linked dynamically and loaded at runtime. 'Static' libraries
+are archives of object files for use when linking other targets")
+
+set (REBUILD_PLATFORM_DEPENDENT_CODE_DESCR 
+"Enables Flex/Bison lexical analyzers. OCCT source files relating to STEP reader and
+ExprIntrp functionality are generated automatically with Flex/Bison. Checking this options
+leads to automatic search of Flex/Bison binaries and regeneration of the mentioned files")
 
 # install variables
-set (INSTALL_DIR_DESCR "The place where built OCCT libraries, headers, test cases (INSTALL_OCCT_TEST_CASES variable), \n samples (INSTALL_OCCT_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_GL2PS, INSTALL_TBB and other similar variables) \n will be placed during the installation process (building INSTALL project)")
+set (INSTALL_DIR_DESCR 
+"The place where built OCCT libraries, headers, test cases (INSTALL_OCCT_TEST_CASES variable),
+samples (INSTALL_OCCT_SAMPLES_DESCR variable) and certain 3rdparties (INSTALL_GL2PS, INSTALL_TBB and
+other similar variables) will be placed during the installation process (building INSTALL project)")
 
-set (INSTALL_OCCT_SAMPLES_DESCR "The installation process (building INSTALL project) also places OCCT samples into installation directory (INSTALL_DIR variable)")
-set (INSTALL_OCCT_TEST_CASES_DESCR "The installation process (building INSTALL project) also places OCCT test cases into installation directory (INSTALL_DIR variable)")
-set (INSTALL_DOC_OcctOverview_DESCR "The installation process (building INSTALL project) also places OCCT overview documentation (HTML format) \n into installation directory (INSTALL_DIR variable)") 
+macro (INSTALL_MESSAGE INSTALL_TARGET_VARIABLE INSTALL_TARGET_STRING)
+set (${INSTALL_TARGET_VARIABLE}_DESCR
+"Indicates whether ${INSTALL_TARGET_STRING} should be installed (building INSTALL
+project) into the installation directory (INSTALL_DIR variable)")
+endmacro()
 
-set (INSTALL_FREEIMAGE_DESCR "The installation process (building INSTALL project) also places FreeImage library \n into installation directory (INSTALL_DIR variable). After that OCCT can use this library in portable mode")
-set (INSTALL_FREEIMAGEPLUS_DESCR "The installation process (building INSTALL project) also places FreeImagePlus library into \n installation directory (INSTALL_DIR variable). After that OCCT can use this library in portable mode")
-set (INSTALL_FREETYPE_DESCR "The installation process (building INSTALL project) also places FreeType library into \n installation directory (INSTALL_DIR variable). After that OCCT can use this library in portable mode")
-set (INSTALL_GL2PS_DESCR "The installation process (building INSTALL project) also places GL2PS library into \n installation directory (INSTALL_DIR variable). After that OCCT can use this library in portable mode")
-set (INSTALL_TBB_DESCR "The installation process (building INSTALL project) also places tbb and tbbmalloc libraries into \n installation directory (INSTALL_DIR variable). After that OCCT can use these libraries in portable mode")
-set (INSTALL_TCL_DESCR "The installation process (building INSTALL project) also places Tcl (library and its nessecary sources) into \n installation directory (INSTALL_DIR variable). After that OCCT can use Tcl in portable mode")
-set (INSTALL_VTK_DESCR "The installation process (building INSTALL project) also places Vtk libraries into \n installation directory (INSTALL_DIR variable). After that OCCT can use these libraries in portable mode")
+INSTALL_MESSAGE (INSTALL_OCCT_SAMPLES     "OCCT samples")
+INSTALL_MESSAGE (INSTALL_OCCT_TEST_CASES  "non-regression OCCT test scripts")
+INSTALL_MESSAGE (INSTALL_DOC_OcctOverview "OCCT overview documentation (HTML format)")
+INSTALL_MESSAGE (INSTALL_FREEIMAGE        "FreeImage binaries")
+INSTALL_MESSAGE (INSTALL_FREEIMAGEPLUS    "FreeImagePlus binaries")
+INSTALL_MESSAGE (INSTALL_FREETYPE         "FreeType binaries")
+INSTALL_MESSAGE (INSTALL_GL2PS            "GL2PS binaries")
+INSTALL_MESSAGE (INSTALL_TBB              "TBB binaries")
+INSTALL_MESSAGE (INSTALL_TCL              "TCL binaries")
+INSTALL_MESSAGE (INSTALL_VTK              "VTK binaries ")
 
 # build variables
-set (BUILD_MODULE_ApplicationFramework_DESCR "Build all toolkits of ApplicationFramework module in the solution")
-set (BUILD_MODULE_DataExchange_DESCR "Build all toolkits of DataExchange module in the solution")
-set (BUILD_MODULE_Draw_DESCR "Build all toolkits of Draw module in the solution")
-set (BUILD_MODULE_FoundationClasses_DESCR "Build all toolkits of FoundationClasses module in the solution")
-set (BUILD_MODULE_ModelingAlgorithms_DESCR "Build all toolkits of ModelingAlgorithms module in the solution")
-set (BUILD_MODULE_ModelingData_DESCR "Build all toolkits of ModelingData module in the solution")
-set (BUILD_MODULE_Visualization_DESCR "Build all toolkits of Visualization module in the solution")
-
-set (BUILD_ADDITIONAL_TOOLKITS_DESCR "Build additional OCCT toolkits (including dependent ones) in the solution")
-
-set (BUILD_MODULE_OcctMfcSamples_DESCR "Build several OCCT MFC sample projects in the solution. \n These samples show some possibilities of using OCCT and they can \n be executed with script samples.bat from the installation directory (INSTALL_DIR)")
-set (BUILD_DOC_OcctOverview_DESCR "Build a project containing OCCT overview documentation (Markdown format) \n in the solution. The building of the project executes doxygen command that generates \n the documentation in HTML format. The documentation will be available in the installation \n directory (overview.bat script) if INSTALL_DOC_OcctOverview variable is checked")
-
-set (3RDPARTY_DIR_DESCR "The directory that contain several or all used 3rdparties. \n If the 3rdpartyies have been found - corresponding CMake variables \n will be specified (VTK: 3RDPARTY_VTK_DIR, 3RDPARTY_VTK_INCLUDE_DIR, 3RDPARTY_VTK_LIBRARY_DIR)")
-
-set (USE_FREEIMAGE_DESCR "The solution can use FreeImage")
-set (USE_GL2PS_DESCR "The solution can use GL2PS")
-set (USE_TBB_DESCR "The solution can use tbb")
-set (USE_VTK_DESCR "The solution can use VTK")
-set (USE_GLX_DESCR "The solution can use X11 OpenGl on OSX")
+macro (BUILD_MODULE_MESSAGE BUILD_MODULE_TARGET_VARIABLE BUILD_MODULE_TARGET_STRING)
+set (${BUILD_MODULE_TARGET_VARIABLE}_DESCR
+"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
+is not checked (this happens if some other modules depend on these toolkits)")
+endmacro()
+
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingData         "ModelingData")
+BUILD_MODULE_MESSAGE (BUILD_MODULE_Visualization        "Visualization")
+
+
+set (BUILD_ADDITIONAL_TOOLKITS_DESCR
+"Semicolon-separated individual toolkits to include into build process. If you
+want to build some particular libraries (toolkits) only, then you may uncheck
+all modules in the corresponding BUILD_MODUE_* options and provide the list of
+necessary libraries here. Of course, all dependencies will be resolved automatically")
+
+set (BUILD_MODULE_OcctMfcSamples_DESCR
+"Indicates whether OCCT MFC samples should be built together with OCCT.
+These samples show some possibilities of using OCCT and they can be executed
+with script samples.bat from the installation directory (INSTALL_DIR)")
+
+set (BUILD_DOC_OcctOverview_DESCR
+"Indicates whether OCCT overview documentation project (Markdown format) should be
+created together with OCCT. It is not built together with OCCT. Checking this options
+leads to automatic search of Doxygen binaries. Building of it will be call Doxygen command
+to generate the documentation in HTML format. The documentation will be available in the
+installation directory (overview.bat script) if INSTALL_DOC_OcctOverview variable is checked")
+
+set (3RDPARTY_DIR_DESCR
+"The root directory where all required 3-rd party products will be searched. If a
+3-rd party product have been found - corresponding CMake variables will be specified
+(VTK: 3RDPARTY_VTK_DIR, 3RDPARTY_VTK_INCLUDE_DIR, 3RDPARTY_VTK_LIBRARY_DIR)")
+
+set (USE_FREEIMAGE_DESCR
+"Indicates whether Freeimage product should be used in OCCT visualization
+module for support of popular graphics image formats (PNG, BMP etc)")
+
+set (USE_GL2PS_DESCR
+"Indicates whether GL2PS product should be used in OCCT visualization
+module for support of vector image formats (PS, EPS etc)")
+
+set (USE_TBB_DESCR
+"Indicates whether TBB 3-rd party is used or not. TBB stands for Threading Building Blocks,
+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")
+
+set (USE_VTK_DESCR
+"Indicates whether VTK 3-rd party is used or not. VTK stands for Visualization
+ToolKit, the technology of Kitware Inc intended for general-purpose scientific
+visualization. OCCT comes with a bridge between CAD data representation and
+VTK by means of its dedicated VIS component (VTK Integration Services).")
+
+set (USE_GLX_DESCR "Indicates whether X11 OpenGl on OSX is used or not")
 
 macro (BUILD_MODULE MODULE_NAME)
   set (BUILD_MODULE_${MODULE_NAME} ON CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
index 3fc2d5bbcf05a2b5c0632f36112ae7b99dea0a8b..e28be5bd5e652dbf692ff305f3c5e6d7e671d80c 100644 (file)
@@ -117,7 +117,8 @@ The following table enumerates the full list of environment variables used at co
 | INSTALL_TBB | Boolean flag | Indicates whether TBB binaries should be installed into the installation directory |
 | INSTALL_VTK | Boolean flag | Indicates whether VTK binaries should be installed into the installation directory |
 | INSTALL_TCL | Boolean flag | Indicates whether TCL binaries should be installed into the installation directory |
-| INSTALL_OCCT_SAMPLES | Boolean flag | Indicates whether non-regression OCCT test scripts should be installed into the installation directory |
+| INSTALL_OCCT_TEST_CASES | Boolean flag | Indicates whether non-regression OCCT test scripts should be installed into the installation directory |
+| INSTALL_OCCT_SAMPLES | Boolean flag | Indicates whether OCCT samples should be installed into the installation directory |
 | INSTALL_DOC_OcctOverview | Boolean flag | Indicates whether OCCT overview documentation should be installed into the installation directory |
 
 **Note:** In those CMake options defining paths only the forward slashes ("/") are acceptable.
index 34887e01dd39dd13ef5917794adec6468a33cc02..ad8ea8159b638bfae0022a8f23f6ed12b4f37b42 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   DRAWEXE
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 3f9fbaf8b7f5339c577b549db8bcdadfdb2cde5e..8032c3d4e732dd5338b2030c87615d7ca63243bb 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   FWOSDriver
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 0e090c76e5bf7bc2e732f4ef8378016d7e86fb0b..9c5c01e12d43f2c25f437b3abb77048b34835469 100644 (file)
@@ -9,4 +9,4 @@ set (TOOLKIT_MODULES
   BOPTools
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 764fa23507499182f34b7594ff16283335dade1d..182c73ed21eddfcf9aaacb6ddacd932c31270e9b 100644 (file)
@@ -11,4 +11,4 @@ set (TOOLKIT_MODULES
   BinTools
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 84045479ce4d352d2d3da05bd7694d24b8619952..327e9ac911d249b4aa5938f59740d7d657b9617a 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   BinMNaming
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index feecd950a832d3edbc788b469fbb9a88d895d918..8f23d849a7a3128080a5efd028b349a711f3cda7 100644 (file)
@@ -9,4 +9,4 @@ set (TOOLKIT_MODULES
   BinLDrivers
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index f65328130156e722edac87e5c30efda1b798c835..cfc6a3f65506ecbc8d00d61e4a1ee4f6859f1fe1 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   BinTObjDrivers
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index c0aa812ca36336013335cd0636c5b182d1e183c1..86ad17d61944e4b85a2419fcf73b78a494aed87d 100644 (file)
@@ -5,4 +5,4 @@ set (TOOLKIT_MODULES
   BinMXCAFDoc
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index fcce913647c74e7271757714034f082c99561d0e..d09cd4e1838c29ed097facfba3448a04a9f9307c 100644 (file)
@@ -10,4 +10,4 @@ set (TOOLKIT_MODULES
   BRepProj
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 2a3f238db39994264a43d8a89ffb6cb43bb845f2..886ba3fd05224d227644fd6d7b0b4c75fec675db 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   AppStd
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 4e17091a7ada45ea1d692434245c9c80ea6320d1..88612f8661b2814cf461f904619d9a813d345d9a 100644 (file)
@@ -8,4 +8,4 @@ set (TOOLKIT_MODULES
   LDOM
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 1861c78c999080db9515a0e6e02ec9f0e63423be..2e2738c3ae296dd8aa197fffc6be30deb1b17c67 100644 (file)
@@ -9,4 +9,4 @@ set (TOOLKIT_MODULES
   DrawDim
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index f0aa19584ae01c57f4ca3991e2dab89c80689a9c..854ed7908b966e08073b1584d991b392fe56562b 100644 (file)
@@ -34,4 +34,4 @@ else()
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index fd99cd526efc7895add6e00c67aa6658ad9ff40a..3a6e6872e7be1f07c239af31b89c9d3b41e51fdf 100644 (file)
@@ -5,4 +5,4 @@ set (TOOLKIT_MODULES
   BRepFeat
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 3acac83eee54a59a864b2822e309274364fe3aea..61177a54c83cd28c7665836280b977bb5411feb0 100644 (file)
@@ -12,4 +12,4 @@ set (TOOLKIT_MODULES
   FilletSurf
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index d96971cf8d1d43f95f81b5c3f27eff9c7ac12c9c..3db53a209ebbebe7d442b49eab3c503bcffe6b0a 100644 (file)
@@ -10,4 +10,4 @@ set (TOOLKIT_MODULES
   GProp
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index f76dd251d0cbaa57d8aeb884ba29dba0a9d47b45..55c94f05b79a39ef23d13736bc394e7300604188 100644 (file)
@@ -11,4 +11,4 @@ set (TOOLKIT_MODULES
   TopAbs
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 9325cbbb802d055f1a9d7e38dac1188f799ac42f..149dbbf00d86b521365713f4e62c5dd90bcf054c 100644 (file)
@@ -36,4 +36,4 @@ set (TOOLKIT_MODULES
   TopClass
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index a224d41beaf21f3de973c2e16f0726ab1b1f6347..03b3d28cd1083dac7fcdc472e7b24f2c6f53da78 100644 (file)
@@ -25,4 +25,4 @@ set (TOOLKIT_MODULES
   gce
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 9aec77fa40876ba1cb9c8d6bb7f123d422c0221a..da9dcbc9a61145ca96f9aca163c98ad9c5437922 100644 (file)
@@ -11,4 +11,4 @@ set (TOOLKIT_MODULES
   Contap
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 9411e2fdbc8ab5c1836b75a0fc9987c8f4c1a0ab..19795a41cb986d172006306260988c7005388037 100644 (file)
@@ -21,4 +21,4 @@ set (TOOLKIT_MODULES
   IGESControl
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 6e9278fda8611f540965d3cacd1ccc3b75af7022..118e42c90d076c15c3fae086b70e8c3a6f8eb520 100644 (file)
@@ -16,4 +16,4 @@ else()
   endforeach()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 525201896afdfd011f03c5ab09fe5e4e31cf1dbb..3e592fb6fba4c6a0adebc3053e63ad4323eacee3 100644 (file)
@@ -13,4 +13,4 @@ else()
   endforeach()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index ef4ac9ce13e3403fabcdef953667b0434a569718..295932dc5d73298c4a316e0d88f88c5f34246d9d 100644 (file)
@@ -8,4 +8,4 @@ set (TOOLKIT_MODULES
   AppStdL
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index b1e13bc5d03849ce6640d05f34858739e5850dec..eaccbb22c930a3d16fce70e630fd5afad72b5279 100644 (file)
@@ -21,4 +21,4 @@ set (TOOLKIT_MODULES
   ExprIntrp
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 5ae4ebdb8c5b0f2421ededcf1253c50484d99538..87efacf313e392ae628739cfd3e05cda79ae7637 100644 (file)
@@ -11,4 +11,4 @@ if(NOT WIN32)
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 3271daf5036680d1174c949bdfa4198bf4b97ae5..aa449903edffea873204ea5f44075ec0d4ee0619 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   MeshVS
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index d1b8eac4c06848f0afe23400ecc3c46f5628121a..da0cbf3fbd87f099a37201aebe7becc5bd941e6e 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   BiTgte
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 150e5a309603216a343aca57f139134830d45609..8458346ab4135085481259e41143f204b20272a8 100644 (file)
@@ -37,4 +37,4 @@ if (NOT WIN32)
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 2a6db725babcc2441f17ac8d78712e743cb7e2d7..925d33237c55e8f6d319f69b4236ab1aae9db697 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   BRepPrimAPI
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index ef15485de52f8ce0b1e5d5e26dadefecca92579f..5d6004665e3fd88b3dbb186b398ca14267529ed6 100644 (file)
@@ -21,4 +21,4 @@ else()
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 93ed1a614162986450cf65acb32767b6c28b0221..661cf01e357f386e9a126efc340275f0e2489760 100644 (file)
@@ -20,4 +20,4 @@ if (WIN32)
   list( APPEND USED_LIBS wsock32.lib )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 13b9ddc1c1484e248275dc163f32795c3d4dbfa7..fc84a2571fe4e612e236adc64d82cd5c077d120a 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   RWStepFEA
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index a49265f3e5413bda9c41b9b5c1add721033cea31..802c091d09dc7db16a0d12c572b93c88024792c5 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   RWStepDimTol
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 0482a36ef4a9562ff5381a59b5f920b97f1a3a32..105276d2744fa93d7e0855041696461e669f96bf 100644 (file)
@@ -11,4 +11,4 @@ set (TOOLKIT_MODULES
   RWStepShape
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 3e390c81e0fe5d5b02f57486028422ef417a3d44..345d1c537d4e509eb6050dbc62cfe45b3c4435c0 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   RWStl
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index afdd0691e0d0557ed2598f5de34aed9d117fbfd1..6e7a6274a1858752ab190a6ed7e1a9e2d26f5f94 100644 (file)
@@ -55,4 +55,4 @@ if (NOT WIN32)
   list( APPEND USED_LIBS freetype )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index b78040d0459b5099d8ddfed8d69983da6a0fd486..04024e3df7aba6e1b7e9108fcac4e138c75fef1b 100644 (file)
@@ -17,4 +17,4 @@ if (WIN32)
   list( APPEND USED_LIBS wsock32.lib )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 7cc9a991060bc1077a38b71262d70195248037f0..1855e40f8a49a7bd12ae09cc3cfcea566e5d34e2 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   TObj
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 7f5e16d8ec8c5cd727fd20067d3e2916692a77f1..ddd0335da24a3bce35f67cbf40e442c98edfdaaf 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   TObjDRAW
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 4f1a3495865b8f0c50bae522eef926239d0efa23..a04bfc7f8a8c0433de7efc7b07b85b882e9af253 100644 (file)
@@ -19,4 +19,4 @@ set (TOOLKIT_MODULES
   BRepApprox
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index fca276b419c8c768e6eec7919da43f068566f5f2..ba8710b4ddbd792e0dd12c45446ab61fffd867bb 100644 (file)
@@ -14,4 +14,4 @@ set (TOOLKIT_MODULES
   SWDRAW
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 9650b50d969a8379ac68da7fbb7504b2f0f7e67e..b8654ed89e8461d0eb4aee2468563ed805afac94 100644 (file)
@@ -34,4 +34,4 @@ else()
   list( APPEND USED_LIBS freetype )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index c6d9db660617b22264e343fd12fafcfc7839ab97..e69bbe6f1c5bed8473bb5e9eadeac13ac300d7a3 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   VrmlData
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 06a5955955704794d563a444972aa2294fb4ea12..30c52e9ea7ec3b6bbff3ebd6be8e193eda331669 100644 (file)
@@ -36,4 +36,4 @@ else()
   list( APPEND USED_LIBS freetype )
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 7e2a829f6cd51d2f3d3e49e5e2a175261c73dd25..2f65e0a8985abe87e6b60a2734d5b5aaca026f02 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   Voxel
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 026c74aa010ba7a5d82fa263924b3c96fe645a73..4501bc2700e95352fed4b2e038d5c2892d6b64e6 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   XCAFPrs
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 8683ce7a398e29ec3b42edcbd0b28c6be3ff422a..858052aa9adae2437ab848d841a197fad39fb45d 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   XDEDRAW
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 0164d91ca35c0366dfbdf1ae900dbe8af15a6035..f123c57fc28f371d2cc97d170a61094373b80c19 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   IGESCAFControl
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 73faa92bd0c0d7e21a848d2d85ea3d6ded7d3fb6..4cbc3b6c3e203355d9d760730937bc41f598cffa 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   STEPCAFControl
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index afa66faa844b39cfd1fb93538288db9320caf75d..d83370ba25032325de4a9f8c64d310551b13917a 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   XBRepMesh
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 694b4d3c2e353c780554b30259af6dd1c0203eb8..7dad353ac9e21bb41cc0e25c5f9e024450610b1a 100644 (file)
@@ -19,4 +19,4 @@ set (TOOLKIT_MODULES
   MoniTool
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index fdcc7dcf5f2f9fa5f6e127cb375d2ab5c733930c..003c3e9c5db02d789dcd714de427c8ff06f72a7b 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   XSDRAWSTLVRML
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 6bdd7e3f50b95d8130fa5cc0096cbb90c842e96c..e4ee3ae74ffe8665ca3e2c40fef679f1daecf386 100644 (file)
@@ -7,4 +7,4 @@ set (TOOLKIT_MODULES
   XmlMPrsStd
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 07575b0e1cc43ed98490021736fe86c7ca94a0df..e5e4ddce73ed5f0bab61b275db80f6b822b3f8f7 100644 (file)
@@ -9,4 +9,4 @@ set (TOOLKIT_MODULES
   XmlObjMgt
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 9745f24c2dd9259a8d757d74cb7f5e394287b6b3..914bf034f902e477b05184b0991d9a0a403188bc 100644 (file)
@@ -4,4 +4,4 @@ set (TOOLKIT_MODULES
   XmlTObjDrivers
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index 2e38bcfba4401c345967a0dc0be03f5c1a3a966f..3f59fdcf79ff25f035a7786834b8dc1f1ba4b6e0 100644 (file)
@@ -5,4 +5,4 @@ set (TOOLKIT_MODULES
   XmlMXCAFDoc
 )
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
index cae99867911a1b27159f123496068ceea3b2fca1..48f255bae890f3a8a98afa629da3f661a2b79e01 100644 (file)
@@ -36,4 +36,4 @@ else()
   endif()
 endif()
 
-include(${OCCT_SOURCE_DIR}/adm/cmake/occt_toolkit.cmake)
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)