From ce6643740f569ee8f1a3ec268af9d3510f974a08 Mon Sep 17 00:00:00 2001 From: rnv Date: Mon, 20 Jun 2011 13:25:49 +0000 Subject: [PATCH] Porting SALOME6 on windows: update cmake files for the new products --- adm_local/cmake_files/FindSIPPYQT.cmake | 6 +----- adm_local/cmake_files/FindVTK.cmake | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) 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) -- 2.39.2