From: mpv <mikhail.ponikarov@opencascade.com>
Date: Fri, 11 Apr 2014 12:32:07 +0000 (+0400)
Subject: Release version on WIndows
X-Git-Tag: V_0.1~14^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a793636ae5265326796c7b5a26a5000041567d43;p=modules%2Fshaper.git

Release version on WIndows
---

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 543d830ad..42bfeeabf 100644
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
   SET(PYTHON_LIBRARY_DLL "python27_d.lib")
 ElSE()
diff --git a/CMakeCommon/FindQt.cmake b/CMakeCommon/FindQt.cmake
index 786612a30..233eddae8 100644
--- a/CMakeCommon/FindQt.cmake
+++ b/CMakeCommon/FindQt.cmake
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 IF(WIN32)
     SET(QT_USE_QTMAIN ON)
 ENDIF()
@@ -7,8 +5,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})
diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index da2bbf47c..836757794 100644
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,7 +1,11 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 SET(LIBXMLDIR $ENV{LIBXML2_DIR})
-INCLUDE_DIRECTORIES(${LIBXMLDIR}/include/libxml2)
+
+IF(WIN32)
+  INCLUDE_DIRECTORIES(${LIBXMLDIR}/include)
+ELSE()
+  INCLUDE_DIRECTORIES(${LIBXMLDIR}/include/libxml2)
+ENDIF(WIN32)
+
 LINK_DIRECTORIES (${LIBXMLDIR}/lib)
 
 SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.lib)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5639cfb13..fcea072de 100644
--- 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/env.bat b/env.bat
index 9affd5422..736ea6a26 100644
--- a/env.bat
+++ b/env.bat
@@ -20,7 +20,7 @@ if "%PDIR%" == "" (
 
 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%
 
@@ -32,9 +32,9 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @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
diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt
index 159be465c..f4f98b9d7 100644
--- a/src/Config/CMakeLists.txt
+++ b/src/Config/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(Common)
 INCLUDE(XMLProcessing)
 
diff --git a/src/Event/CMakeLists.txt b/src/Event/CMakeLists.txt
index 4b2c1d86e..5b727db7c 100644
--- a/src/Event/CMakeLists.txt
+++ b/src/Event/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(Common)
 
 SET(PROJECT_HEADERS
diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index 48a70e9ac..1d56def92 100644
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(Common)
 INCLUDE(FindCAS)
 
diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 4b15c44e3..fa372271f 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index 240c0da62..efd8db9c1 100644
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(Common)
 SET(CMAKE_AUTOMOC ON)
 
diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt
index 337a75ad6..0300761e6 100644
--- a/src/PartSet/CMakeLists.txt
+++ b/src/PartSet/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(Common)
 SET(CMAKE_AUTOMOC ON)
 
diff --git a/src/PartSetPlugin/CMakeLists.txt b/src/PartSetPlugin/CMakeLists.txt
index ab420ebe9..c27034c10 100644
--- a/src/PartSetPlugin/CMakeLists.txt
+++ b/src/PartSetPlugin/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(Common)
 
 SET(PROJECT_HEADERS
diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index f428942ff..652965fc1 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(FindCAS)
 
 SET(CMAKE_AUTOMOC ON)