OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

Configuration - Restoring VTK toolkit processing #99

Browse Source 
Migration to PCH breaks some VTK search functionality.
Fixed non-unique package name caching
This commit is contained in:
dpasukhi 2024-10-12 18:15:44 +00:00
parent 50f1e73469
commit d16f03b5b5
7 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adm/cmake/occt_macros.cmake
View File

@ -271,9 +271,11 @@ function(EXTRACT_TOOLKIT_EXTERNLIB RELATIVE_PATH OCCT_TOOLKIT RESULT_LIBS)
endfunction() endfunction()
function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_INCLUDE_FOLDER) function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_INCLUDE_FOLDER)
# package name is not unique, it can be reuse in tools and src,
# use extra parameter as relative path to distinguish between them
set (OCCT_PACKAGE_FILES "") set (OCCT_PACKAGE_FILES "")
get_property(OCCT_PACKAGE_FILES GLOBAL PROPERTY OCCT_PACKAGE_${OCCT_PACKAGE}_FILES) get_property(OCCT_PACKAGE_FILES GLOBAL PROPERTY OCCT_PACKAGE_${RELATIVE_PATH}_${OCCT_PACKAGE}_FILES)
get_property(OCCT_PACKAGE_INCLUDE_DIR GLOBAL PROPERTY OCCT_PACKAGE_${OCCT_PACKAGE}_INCLUDE_DIR) get_property(OCCT_PACKAGE_INCLUDE_DIR GLOBAL PROPERTY OCCT_PACKAGE_${RELATIVE_PATH}_${OCCT_PACKAGE}_INCLUDE_DIR)
if (OCCT_PACKAGE_FILES) if (OCCT_PACKAGE_FILES)
set (${RESULT_FILES} ${OCCT_PACKAGE_FILES} PARENT_SCOPE) set (${RESULT_FILES} ${OCCT_PACKAGE_FILES} PARENT_SCOPE)
set (${RESULT_INCLUDE_FOLDER} ${OCCT_PACKAGE_INCLUDE_DIR} PARENT_SCOPE) set (${RESULT_INCLUDE_FOLDER} ${OCCT_PACKAGE_INCLUDE_DIR} PARENT_SCOPE)
@ -310,8 +312,8 @@ function (EXTRACT_PACKAGE_FILES RELATIVE_PATH OCCT_PACKAGE RESULT_FILES RESULT_I
set (${RESULT_FILES} ${FILE_PATH_LIST} PARENT_SCOPE) set (${RESULT_FILES} ${FILE_PATH_LIST} PARENT_SCOPE)
set (${RESULT_INCLUDE_FOLDER} ${OCCT_PACKAGE_INCLUDE_DIR} PARENT_SCOPE) set (${RESULT_INCLUDE_FOLDER} ${OCCT_PACKAGE_INCLUDE_DIR} PARENT_SCOPE)
set_property(GLOBAL PROPERTY OCCT_PACKAGE_${OCCT_PACKAGE}_FILES "${FILE_PATH_LIST}") set_property(GLOBAL PROPERTY OCCT_PACKAGE_${RELATIVE_PATH}_${OCCT_PACKAGE}_FILES "${FILE_PATH_LIST}")
set_property(GLOBAL PROPERTY OCCT_PACKAGE_${OCCT_PACKAGE}_INCLUDE_DIR "${OCCT_PACKAGE_INCLUDE_DIR}") set_property(GLOBAL PROPERTY OCCT_PACKAGE_${RELATIVE_PATH}_${OCCT_PACKAGE}_INCLUDE_DIR "${OCCT_PACKAGE_INCLUDE_DIR}")
endfunction() endfunction()
function(EXCTRACT_TOOLKIT_DEPS RELATIVE_PATH OCCT_TOOLKIT RESULT_TKS_AS_DEPS RESULT_INCLUDE_FOLDERS) function(EXCTRACT_TOOLKIT_DEPS RELATIVE_PATH OCCT_TOOLKIT RESULT_TKS_AS_DEPS RESULT_INCLUDE_FOLDERS)

7
adm/cmake/occt_toolkit.cmake
View File

@ -229,8 +229,11 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM}) string (REGEX MATCH "^CSF_" CSF_FOUND ${USED_ITEM})
string (REGEX MATCH "^vtk" VTK_FOUND ${USED_ITEM}) string (REGEX MATCH "^vtk" VTK_FOUND ${USED_ITEM})
if (NOT "${VTK_FOUND}" STREQUAL "" AND BUILD_SHARED_LIBS AND INSTALL_VTK AND COMMAND OCCT_INSTALL_VTK) if (NOT "${VTK_FOUND}" STREQUAL "")
OCCT_INSTALL_VTK(${USED_ITEM}) list (APPEND USED_TOOLKITS_BY_CURRENT_PROJECT ${USED_ITEM})
if (BUILD_SHARED_LIBS AND INSTALL_VTK AND COMMAND OCCT_INSTALL_VTK)
OCCT_INSTALL_VTK(${USED_ITEM})
endif()
continue() continue()
endif() endif()
# Search for 3rd-party libraries as a dependency # Search for 3rd-party libraries as a dependency

2
src/IVtk/IVtk_Types.hxx
View File

@ -24,6 +24,8 @@
#include <Standard_Integer.hxx> #include <Standard_Integer.hxx>
#include <vtkType.h> #include <vtkType.h>
#include <limits>
#ifdef VTK_USE_64BIT_IDS #ifdef VTK_USE_64BIT_IDS
#if defined(_WIN32) && !defined(_WIN64) #if defined(_WIN32) && !defined(_WIN64)
#error "64-bit VTK library can not be linked for 32-bit target platform" #error "64-bit VTK library can not be linked for 32-bit target platform"

1
src/IVtkDraw/IVtkDraw.cxx
View File

@ -77,7 +77,6 @@
#include <vtkWindowToImageFilter.h> #include <vtkWindowToImageFilter.h>
#ifndef _WIN32 #ifndef _WIN32
#include <X11/X.h> #include <X11/X.h>
#include <X11/Shell.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <GL/glx.h> #include <GL/glx.h>

3
src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.cxx
View File

@ -13,6 +13,9 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
// Workaround for PCH
#include <limits>
#include <IVtkDraw_HighlightAndSelectionPipeline.hxx> #include <IVtkDraw_HighlightAndSelectionPipeline.hxx>
// prevent disabling some MSVC warning messages by VTK headers // prevent disabling some MSVC warning messages by VTK headers

1
src/IVtkDraw/IVtkDraw_Interactor.hxx
View File

@ -25,7 +25,6 @@
#else #else
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Shell.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <tk.h> #include <tk.h>
#endif #endif

2
src/IVtkTools/IVtkTools.hxx
View File

@ -19,6 +19,8 @@
#include <IVtk_Types.hxx> #include <IVtk_Types.hxx>
#include <vtkSmartPointer.h> #include <vtkSmartPointer.h>
#include <limits>
class vtkLookupTable; class vtkLookupTable;
class vtkMapper; class vtkMapper;