Release version on WIndows

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 543d830ada048fd32345d8d085271ded7ab764ca..42bfeeabfd853d0093a0d73fe77ff415bc258dd9 100644 (file)
--- 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 786612a30145bab074006a8795a981393075e719..233eddae82073802ddac73428e2c849dbc0bf1c1 100644 (file)
--- 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 da2bbf47cab72ea3f012b20a0c61548a4c7a6d21..836757794e76bccd34956a6071a5143b6bcaee95 100644 (file)
--- 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 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/env.bat b/env.bat
index 9affd542288c7b78953d11635ade00d14c46e8a1..736ea6a2665647ec78e0d6ee22941eee96a9345b 100644 (file)
--- 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 159be465ca1bd23c221dabbe9d5840ce1cd58a92..f4f98b9d791d9f8090ba6f387f8f2dff3d3710fd 100644 (file)
--- 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 4b2c1d86ee02ccf9c019d1bdb7f63a9685131361..5b727db7c4b9fde0c76da817d5eec509ad9b7f30 100644 (file)
--- 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 48a70e9acdf6be457d8f1e9fb1c49110c516390b..1d56def92f083d5a2b9b87a24002378e0e427514 100644 (file)
--- 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 4b15c44e34edd1aac6898b0b12082c48547531e4..fa372271f25fbe99e936bdbab6f31dabbfe22446 100644 (file)
--- 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 240c0da621f4d1d3a48a763abfa84fa08de6069a..efd8db9c13e77cf4357a430c2753ebf1cd4d9643 100644 (file)
--- 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 337a75ad695739d6d14f2a1cd32494f9caa2d0c9..0300761e69687bea5b337f0eb2ef4dd57707b84e 100644 (file)
--- 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 ab420ebe9e44639b838e026a5a54f993f16594d1..c27034c10ddd19dc4800fef8917a2da49f786138 100644 (file)
--- 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 f428942ff1f5c490b024f3bcf2723a8ac60e8cca..652965fc1c905b20fc5e3029f8bc957dc8d2c66e 100644 (file)
--- 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)