Porting SALOME6 on windows: update cmake files for the new products

diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake
index 27dce25d5e3bb377eb2dd998d2018b63291ee9cf..a8c397c80c691bb82d7db81a43527672fed09886 100644 (file)
--- a/adm_local/cmake_files/FindSIPPYQT.cmake
+++ b/adm_local/cmake_files/FindSIPPYQT.cmake
@@ -25,11 +25,7 @@ GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH)
 GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH)
 ENDIF(SIP_ROOT)
 
-IF(WINDOWS)
-  SET(SIP_INCLUDES -I${SIP_ROOT}/include)
-ELSE(WINDOWS)
-  SET(SIP_INCLUDES -I${SIP_ROOT}/include/python${PYTHON_VERSION})
-ENDIF(WINDOWS)
+SET(SIP_INCLUDES -I${SIP_ROOT}/include/python${PYTHON_VERSION})
 
 IF(WINDOWS)
   FIND_PROGRAM(PYUIC_EXECUTABLE NAMES pyuic4 pyuic4.bat)

diff --git a/adm_local/cmake_files/FindVTK.cmake b/adm_local/cmake_files/FindVTK.cmake
index 7ff7f07d31ebd6a25f8347b2ebba5142feb2d339..9ab48bdea4f259bc04716349e2c18d22a861e3f0 100644 (file)
--- a/adm_local/cmake_files/FindVTK.cmake
+++ b/adm_local/cmake_files/FindVTK.cmake
@@ -47,6 +47,8 @@ SET(VTK_LIBS ${VTK_LIBS} ${VTK_WIDGETS})
 FIND_LIBRARY(vtkCommonPythonD vtkCommonPythonD ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 FIND_LIBRARY(vtkGraphicsPythonD vtkGraphicsPythonD ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 FIND_LIBRARY(vtkImagingPythonD vtkImagingPythonD ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkPythonCore vtkPythonCore ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
+
 
 #IF(NOT WINDOWS)
 #  IF(VTK_MAJOR_VERSION STREQUAL 5)