Porting SALOME6 on windows: update cmake file for the new products.

diff --git a/salome_adm/cmake_files/FindBOOST.cmake b/salome_adm/cmake_files/FindBOOST.cmake
index 3328f2cc088a3e89a8dec057c9cfb06c976d6663..de85bc5aed423a82904fec3c8c9bcdb74502228d 100644 (file)
--- a/salome_adm/cmake_files/FindBOOST.cmake
+++ b/salome_adm/cmake_files/FindBOOST.cmake
@@ -105,19 +105,20 @@ IF(BOOST_STATUS)
   ENDIF(BOOST_ROOT_USER)
 ENDIF(BOOST_STATUS)
 
+
 IF(BOOST_STATUS)
   SET(BOOST_LIBS)
   FOREACH(name thread date_time signals filesystem system regex)
     IF(WINDOWS)
       IF(CMAKE_BUILD_TYPE STREQUAL Debug)
-       SET(EXTENSION -gd)
+        SET(EXTENSION -gd)
       ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
-       SET(EXTENSION)
+        SET(EXTENSION)
       ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
       SET(LIB_NAMES)
-      FOREACH(version 1_35 1_38 1_42)
-       SET(LIB_NAMES ${LIB_NAMES} libboost_${name}-vc90-mt${EXTENSION}-${version})
-      ENDFOREACH(version 1_35 1_38 1_42)
+      FOREACH(version 1_35 1_38 1_42 1_46_1)
+        SET(LIB_NAMES ${LIB_NAMES} boost_${name}-vc90-mt${EXTENSION}-${version})
+      ENDFOREACH(version 1_35 1_38 1_42 1_46_1)
       FIND_LIBRARY(BOOST_LIB_${name} NAMES ${LIB_NAMES} PATHS ${BOOST_LIB_PATHS} ${BOOST_FIND_PATHS_OPTION})
     ELSE(WINDOWS)
       FIND_LIBRARY(BOOST_LIB_${name} boost_${name} PATHS ${BOOST_LIB_PATHS} ${BOOST_FIND_PATHS_OPTION})

diff --git a/salome_adm/cmake_files/FindCPPUNIT.cmake b/salome_adm/cmake_files/FindCPPUNIT.cmake
index 2c8e3306db9cc9c55aad67f26d49f2e6a4c2192f..722dec50890574f612ff2bac7bcbefbdefd7af2a 100644 (file)
--- a/salome_adm/cmake_files/FindCPPUNIT.cmake
+++ b/salome_adm/cmake_files/FindCPPUNIT.cmake
@@ -104,7 +104,11 @@ ENDIF(CPPUNIT_STATUS)
 
 IF(CPPUNIT_STATUS)
   IF(WINDOWS)
-    FIND_LIBRARY(CPPUNIT_LIB cppunitd_dll PATHS ${CPPUNIT_LIB_PATHS} ${CPPUNIT_FIND_PATHS_OPTION})
+    IF(CMAKE_BUILD_TYPE STREQUAL Debug)
+      FIND_LIBRARY(CPPUNIT_LIB cppunitd_dll PATHS ${CPPUNIT_LIB_PATHS} ${CPPUNIT_FIND_PATHS_OPTION})
+    ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
+      FIND_LIBRARY(CPPUNIT_LIB cppunit_dll PATHS ${CPPUNIT_LIB_PATHS} ${CPPUNIT_FIND_PATHS_OPTION})
+    ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
   ELSE(WINDOWS)
     FIND_LIBRARY(CPPUNIT_LIB cppunit PATHS ${CPPUNIT_LIB_PATHS} ${CPPUNIT_FIND_PATHS_OPTION})
   ENDIF(WINDOWS)

diff --git a/salome_adm/cmake_files/FindLIBXML2.cmake b/salome_adm/cmake_files/FindLIBXML2.cmake
index 4206cdb4e6a43b3365c3790a72dfb516c1f203c3..44610e9a813d91e8a69f95319d535f84aeaa3df8 100644 (file)
--- a/salome_adm/cmake_files/FindLIBXML2.cmake
+++ b/salome_adm/cmake_files/FindLIBXML2.cmake
@@ -74,7 +74,11 @@ ENDIF(LIBXML2_STATUS)
 
 IF(LIBXML2_STATUS)
   IF(LIBXML2_ROOT_USER)
-    SET(LIBXML2_INCLUDE_PATHS ${LIBXML2_ROOT_USER}/include/libxml2)
+    IF(WINDOWS)
+      SET(LIBXML2_INCLUDE_PATHS ${LIBXML2_ROOT_USER}/include)
+    ELSE(WINDOWS)
+      SET(LIBXML2_INCLUDE_PATHS ${LIBXML2_ROOT_USER}/include/libxml2)
+    ENDIF(WINDOWS)
   ELSE(LIBXML2_ROOT_USER)
     SET(LIBXML2_INCLUDE_PATHS /usr/include/libxml2)
   ENDIF(LIBXML2_ROOT_USER)

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index cd988ec7bd25a68bdae5ed3f81f660d0d4399e47..9d10c2b2080cc91d13a7332a36b3ef887390d45a 100644 (file)
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -203,6 +203,7 @@ class CMakeFile(object):
             "vtkCommonPythonD",
             "vtkGraphicsPythonD",
             "vtkImagingPythonD",
+            "vtkPythonCore",
             ]
         kernel_list  = [
             "CalciumC",
@@ -1107,9 +1108,9 @@ class CMakeFile(object):
                 pass
             pass
 
-       # --
-       # add commands for generating of user's documentation
-       # --
+        # --
+        # add commands for generating of user's documentation
+        # --
   
         upmod = self.module.upper()
         doc_gui_destination = "${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/%s"%(upmod)
@@ -1157,16 +1158,16 @@ class CMakeFile(object):
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}             
                 )"""%(str, upmod, tmp, upmod, tmp, tmp, input, upmod, tmp, copytree_src, doc_gui_destination, doc_gui_destination, ign, head_source, doc_gui_destination))
             else:
-               newlines.append("""\t    ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE} doxyfile_idl
+                newlines.append("""\t    ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE} doxyfile_idl
                 COMMAND ${DOXYGEN_EXECUTABLE} doxyfile
                 COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; sys.path.append(r'''%s'''); shutil.rmtree(r'''%s''',True); import copytree1; copytree1.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}''',r'''%s''', ignore=copytree1.ignore_patterns(%s)); shutil.copy(r'''%s''',r'''%s''')"
                 VERBATIM 
                 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}             
                 )"""%(copytree_src, doc_gui_destination, doc_gui_destination, ign, head_source, doc_gui_destination))
 
-       # --
-       # add commands for generating of developer's documentation
-       # --
+  # --
+  # add commands for generating of developer's documentation
+  # --
   
         upmod = self.module.upper()
         if mod in ['kernel', 'gui', 'med', 'smesh', 'visu'] and self.root[-len('tui'):] == 'tui':
@@ -1722,11 +1723,11 @@ class CMakeFile(object):
             ''')
             pass
         newlines.append(r'''
-       SET(var ${var} ${PLATFORM_CPPFLAGS})
-       SET(var ${var} ${PTHREAD_CFLAGS})
-       SET(var ${var} ${${amname}_CPPFLAGS})
-       SET(var ${var} ${${amname}_CXXFLAGS})
-       SET(var ${var} ${${amname}_CFLAGS})
+  SET(var ${var} ${PLATFORM_CPPFLAGS})
+  SET(var ${var} ${PTHREAD_CFLAGS})
+  SET(var ${var} ${${amname}_CPPFLAGS})
+  SET(var ${var} ${${amname}_CXXFLAGS})
+  SET(var ${var} ${${amname}_CFLAGS})
         SET(vars)
         IF(WINDOWS)
         SET(vars ${vars} -include SALOMEconfig.h)