Linux (CentOS 6.3) environment created.

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 543d830ada048fd32345d8d085271ded7ab764ca..5b8f5f04dd34e8de71ed7a21edfda0011b5ef412 100644 (file)
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -1,9 +1,14 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  SET(PYTHON_LIBRARY_DLL "python27_d.lib")
+
+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 --git a/CMakeCommon/FindQt.cmake b/CMakeCommon/FindQt.cmake
index 786612a30145bab074006a8795a981393075e719..426cd05816d1a7867d75a89d97afee101dc23c4b 100644 (file)
--- a/CMakeCommon/FindQt.cmake
+++ b/CMakeCommon/FindQt.cmake
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 IF(WIN32)
     SET(QT_USE_QTMAIN ON)
@@ -7,8 +7,8 @@ ENDIF()
 # Widgets finds its own dependencies (QtGui and QtCore).
 FIND_PACKAGE(Qt4 REQUIRED)
 
-IF(NOT Qt4_FOUND)
-       MESSAGE(FATAL_ERROR "Qt not found.")
+IF(NOT QT4_FOUND)
+    MESSAGE(FATAL_ERROR "Qt not found.")
 ENDIF()
 
 INCLUDE(${QT_USE_FILE})
@@ -22,4 +22,4 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
 
 # Executables fail to build with Qt 5 in the default configuration
 # without -fPIE. We add that here.
-#SET(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
\ No newline at end of file
+#SET(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index da2bbf47cab72ea3f012b20a0c61548a4c7a6d21..7a512165b919924ea7d88342e4c71fe5cd790943 100644 (file)
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,10 +1,15 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
-SET(LIBXMLDIR $ENV{LIBXML2_DIR})
+SET(LIBXMLDIR $ENV{LIBXML2_ROOT_DIR})
 INCLUDE_DIRECTORIES(${LIBXMLDIR}/include/libxml2)
 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)
@@ -12,7 +17,6 @@ SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.lib)
 #FILE(TO_CMAKE_PATH $ENV{PC_LIBXML_LIBDIR} PC_LIBXML_LIBDIR)
 #message(STATUS "PC_LIBXML_INCLUDEDIR " ${PC_LIBXML_INCLUDEDIR})
 #message(STATUS "PC_LIBXML_LIBDIR " ${PC_LIBXML_LIBDIR})
-
  
 #FIND_PACKAGE(LibXml2 REQUIRED)
 #if(LIBXML2_FOUND)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5639cfb13f32f8caafa0218bc577a5eb96d3976c..fcea072deabf04a3ffc92b211dbdaf7dfb0271a0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 PROJECT (NewGEOM)
 

diff --git a/buildNewGEOM.bat b/buildNewGEOM.bat
index 51e29adda2e4d59f1ad9a6dacc02e7431b7846c6..edb65c0cdd8ad6e9e9d8dd1809977406a67a138d 100644 (file)
--- a/buildNewGEOM.bat
+++ b/buildNewGEOM.bat
@@ -9,7 +9,7 @@ popd
 
 @SET SRC_DIR=%ROOT_DIR%\sources
 
-call %SRC_DIR%\env.bat
+call %SRC_DIR%\msvc10_env.bat
 mkdir %ROOT_DIR%\build
 cd %ROOT_DIR%\build
 

diff --git a/centos6_env.sh b/centos6_env.sh
new file mode 100644 (file)
index 0000000..f9ec06d
--- /dev/null
+++ b/centos6_env.sh
@@ -0,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, \r
+# they are required by CMake "find(Libxml2)" procedure\r
+export LIBXML2_INCLUDE_DIR=${LIBXML2_ROOT_DIR}/include/libxml2\r
+export LIBXML2_LIB_DIR=${LIBXML2_ROOT_DIR}/lib\r
+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 --git a/eclipse.sh b/eclipse.sh
new file mode 100644 (file)
index 0000000..dc910da
--- /dev/null
+++ b/eclipse.sh
@@ -0,0 +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
+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&
\ No newline at end of file

diff --git a/env.bat b/env.bat
deleted file mode 100644 (file)
index 9affd54..0000000
--- a/env.bat
+++ /dev/null
@@ -1,150 +0,0 @@
-@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 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 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_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_DIR%\include\libxml2
-@SET LIBXML2_LIB_DIR=%LIBXML2_DIR%\lib
-@SET LIBXML2_BIN_DIR=%LIBXML2_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"

diff --git a/msvc10_env.bat b/msvc10_env.bat
new file mode 100644 (file)
index 0000000..6b774f9
--- /dev/null
+++ b/msvc10_env.bat
@@ -0,0 +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 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 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"

diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt
index 159be465ca1bd23c221dabbe9d5840ce1cd58a92..ef109088788eaee1822765031d7e4bfc640d307e 100644 (file)
--- a/src/Config/CMakeLists.txt
+++ b/src/Config/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 INCLUDE(Common)
 INCLUDE(XMLProcessing)

diff --git a/src/Event/CMakeLists.txt b/src/Event/CMakeLists.txt
index 4b2c1d86ee02ccf9c019d1bdb7f63a9685131361..3e458d5b48c3c862c617af26e7f038c1843fedb4 100644 (file)
--- a/src/Event/CMakeLists.txt
+++ b/src/Event/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 INCLUDE(Common)
 

diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index 48a70e9acdf6be457d8f1e9fb1c49110c516390b..fae97837133983c5becba00d974e53459c03f766 100644 (file)
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 INCLUDE(Common)
 INCLUDE(FindCAS)

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 4b15c44e34edd1aac6898b0b12082c48547531e4..bfe828ea849a7b89b3b186e9f006e173eb3e2ecf 100644 (file)
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index 240c0da621f4d1d3a48a763abfa84fa08de6069a..dd8b1cb03f65de64c5e8779d6cc322aa28768d5d 100644 (file)
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 INCLUDE(Common)
 SET(CMAKE_AUTOMOC ON)

diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt
index 337a75ad695739d6d14f2a1cd32494f9caa2d0c9..25b8d89baeabec3f43af450c04865488aef7472f 100644 (file)
--- a/src/PartSet/CMakeLists.txt
+++ b/src/PartSet/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 INCLUDE(Common)
 SET(CMAKE_AUTOMOC ON)

diff --git a/src/PartSetPlugin/CMakeLists.txt b/src/PartSetPlugin/CMakeLists.txt
index ab420ebe9e44639b838e026a5a54f993f16594d1..9a7e1ba0a03667f0e2f07155b514476cb7fdf607 100644 (file)
--- a/src/PartSetPlugin/CMakeLists.txt
+++ b/src/PartSetPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 INCLUDE(Common)
 

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index f428942ff1f5c490b024f3bcf2723a8ac60e8cca..3e4556b6204667b91707963b361f0100acd822d1 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 INCLUDE(FindCAS)