From: barate Date: Thu, 14 Feb 2013 09:37:25 +0000 (+0000) Subject: Reapply patch for Python version string (really needed when Python 2.x and 3.x are... X-Git-Tag: V6_main_FINAL~23 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5c833d1f174521069d2d5244ab650d0c0fa35e83;p=modules%2Fkernel.git Reapply patch for Python version string (really needed when Python 2.x and 3.x are both installed in the system) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 3146ee329..d45b42b08 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,6 +73,8 @@ if(EXISTS ${PYTHON_ROOT_DIR}) set(CMAKE_PROGRAM_PATH ${PYTHON_ROOT_DIR}/bin) endif(EXISTS ${PYTHON_ROOT_DIR}) find_package(PythonInterp REQUIRED) +# Set PythonLibs_FIND_VERSION To avoid problems when several versions are in the system +SET(PythonLibs_FIND_VERSION ${PYTHON_VERSION_STRING}) if(EXISTS ${PYTHON_ROOT_DIR}) set(PYTHON_INCLUDE_DIR ${PYTHON_ROOT_DIR}/include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) set(PYTHON_LIBRARY ${PYTHON_ROOT_DIR}/lib/libpython${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX})