From fe4901aca7e96d6f9c73e541fa2f1c8c83b13659 Mon Sep 17 00:00:00 2001 From: gdd Date: Thu, 7 Mar 2013 18:06:24 +0000 Subject: [PATCH] Fix CMakeList.txt --- adm_local/cmake_files/FindSalomeVTK.cmake | 9 +++++---- src/SALOME_PY/CMakeLists.txt | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/adm_local/cmake_files/FindSalomeVTK.cmake b/adm_local/cmake_files/FindSalomeVTK.cmake index 8e707868c..6bf4b002b 100644 --- a/adm_local/cmake_files/FindSalomeVTK.cmake +++ b/adm_local/cmake_files/FindSalomeVTK.cmake @@ -20,8 +20,9 @@ if (VTK_FOUND) find_library(VTK_LIB ${VTK_LIB_NEEDED}) set(VTK_LIBRARIES ${VTK_LIBRARIES} ${VTK_LIB}) endforeach(VTK_LIB_NEEDED) - find_library(vtkCommonPythonD vtkCommonPythonD) - find_library(vtkGraphicsPythonD vtkGraphicsPythonD) - find_library(vtkImagingPythonD vtkImagingPythonD) - find_library(vtkPythonCore vtkPythonCore) + find_library(VTK_PYLIBS vtkWrappingPython${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}-pv${PARAVIEW_VERSION}) + #find_library(vtkCommonPythonD vtkCommonPythonD) + #find_library(vtkGraphicsPythonD vtkGraphicsPythonD) + #find_library(vtkImagingPythonD vtkImagingPythonD) + #find_library(vtkPythonCore vtkPythonCore) endif(VTK_FOUND) diff --git a/src/SALOME_PY/CMakeLists.txt b/src/SALOME_PY/CMakeLists.txt index 799fe74a2..f52f4be84 100755 --- a/src/SALOME_PY/CMakeLists.txt +++ b/src/SALOME_PY/CMakeLists.txt @@ -43,10 +43,11 @@ SET(COMMON_LIBS ${VTK_LIBRARIES} ${OPENGL_LIBRARIES} LightApp - ${vtkCommonPythonD} - ${vtkGraphicsPythonD} - ${vtkImagingPythonD} - ${vtkPythonCore} + ${VTK_PYLIBS} + # ${vtkCommonPythonD} + # ${vtkGraphicsPythonD} + # ${vtkImagingPythonD} + # ${vtkPythonCore} ) ADD_DEFINITIONS("-DHAVE_CONFIG_H ${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${BOOST_DEFINITIONS} ${VTK_DEFINITIONS} ${PYTHON_DEFINITIONS}") -- 2.39.2