From: rnv <rnv@opencascade.com>
Date: Mon, 20 Jun 2011 13:25:49 +0000 (+0000)
Subject: Porting SALOME6 on windows: update cmake files for the new products
X-Git-Tag: V6_3_1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ce6643740f569ee8f1a3ec268af9d3510f974a08;p=modules%2Fgui.git

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 27dce25d5..a8c397c80 100644
--- 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 7ff7f07d3..9ab48bdea 100644
--- 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)