From: mpv Date: Fri, 11 Apr 2014 12:40:30 +0000 (+0400) Subject: Merge branch 'origin/BR_PORTING_CENTOS_6_3' X-Git-Tag: V_0.1~14^2~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=10c74b99318f5265c9a60a178932b03f69adfee5;p=modules%2Fshaper.git Merge branch 'origin/BR_PORTING_CENTOS_6_3' Conflicts: CMakeCommon/FindPython.cmake CMakeCommon/FindQt.cmake CMakeCommon/XMLProcessing.cmake src/Config/CMakeLists.txt src/Event/CMakeLists.txt src/Model/CMakeLists.txt src/ModelAPI/CMakeLists.txt src/ModuleBase/CMakeLists.txt src/PartSet/CMakeLists.txt src/PartSetPlugin/CMakeLists.txt src/XGUI/CMakeLists.txt --- 10c74b99318f5265c9a60a178932b03f69adfee5 diff --cc CMakeCommon/FindPython.cmake index 42bfeeabf,5b8f5f04d..364fc028b --- a/CMakeCommon/FindPython.cmake +++ b/CMakeCommon/FindPython.cmake @@@ -1,7 -1,14 +1,12 @@@ - IF(CMAKE_BUILD_TYPE STREQUAL "Debug") - SET(PYTHON_LIBRARY_DLL "python27_d.lib") -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) - + + IF(WIN32) + IF(CMAKE_BUILD_TYPE STREQUAL "Debug") + SET(PYTHON_LIBRARY_DLL "python27_d.lib") + ElSE() + SET(PYTHON_LIBRARY_DLL "python27.lib") + ENDIF() ElSE() - SET(PYTHON_LIBRARY_DLL "python27.lib") + SET(PYTHON_LIBRARY_DLL "libpython27.so") ENDIF() FILE(TO_CMAKE_PATH "$ENV{PYTHON_LIB_DIR}/${PYTHON_LIBRARY_DLL}" PYTHON_LIBRARY) diff --cc CMakeCommon/FindQt.cmake index 233eddae8,426cd0581..773765765 --- a/CMakeCommon/FindQt.cmake +++ b/CMakeCommon/FindQt.cmake @@@ -1,3 -1,5 +1,4 @@@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) - IF(WIN32) SET(QT_USE_QTMAIN ON) ENDIF() diff --cc CMakeCommon/XMLProcessing.cmake index 836757794,7a512165b..5e38c02ec --- a/CMakeCommon/XMLProcessing.cmake +++ b/CMakeCommon/XMLProcessing.cmake @@@ -1,14 -1,15 +1,19 @@@ - SET(LIBXMLDIR $ENV{LIBXML2_DIR}) -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) - + SET(LIBXMLDIR $ENV{LIBXML2_ROOT_DIR}) -INCLUDE_DIRECTORIES(${LIBXMLDIR}/include/libxml2) + +IF(WIN32) + INCLUDE_DIRECTORIES(${LIBXMLDIR}/include) +ELSE() + INCLUDE_DIRECTORIES(${LIBXMLDIR}/include/libxml2) +ENDIF(WIN32) + LINK_DIRECTORIES (${LIBXMLDIR}/lib) + IF(WIN32) + SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.lib) + ELSE() + SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.so) + ENDIF() + - SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.lib) #set(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${LIBXMLDIR}/lib/libxml2.lib) #FILE(TO_CMAKE_PATH $ENV{PC_LIBXML_INCLUDEDIR} PC_LIBXML_INCLUDEDIR) diff --cc eclipse.sh index 000000000,dc910dae3..3f1c9c832 mode 000000,100644..100644 --- a/eclipse.sh +++ b/eclipse.sh @@@ -1,0 -1,20 +1,20 @@@ + + # Find absolute path to ROOT_DIR + export ROOT_DIR=$(pwd)/.. + export ROOT_DIR=`cd "${ROOT_DIR}";pwd` + + SRC_DIR=${ROOT_DIR}/sources + -source ${SRC_DIR}/centos6_env.sh ++source ${SRC_DIR}/linux_env.sh + mkdir -p ${ROOT_DIR}/build + cd ${ROOT_DIR}/build + + CMAKE_ARGS="-D_ECLIPSE_VERSION=4.3" + CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Debug" + CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=ON" + CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=${ROOT_DIR}/install" + CMAKE_ARGS="${CMAKE_ARGS} ${SRC_DIR}" + + cmake -G "Eclipse CDT4 - Unix Makefiles" ${CMAKE_ARGS} + + /misc/dn21/hdfeditor/sbh/devtools/eclipse-4.3.0/eclipse& diff --cc linux_env.sh index 000000000,000000000..889f5e402 new file mode 100644 --- /dev/null +++ b/linux_env.sh @@@ -1,0 -1,0 +1,85 @@@ ++#------ Setting products installation directory ------ ++export INST_ROOT=/misc/dn21/hdfeditor/sbh/NewGeom/products ++ ++#------ Python ------ ++export PYTHON_ROOT_DIR=${INST_ROOT}/Python-2.7.3 ++export PYTHONHOME=${PYTHON_ROOT_DIR} ++export PYTHON_INCLUDE=${PYTHON_ROOT_DIR}/include/python2.7 ++export PYTHON_VERSION=2.7 ++export PATH=${PYTHON_ROOT_DIR}/bin:${PATH} ++export LD_LIBRARY_PATH=${PYTHON_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ++export PYTHONPATH=${PYTHON_ROOT_DIR}/lib/python2.7 ++#For cmake ++export PYTHON_LIB_DIR=${PYTHON_ROOT_DIR}/lib ++export PYTHON_INC_DIR=${PYTHON_INCLUDE} ++## ++#------ Qt ------ ++export QT4_ROOT_DIR=${INST_ROOT}/qt-4.8.4 ++export QT_PLUGIN_PATH=${QT4_ROOT_DIR}/plugins ++export PATH=${QT4_ROOT_DIR}/bin:${PATH} ++export LD_LIBRARY_PATH=${QT4_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ++## ++#------ boost ------ ++#export BOOST_ROOT_DIR=${INST_ROOT}/boost-1.52.0 ++#export LD_LIBRARY_PATH ${BOOST_ROOT_DIR}/lib ++## ++#------ swig ------ ++export SWIG_ROOT_DIR=${INST_ROOT}/swig-2.0.8 ++export SWIG_LIB=${SWIG_ROOT_DIR}/share/swig/2.0.8 ++export PATH=${SWIG_ROOT_DIR}/bin:${PATH} ++## ++#------ cmake ------ ++export CMAKE_ROOT_DIR=${INST_ROOT}/cmake-2.8.10.2 ++export PATH=${CMAKE_ROOT_DIR}/bin:${PATH} ++## ++#------ freetype ------ ++export FREETYPE_ROOT_DIR=${INST_ROOT}/freetype-2.4.11 ++export LD_LIBRARY_PATH=${FREETYPE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ++## ++#------ freeimage ------ ++export FREEIMAGE_ROOT_DIR=${INST_ROOT}/freeimage-3.15.4 ++export PATH=${FREEIMAGE_ROOT_DIR}/bin:${PATH} ++export LD_LIBRARY_PATH=${FREEIMAGE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ++## ++#------ gl2ps ------ ++export GL2PS_ROOT_DIR=${INST_ROOT}/gl2ps-1.3.8 ++export PATH=${GL2PS_ROOT_DIR}/bin:${PATH} ++export LD_LIBRARY_PATH=${GL2PS_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ++## ++#------ tbb ------ ++export TBB_ROOT_DIR=${INST_ROOT}/tbb-30_018oss ++export PATH=${TBB_ROOT_DIR}/bin/intel64/cc4.1.0_libc2.4_kernel2.6.16.21:${PATH} ++export LD_LIBRARY_PATH=${TBB_ROOT_DIR}/lib/intel64/cc4.1.0_libc2.4_kernel2.6.16.21:${LD_LIBRARY_PATH} ++## ++#------ libxml2 ------ ++export LIBXML2_ROOT_DIR=${INST_ROOT}/libxml2-2.9.0 ++export PATH=${LIBXML2_ROOT_DIR}/bin:${PATH} ++export LD_LIBRARY_PATH=${LIBXML2_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ++# DO NOT rename following 3 variables, ++# they are required by CMake "find(Libxml2)" procedure ++export LIBXML2_INCLUDE_DIR=${LIBXML2_ROOT_DIR}/include/libxml2 ++export LIBXML2_LIB_DIR=${LIBXML2_ROOT_DIR}/lib ++export LIBXML2_BIN_DIR=${LIBXML2_ROOT_DIR}/bin ++## ++#------ OCCT ------ ++export CAS_ROOT_DIR=${INST_ROOT}/OCCT-6.7.0 ++ ++export PATH=${CAS_ROOT_DIR}:${CAS_ROOT_DIR}/bin:${PATH} ++export LD_LIBRARY_PATH=${CAS_ROOT_DIR}:${CAS_ROOT_DIR}/lib:${LD_LIBRARY_PATH} ++# Variable for Foundation Classes : ++export CSF_UnitsLexicon=${CAS_ROOT_DIR}/src/UnitsAPI/Lexi_Expr.dat ++export CSF_UnitsDefinition=${CAS_ROOT_DIR}/src/UnitsAPI/Units.dat ++# Variable for DataExchange : ++export CSF_SHMessage=${CAS_ROOT_DIR}/src/SHMessage ++export CSF_XSMessage=${CAS_ROOT_DIR}/src/XSMessage ++# Variable for Font : ++export CSF_MDTVFontDirectory=${CAS_ROOT_DIR}/src/FontMFT ++export CSF_MDTVTexturesDirectory=${CAS_ROOT_DIR}/src/Textures ++# Activation of OCCT Kernel multithreading : ++export MMGT_REENTRANT=1 ++# this variable only needed for DRAWEXE ++export CASROOT=${CAS_ROOT_DIR} ++## ++export LIB=${LD_LIBRARY_PATH} ++ ++ diff --cc msvc10_env.bat index 000000000,6b774f930..670d4400c mode 000000,100644..100644 --- a/msvc10_env.bat +++ b/msvc10_env.bat @@@ -1,0 -1,150 +1,150 @@@ + @echo off + + @REM Load local settings from file localenv.bat that should be located in the root directory + if "%ROOT_DIR%" == "" ( + set ROOT_DIR=%~dp0.. + ) + if exist "%ROOT_DIR%\localenv.bat" ( + echo Setting local environment from %ROOT_DIR%\localenv.bat + call "%ROOT_DIR%\localenv.bat" + ) else ( + echo Warning: file %ROOT_DIR%\localenv.bat does not exist; using default environment + ) + + rem --------------- Configuration -------------- + + rem --------------- Products path -------------- + if "%PDIR%" == "" ( + set PDIR=%ROOT_DIR%\products + ) + + rem --------------- cmake 2.8.7 -------------- + if "%CMAKEDIR%" == "" ( - set CMAKEDIR=%PDIR%\cmake-2.8.12.1 ++ set CMAKEDIR=%PDIR%\cmake-2.8.10.2 + ) + set PATH=%CMAKEDIR%\bin;%PATH% + + @REM ------------------------- + @REM CASCADE + @SET CAS_ROOT_DIR=%PDIR%\OCCT-6.7.0 + @SET CASROOT=%CAS_ROOT_DIR% + @REM ------------------------- + + @REM ------------------------- + @REM CASCADE -@SET PATH=%CASROOT%;%CASROOT%\win32\bind;%PATH% -@SET LIB=%CASROOT%\win32\libd;%LIB% -@set CSF_GraphicShr=%CASROOT%\win32\bind\TKOpenGl.dll ++@SET PATH=%CASROOT%;%CASROOT%\win32\bin%OCC_LIB_PREFIX%;%PATH% ++@SET LIB=%CASROOT%\win32\lib%OCC_LIB_PREFIX%;%LIB% ++@set CSF_GraphicShr=%CASROOT%\win32\bin%OCC_LIB_PREFIX%\TKOpenGl.dll + @set CSF_MDTVFontDirectory=%CASROOT%\src\FontMFT + @set CSF_LANGUAGE=us + @set MMGT_CLEAR=1 + @set CSF_EXCEPTION_PROMPT=1 + @set CSF_SHMessage=%CASROOT%\src\SHMessage + @set CSF_MDTVTexturesDirectory=%CASROOT%\src\Textures + @set CSF_XSMessage=%CASROOT%\src\XSMessage + @set CSF_StandardDefaults=%CASROOT%\src\StdResource + @set CSF_PluginDefaults=%CASROOT%\src\StdResource + @set CSF_XCAFDefaults=%CASROOT%\src\StdResource + @set CSF_StandardLiteDefaults=%CASROOT%\src\StdResource + @set CSF_UnitsLexicon=%CASROOT%\src\UnitsAPI\Lexi_Expr.dat + @set CSF_UnitsDefinition=%CASROOT%\src\UnitsAPI\Units.dat + @set CSF_IGESDefaults=%CASROOT%\src\XSTEPResource + @set CSF_STEPDefaults=%CASROOT%\src\XSTEPResource + @set CSF_XmlOcafResource=%CASROOT%\src\XmlOcafResource + @REM ------------------------- + + + @REM ------------------------- + @REM FREEIMAGE (Used by OCCT) + @SET PATH=%PDIR%\freeimage-3.15.4\bin;%PATH% + @REM ------------------------- + + @REM ------------------------- + @REM FTGL (Used by OCCT) + @SET PATH=%PDIR%\ftgl-2.1.3\bin;%PATH% + @REM ------------------------- + + @REM ------------------------- + @REM FREETYPE (Used by OCCT) + @SET PATH=%PDIR%\freetype-2.4.11\bin;%PATH% + @REM ------------------------- + + @REM ------------------------- + @REM GL2PS (Used by OCCT AND PARAVIEW) + @SET PATH=%PDIR%\gl2ps-1.3.8\bin;%PATH% + @REM ------------------------- + + @REM ------------------------- + @REM TBB (Used by OCCT) + @SET PATH=%PDIR%\tbb\bin;%PATH% + @REM ------------------------- + + @REM ------------------------- + @REM QT + @SET QTDIR=%PDIR%\qt-4.8.4 + @ECHO -- Creating qt.conf... + @ECHO [Paths] > %QTDIR%/bin/qt.conf + @ECHO Prefix = %QTDIR:\=/% >> %QTDIR%/bin/qt.conf + @SET PATH=%QTDIR%\bin;%PATH% + + @REM ------------------------- + + @REM ------------------------- + @REM PYTHON + @SET PYTHONHOME=%PDIR%\python-2.7.3 + @SET PYTHON_LIB_DIR=%PYTHONHOME%\libs + @SET PYTHON_INC_DIR=%PYTHONHOME%\include + @SET PATH=%PYTHON_LIB_DIR%;%PATH% + @SET PATH=%PYTHONHOME%;%PATH% + @SET PYTHONPATH=%PYTHONHOME%\Lib;%PYTHONPATH% + @SET PYTHONPATH=%PYTHONHOME%\DLLs;%PYTHONPATH% + @SET PYTHON_VERSION=2.7 + @REM ------------------------- + + @REM ------------------------- + @REM ZLIB (for LIBXML2) + @SET PATH=%PDIR%\zlib-1.2.5\dll;%PATH% + @REM ------------------------- + + @REM ------------------------- + @REM LIBXML2 + @SET LIBXML2_ROOT_DIR=%PDIR%\libxml2-2.9.0 + @REM DO NOT rename following 3 variables, + @REM they are required by CMake "find(Libxml2)" procedure + @SET LIBXML2_INCLUDE_DIR=%LIBXML2_ROOT_DIR%\include\libxml2 + @SET LIBXML2_LIB_DIR=%LIBXML2_ROOT_DIR%\lib + @SET LIBXML2_BIN_DIR=%LIBXML2_ROOT_DIR%\bin + @SET PATH=%LIBXML2_BIN_DIR%;%LIBXML2_LIB_DIR%;%PATH% + @REM ------------------------- + + @REM ------------------------- + @REM SWIG + @SET PATH=%PDIR%\swig-2.0.9\bin;%PATH% + @REM ------------------------- + + @REM ------------------------- + @REM BOOST + @SET BOOST_ROOT_DIR=%PDIR%\boost-1.52.0 + @SET PATH=%BOOST_ROOT_DIR%\lib;%PATH% + @REM ------------------------- + + @SET PATH=D:\NewGEOM\build-eclipse\bin;%PATH% + + @SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins + @SET PATH=%ROOT_DIR%\install\plugins;%PATH% + + rem -------- Visual Studio -------------------- + rem Detect Visual Studio (either commercial or Express edition) + if "%VS100COMNTOOLS%" == "" ( + echo Could not find MS Visual Studio: variable VS100COMNTOOLS is not defined! + exit 1 + ) else if exist "%VS100COMNTOOLS%\..\IDE\devenv.exe" ( + set MSVC_EXE="%VS100COMNTOOLS%\..\IDE\devenv.exe" + ) else if exist "%VS100COMNTOOLS%\..\IDE\VCExpress.exe" ( + set MSVC_EXE="%VS100COMNTOOLS%\..\IDE\VCExpress.exe" + ) else ( + echo "Could not find MS Visual Studio in %VS100COMNTOOLS%\..\IDE" + echo Check environment variable VS100COMNTOOLS! + exit 1 + ) + call "%VS100COMNTOOLS%..\Tools\vsvars32.bat"