From: gdd Date: Thu, 20 Jun 2013 15:44:35 +0000 (+0000) Subject: Ugly fix to correctly define the python lib install path X-Git-Tag: B4KillOfAutomake~42 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=51c3aa5fcbf8f2ef7f151b5fdf81f9dff01e08ba;p=modules%2Fkernel.git Ugly fix to correctly define the python lib install path --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 338fc3f8e..fc4c75bb2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,8 @@ CMAKE_POLICY(SET CMP0003 NEW) # Project name, upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 2) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 0) +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) @@ -85,6 +85,7 @@ SET(SALOME_INSTALL_APPLISKEL_PYTHON ${SALOME_INSTALL_BINS}/appliskel CACHE PATH "Install path: SALOME application skeleton - Python") SET(SALOME_INSTALL_CMAKE salome_adm/cmake_files CACHE PATH "Install path: SALOME CMake files") +FIND_PACKAGE(PythonInterp) SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) SET(SALOME_INSTALL_PYTHON ${_pydir}/salome CACHE PATH "Install path: SALOME Python stuff") SET(SALOME_INSTALL_PYTHON_SHARED ${SALOME_INSTALL_PYTHON}/shared_modules CACHE PATH