diff --git a/CMakeLists.txt b/CMakeLists.txt index d051f5ccce..34300d41ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,13 +84,9 @@ else () endif() set (CMAKE_CXX_STANDARD_REQUIRED ON) -# macro: include patched file if it exists +# include cmake file macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE) - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_INCLUDED_FILE}.cmake") - include (${BUILD_PATCH}/${BEING_INCLUDED_FILE}.cmake) - else() - include (${CMAKE_SOURCE_DIR}/${BEING_INCLUDED_FILE}.cmake) - endif() + include (${CMAKE_SOURCE_DIR}/${BEING_INCLUDED_FILE}.cmake) endmacro() # set using memory manager option for TKernel @@ -322,9 +318,6 @@ elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") set (BIN_LETTER "i") endif() -# a directory recognized as a 'patch' for OCCT -set (BUILD_PATCH "" CACHE PATH "${BUILD_PATCH_DESCR}") - # the list of being built toolkits set (BUILD_ADDITIONAL_TOOLKITS "" CACHE STRING "${BUILD_ADDITIONAL_TOOLKITS_DESCR}") separate_arguments (BUILD_ADDITIONAL_TOOLKITS) @@ -390,7 +383,7 @@ else() set (USE_GLES2 OFF CACHE BOOL "${USE_GLES2_DESCR}") endif() -# include the patched or original list of modules +# include original list of modules # list _TOOLKITS is created foreach module and contains its toolkits # list will contain all modules OCCT_MODULES_AND_TOOLKITS (MODULES "TOOLKITS" OCCT_MODULES) @@ -912,7 +905,7 @@ if(APPLE) set (INSTALL_NAME_DIR "" CACHE STRING "install_name library suffix on OS X (e.g. @executable_path/../Frameworks)") endif() -# include the patched or original list of definitions and flags +# include original list of definitions and flags OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_defs_flags") foreach (OCCT_3RDPARTY_LIST ${OCCT_3RDPARTY_CMAKE_LIST}) @@ -1029,7 +1022,7 @@ else() endif() # OCCT tools -# include the patched or original list of tools +# include original list of tools # list _TOOLKITS is created foreach tool and contains its toolkits # list will contain all tools if (BUILD_Inspector) @@ -1092,14 +1085,8 @@ if (${DRAWEXE_INDEX} GREATER -1) OCCT_INSTALL_FILE_OR_DIR ("data/" "${INSTALL_DIR_DATA}") OCCT_INSTALL_FILE_OR_DIR ("samples/tcl" "${INSTALL_DIR_SAMPLES}") - # copy draw script to install script folder - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}") - install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - else() - install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif() + install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) # copy draw script to CMake binary folder OCCT_COPY_FILE_OR_DIR ("adm/templates/draw.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}") @@ -1298,14 +1285,8 @@ if (BUILD_MODULE_UwpSample) endif() if (BUILD_TOOL_TOOLKITS) - # copy tinspector script to install script folder - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}") - install (FILES "${BUILD_PATCH}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - else() - install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif() + install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/inspector.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) set (OpenCASCADE_BINARY_DIR "${INSTALL_DIR}/${INSTALL_DIR_BIN}") # patch TInspectorEXE diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake index a0ed0fbcba..1a77a9548d 100644 --- a/adm/cmake/occt_macros.cmake +++ b/adm/cmake/occt_macros.cmake @@ -34,9 +34,7 @@ endmacro() function (FILE_TO_LIST FILE_NAME FILE_CONTENT) set (LOCAL_FILE_CONTENT) - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${FILE_NAME}") - file (STRINGS "${BUILD_PATCH}/${FILE_NAME}" LOCAL_FILE_CONTENT) - elseif (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}") + if (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}") file (STRINGS "${CMAKE_SOURCE_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT) endif() @@ -44,9 +42,7 @@ function (FILE_TO_LIST FILE_NAME FILE_CONTENT) endfunction() function(FIND_FOLDER_OR_FILE FILE_OR_FOLDER_NAME RESULT_PATH) - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${FILE_OR_FOLDER_NAME}") - set (${RESULT_PATH} "${BUILD_PATCH}/${FILE_OR_FOLDER_NAME}" PARENT_SCOPE) - elseif (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_OR_FOLDER_NAME}") + if (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_OR_FOLDER_NAME}") set (${RESULT_PATH} "${CMAKE_SOURCE_DIR}/${FILE_OR_FOLDER_NAME}" PARENT_SCOPE) else() set (${RESULT_PATH} "" PARENT_SCOPE) @@ -175,25 +171,8 @@ function (FIND_SUBDIRECTORY ROOT_DIRECTORY DIRECTORY_SUFFIX SUBDIRECTORY_NAME) endfunction() function (OCCT_ORIGIN_AND_PATCHED_FILES RELATIVE_PATH SEARCH_TEMPLATE RESULT) - - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}") - file (GLOB FOUND_FILES "${BUILD_PATCH}/${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 (NOT BUILD_PATCH OR NOT EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}") - list (APPEND FOUND_FILES ${ORIGIN_FILE}) - else() - get_filename_component (ORIGIN_FILE_NAME "${ORIGIN_FILE}" NAME) - if (NOT EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}/${ORIGIN_FILE_NAME}") - list (APPEND FOUND_FILES ${ORIGIN_FILE}) - endif() - endif() - endforeach() - - set (${RESULT} ${FOUND_FILES} PARENT_SCOPE) + set (${RESULT} ${ORIGIN_FILES} PARENT_SCOPE) endfunction() function (FILLUP_PRODUCT_SEARCH_TEMPLATE PRODUCT_NAME COMPILER COMPILER_BITNESS SEARCH_TEMPLATES) @@ -249,32 +228,15 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT) endfunction() macro (OCCT_INSTALL_FILE_OR_DIR BEING_INSTALLED_OBJECT DESTINATION_PATH) - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}") - if (IS_DIRECTORY "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}") - # first of all, install original files - install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION "${DESTINATION_PATH}") - - # secondly, rewrite original files with patched ones - install (DIRECTORY "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}" DESTINATION "${DESTINATION_PATH}") - else() - install (FILES "${BUILD_PATCH}/${BEING_INSTALLED_OBJECT}" DESTINATION "${DESTINATION_PATH}") - endif() + if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}") + install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION "${DESTINATION_PATH}") else() - if (IS_DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}") - install (DIRECTORY "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION "${DESTINATION_PATH}") - else() - install (FILES "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION "${DESTINATION_PATH}") - endif() + install (FILES "${CMAKE_SOURCE_DIR}/${BEING_INSTALLED_OBJECT}" DESTINATION "${DESTINATION_PATH}") endif() endmacro() macro (OCCT_CONFIGURE_AND_INSTALL BEING_CONGIRUGED_FILE BUILD_NAME INSTALL_NAME DESTINATION_PATH) - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}") - configure_file("${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY) - else() - configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY) - endif() - + configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${BUILD_NAME}" @ONLY) install(FILES "${OCCT_BINARY_DIR}/${BUILD_NAME}" DESTINATION "${DESTINATION_PATH}" RENAME ${INSTALL_NAME}) endmacro() @@ -314,10 +276,7 @@ function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_I return() endif() - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES") - file (STRINGS "${BUILD_PATCH}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES" OCCT_PACKAGE_FILES) - set (OCCT_PACKAGE_INCLUDE_DIR "${BUILD_PATCH}/${RELATIVE_PATH}/${OCCT_PACKAGE}") - elseif (EXISTS "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES") + if (EXISTS "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES") file (STRINGS "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}/FILES" OCCT_PACKAGE_FILES) set (OCCT_PACKAGE_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}") endif() @@ -335,11 +294,7 @@ function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_I endforeach() if (NOT FILE_PATH_LIST) - if(BUILD_PATH) - message (WARNING "FILES has not been found in ${BUILD_PATCH}/${RELATIVE_PATH}/${OCCT_PACKAGE}") - else() - message (WARNING "FILES has not been found in ${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}") - endif() + message (WARNING "FILES has not been found in ${CMAKE_SOURCE_DIR}/${RELATIVE_PATH}/${OCCT_PACKAGE}") endif() set (${RESULT_FILES} ${FILE_PATH_LIST} PARENT_SCOPE) @@ -412,9 +367,7 @@ endfunction() function (FILE_TO_LIST FILE_NAME FILE_CONTENT) set (LOCAL_FILE_CONTENT) - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${FILE_NAME}") - file (STRINGS "${BUILD_PATCH}/${FILE_NAME}" LOCAL_FILE_CONTENT) - elseif (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}") + if (EXISTS "${CMAKE_SOURCE_DIR}/${FILE_NAME}") file (STRINGS "${CMAKE_SOURCE_DIR}/${FILE_NAME}" LOCAL_FILE_CONTENT) endif() @@ -426,9 +379,6 @@ function (COLLECT_AND_INSTALL_OCCT_HEADER_FILES THE_ROOT_TARGET_OCCT_DIR THE_OCC # consider patched header.in template set (TEMPLATE_HEADER_PATH "${CMAKE_SOURCE_DIR}/adm/templates/header.in") - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/header.in") - set (TEMPLATE_HEADER_PATH "${BUILD_PATCH}/adm/templates/header.in") - endif() set (OCCT_HEADER_FILES_COMPLETE) foreach(OCCT_TOOLKIT ${THE_OCCT_BUILD_TOOLKITS}) @@ -509,25 +459,14 @@ macro (OCCT_COPY_FILE_OR_DIR BEING_COPIED_OBJECT DESTINATION_PATH) if (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}") file (COPY "${CMAKE_SOURCE_DIR}/${BEING_COPIED_OBJECT}" DESTINATION "${DESTINATION_PATH}") endif() - - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_COPIED_OBJECT}") - # secondly, rewrite original files with patched ones - file (COPY "${BUILD_PATCH}/${BEING_COPIED_OBJECT}" DESTINATION "${DESTINATION_PATH}") - endif() endmacro() macro (OCCT_CONFIGURE BEING_CONGIRUGED_FILE FINAL_NAME) - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}") - configure_file("${BUILD_PATCH}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY) - else() - configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY) - endif() + configure_file("${CMAKE_SOURCE_DIR}/${BEING_CONGIRUGED_FILE}" "${FINAL_NAME}" @ONLY) endmacro() macro (OCCT_ADD_SUBDIRECTORY BEING_ADDED_DIRECTORY) - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt") - add_subdirectory(${BUILD_PATCH}/${BEING_ADDED_DIRECTORY}) - elseif (EXISTS "${CMAKE_SOURCE_DIR}/${BEING_ADDED_DIRECTORY}/CMakeLists.txt") + if (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") diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake index 3fb6035a50..b3d82bc0b9 100644 --- a/adm/cmake/occt_toolkit.cmake +++ b/adm/cmake/occt_toolkit.cmake @@ -96,12 +96,7 @@ string (REGEX REPLACE ";" " " PRECOMPILED_DEFS "${PRECOMPILED_DEFS}") set (USED_RCFILE "") if (MSVC) set (USED_RCFILE "${CMAKE_BINARY_DIR}/resources/${PROJECT_NAME}.rc") - - if (APPLY_OCCT_PATCH_DIR AND EXISTS "${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in") - configure_file("${APPLY_OCCT_PATCH_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY) - else() - configure_file("${CMAKE_SOURCE_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY) - endif() + configure_file("${CMAKE_SOURCE_DIR}/adm/templates/occt_toolkit.rc.in" "${USED_RCFILE}" @ONLY) endif() set (CURRENT_MODULE) diff --git a/adm/cmake/vardescr.cmake b/adm/cmake/vardescr.cmake index ea50401191..d0cdd6946b 100644 --- a/adm/cmake/vardescr.cmake +++ b/adm/cmake/vardescr.cmake @@ -1,13 +1,5 @@ # variable description -# -set (BUILD_PATCH_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 (BUILD_LIBRARY_TYPE_DESCR "Specifies the type of library to be created. 'Shared' libraries are linked dynamically and loaded at runtime. 'Static' libraries diff --git a/adm/scripts/cmake_custom.bat.template b/adm/scripts/cmake_custom.bat.template index f2bbe81343..fabb66c5a1 100644 --- a/adm/scripts/cmake_custom.bat.template +++ b/adm/scripts/cmake_custom.bat.template @@ -28,9 +28,6 @@ rem Use semicolon-separated list of toolkits if you want to disable all modules rem and build only some toolkits. rem set BUILD_ADDITIONAL_TOOLKITS= -rem Set a directory recognized as a patch for OCCT. -rem set BUILD_PATCH= - rem set BUILD_MODULE_ApplicationFramework=ON rem set BUILD_MODULE_DataExchange=ON rem set BUILD_MODULE_DETools=OFF diff --git a/adm/scripts/cmake_custom.sh.template b/adm/scripts/cmake_custom.sh.template index e6e265df4d..b628e4a87e 100644 --- a/adm/scripts/cmake_custom.sh.template +++ b/adm/scripts/cmake_custom.sh.template @@ -21,9 +21,6 @@ FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1" # and build only some toolkits. #BUILD_ADDITIONAL_TOOLKITS= -# Set a directory recognized as a patch for OCCT. -#BUILD_PATCH= - #BUILD_MODULE_ApplicationFramework=ON #BUILD_MODULE_DataExchange=ON #BUILD_MODULE_DETools=OFF diff --git a/adm/scripts/cmake_gen.bat b/adm/scripts/cmake_gen.bat index 80f9600c62..6a1651ce0e 100644 --- a/adm/scripts/cmake_gen.bat +++ b/adm/scripts/cmake_gen.bat @@ -19,7 +19,6 @@ set BUILD_ADDITIONAL_TOOLKITS= set BUILD_DOC_Overview=OFF set BUILD_Inspector=OFF set BUILD_LIBRARY_TYPE=Shared -set BUILD_PATCH= set BUILD_RELEASE_DISABLE_EXCEPTIONS=ON set BUILD_WITH_DEBUG=OFF set BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON @@ -69,7 +68,6 @@ cmake -G "%arch_compile%" ^ -D BUILD_MODULE_ModelingAlgorithms:BOOL=%BUILD_MODULE_ModelingAlgorithms% ^ -D BUILD_MODULE_ModelingData:BOOL=%BUILD_MODULE_ModelingData% ^ -D BUILD_MODULE_Visualization:BOOL=%BUILD_MODULE_Visualization% ^ - -D BUILD_PATCH:PATH="%BUILD_PATCH%" ^ -D BUILD_RELEASE_DISABLE_EXCEPTIONS:BOOL=%BUILD_RELEASE_DISABLE_EXCEPTIONS% ^ -D BUILD_WITH_DEBUG:BOOL=%BUILD_WITH_DEBUG% ^ -D BUILD_ENABLE_FPE_SIGNAL_HANDLER:BOOL=%BUILD_ENABLE_FPE_SIGNAL_HANDLER% ^ diff --git a/adm/scripts/cmake_gen.sh b/adm/scripts/cmake_gen.sh index feef7a07db..7ebd7d1e6d 100755 --- a/adm/scripts/cmake_gen.sh +++ b/adm/scripts/cmake_gen.sh @@ -24,7 +24,6 @@ BUILD_ADDITIONAL_TOOLKITS= BUILD_DOC_Overview=OFF BUILD_Inspector=OFF BUILD_LIBRARY_TYPE=Shared -BUILD_PATCH= BUILD_RELEASE_DISABLE_EXCEPTIONS=ON BUILD_WITH_DEBUG=OFF BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON @@ -70,7 +69,6 @@ cmake -G "Unix Makefiles" \ -D BUILD_MODULE_ModelingAlgorithms:BOOL=$BUILD_MODULE_ModelingAlgorithms \ -D BUILD_MODULE_ModelingData:BOOL=$BUILD_MODULE_ModelingData \ -D BUILD_MODULE_Visualization:BOOL=$BUILD_MODULE_Visualization \ - -D BUILD_PATCH:PATH="$BUILD_PATCH" \ -D BUILD_RELEASE_DISABLE_EXCEPTIONS:BOOL=$BUILD_RELEASE_DISABLE_EXCEPTIONS \ -D BUILD_WITH_DEBUG:BOOL=$BUILD_WITH_DEBUG \ -D BUILD_ENABLE_FPE_SIGNAL_HANDLER:BOOL=$BUILD_ENABLE_FPE_SIGNAL_HANDLER \ diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 92977d362d..f6d8d1612d 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -32,13 +32,9 @@ set (CMAKE_SUPPRESS_REGENERATION TRUE) set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE) -# macro: include patched file if it exists +# include cmake file macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE) - if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/${BEING_INCLUDED_FILE}.cmake") - include (${BUILD_PATCH}/${BEING_INCLUDED_FILE}.cmake) - else() - include (${CMAKE_SOURCE_DIR}/${BEING_INCLUDED_FILE}.cmake) - endif() + include (${CMAKE_SOURCE_DIR}/${BEING_INCLUDED_FILE}.cmake) endmacro() macro (OCCT_INCLUDE_3RDPARTY_PRODUCT USE_PRODUCT PRODUCT_CONFIG_FILE) @@ -247,7 +243,7 @@ if (NOT DEFINED INSTALL_DIR_DATA) endif() endif() -# include the patched or original list of definitions and flags +# include original list of definitions and flags OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_defs_flags") OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/3rdparty_macro") @@ -334,7 +330,7 @@ if (WIN32) endif() # OCCT tools -# include the patched or original list of tools +# include original list of tools # list _TOOLKITS is created foreach tool and contains its toolkits # list will contain all tools OCCT_MODULES_AND_TOOLKITS (TOOLS "TOOL_TOOLKITS" OCCT_TOOLS)