Preparation of the SALOME7.2.0 win32 version.

diff --git a/adm_local/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake
index 0432175b71d886f68e63a76ed70ee15a1a349f2c..2321af8daa0fca01162fa0902ed30294d3272c08 100644 (file)
--- a/adm_local/cmake_files/FindCAS.cmake
+++ b/adm_local/cmake_files/FindCAS.cmake
@@ -34,7 +34,11 @@ ENDIF(ff)
 
 SET(CAS_DEFINITIONS "-DLIN -DLINTEL -DCSFDB")
 SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DNo_exception")
-SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H")
+
+# No config.h file in the OPEN CASCADE on WINDOWS platform 
+IF(NOT WINDOWS)
+ SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H")
+ENDIF(NOT WINDOWS)
 SET(CAS_INCLUDE_DIRS ${CAS_ROOT_DIR}/inc)
 
 IF(CMAKE_SIZEOF_VOID_P STREQUAL 8)

diff --git a/adm_local/cmake_files/deprecated/FindCAS.cmake b/adm_local/cmake_files/deprecated/FindCAS.cmake
index d723db6cc578e60bc4a6e492ef2c19f7ade7c2fc..03482c3370c141f66366bc36dcc871e1ceec0ecd 100644 (file)
--- a/adm_local/cmake_files/deprecated/FindCAS.cmake
+++ b/adm_local/cmake_files/deprecated/FindCAS.cmake
@@ -41,8 +41,11 @@ SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DLIN -DLINTEL -DCSFDB)
 SET(CAS_DEFINITIONS "-DLIN -DLINTEL -DCSFDB")
 SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DNo_exception)
 SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DNo_exception")
-SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_CONFIG_H)
-SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H")
+# No config.h file in the OPEN CASCADE on WINDOWS platform 
+IF(NOT WINDOWS)
+ SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_CONFIG_H)
+ SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H")
+ENDIF(NOT WINDOWS)
 SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_LIMITS_H)
 SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_LIMITS_H")
 SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -I${CASROOT}/inc) # to be removed

diff --git a/src/SALOME_PY/CMakeLists.txt b/src/SALOME_PY/CMakeLists.txt
index ccd267ece276b3b98615ec9f9ec8885a2a014975..1bd4486bc44e11c3218ebdc81384c1601caeb345 100755 (executable)
--- a/src/SALOME_PY/CMakeLists.txt
+++ b/src/SALOME_PY/CMakeLists.txt
@@ -50,8 +50,11 @@ SET(COMMON_LIBS
   #  ${vtkImagingPythonD}
   #  ${vtkPythonCore}
 )
-
-ADD_DEFINITIONS("-DHAVE_CONFIG_H ${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS}")
+IF(WINDOWS)
+ ADD_DEFINITIONS("${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS}")
+ELSE(WINDOWS)
+ ADD_DEFINITIONS("-DHAVE_CONFIG_H ${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS}")
+ENDIF(WINDOWS)
 
 ADD_LIBRARY(SalomePy SalomePy.cxx)
 TARGET_LINK_LIBRARIES(SalomePy ${COMMON_LIBS})

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
index 8346300b788c6fe75a21a68017abd324705ab7c9..b8abeb4a3374c3b160f655df94c31e14b282cd0f 100755 (executable)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
@@ -60,7 +60,12 @@ SET(COMMON_LIBS
 SET(GUI_HEADERS SALOME_PYQT_Module.h)
 QT4_WRAP_CPP(GUI_HEADERS_MOC ${GUI_HEADERS})
 
-ADD_DEFINITIONS("-DCALL_OLD_METHODS -DHAVE_CONFIG_H ${QT_DEFINITIONS} ${PYTHON_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS}")
+IF(WINDOWS)
+ ADD_DEFINITIONS("-DCALL_OLD_METHODS ${QT_DEFINITIONS} ${PYTHON_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS}")
+ELSE(WINDOWS)
+ ADD_DEFINITIONS("-DCALL_OLD_METHODS -DHAVE_CONFIG_H ${QT_DEFINITIONS} ${PYTHON_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS}")
+ENDIF(WINDOWS)
+
 
 ADD_LIBRARY(SalomePyQtGUI SALOME_PYQT_Module.cxx ${GUI_HEADERS_MOC})
 TARGET_LINK_LIBRARIES(SalomePyQtGUI ${COMMON_LIBS})

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
index b8765efa2c97a66d16cfbb9f3272ec1095ec231b..0e13a727f24a74d2d8db738b29267d31ead6096a 100755 (executable)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
@@ -89,7 +89,13 @@ SET(SalomePyQtGUI_SOURCES
   SALOME_PYQT_PyInterp.cxx
 )
 
-ADD_DEFINITIONS( "-DHAVE_CONFIG_H -DCALL_OLD_METHODS ${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS}")
+
+IF(WINDOWS)
+ ADD_DEFINITIONS( "-DCALL_OLD_METHODS ${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS}")
+ELSE(WINDOWS)
+ ADD_DEFINITIONS( "-DHAVE_CONFIG_H -DCALL_OLD_METHODS ${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS}")
+ENDIF(WINDOWS)
+
 
 ADD_LIBRARY(SalomePyQtGUILight ${SalomePyQtGUI_SOURCES} ${GUI_HEADERS_MOC} ${SIP_SRC})
 TARGET_LINK_LIBRARIES(SalomePyQtGUILight ${COMMON_LIBS})