X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=adm_local%2Fcmake_files%2FFindSalomeSIP.cmake;h=4b7f936d1b2ba2e6af76de9f32795fa086a4b358;hb=11a370454e581b8e532a2a58bff6cd18136ebafd;hp=496e74516b386fcd568d40becbfd4e4fb1b3cf41;hpb=bf775cfc7109efa61e4c41678a4d880cd346f9f2;p=modules%2Fgui.git diff --git a/adm_local/cmake_files/FindSalomeSIP.cmake b/adm_local/cmake_files/FindSalomeSIP.cmake index 496e74516..4b7f936d1 100644 --- a/adm_local/cmake_files/FindSalomeSIP.cmake +++ b/adm_local/cmake_files/FindSalomeSIP.cmake @@ -1,9 +1,9 @@ -# Copyright (C) 2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,8 +27,8 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(SIP SIP_EXECUTABLE 2) MARK_AS_ADVANCED(SIP_EXECUTABLE SIP_INCLUDE_DIR) IF(SIP_FOUND) - SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SIP_ROOT_DIR}/bin) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${SIP_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) - SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${SIP_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) + SALOME_ACCUMULATE_ENVIRONMENT(PATH ${SIP_EXECUTABLE}) + SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${SIP_PYTHONPATH}) + SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${SIP_PYTHONPATH}) ENDIF()