X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=salome_adm%2Fcmake_files%2Fdeprecated%2Fam2cmake.py;h=c506dbe738520e27f7e92b4ea2112e500f5cd402;hb=ccfad0b25a9c4c79842a515f7288a4600aec9b39;hp=ba583ed903200237fd4b3a9ac4dd22bb3b6dc2e0;hpb=f12750a5cb8679449d0ae750a2a9b182cef88f16;p=modules%2Fkernel.git diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py index ba583ed90..c506dbe73 100644 --- a/salome_adm/cmake_files/deprecated/am2cmake.py +++ b/salome_adm/cmake_files/deprecated/am2cmake.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -33,7 +33,7 @@ p_multiline = re.compile(r""" p_dollar = re.compile(r""" \$\( # a $ then a ( (?P # open the group val -[^)]* # the group contain 0 or more non ) characters +[^()]* # the group contain 0 or more non ) characters ) # close the group \) # a ) at the end """, re.VERBOSE) @@ -128,6 +128,11 @@ class CMakeFile(object): # -- content = content.replace("../NETGEN/libNETGEN.la", "${NETGEN_LIBS}") + # -- + # Compatibility VTK 6.0 + # -- + content = content.replace("VTK_LIBS", "VTK_LIBRARIES") + # -- cas_list = [ "BinLPlugin", @@ -204,6 +209,7 @@ class CMakeFile(object): "vtkGraphicsPythonD", "vtkImagingPythonD", "vtkPythonCore", + "vtkIOImage", ] kernel_list = [ "CalciumC", @@ -544,6 +550,7 @@ class CMakeFile(object): INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindSWIG.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindDOXYGEN.cmake) + INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSalomeLIBBATCH.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindKERNEL.cmake) """) @@ -588,9 +595,11 @@ class CMakeFile(object): newlines.append(""" SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR}) SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR}) + INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindQWT.cmake) INCLUDE(${GEOM_ROOT_DIR}/adm_local/cmake_files/FindGEOM.cmake) - INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMEDFILE.cmake) - INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMED.cmake) + INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake) + + INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindSalomeMED.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSPHINX.cmake) """) pass @@ -654,6 +663,10 @@ class CMakeFile(object): INCLUDE(${CMAKE_SOURCE_DIR}/adm/cmake/FindEXPAT.cmake) INCLUDE(${CMAKE_SOURCE_DIR}/adm/cmake/FindGRAPHVIZ.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSPHINX.cmake) + + SET(PLATFORM_CPPFLAGS ${PLATFORM_CPPFLAGS} -D_SECURE_SCL=0) + SET(PLATFORM_CPPFLAGS ${PLATFORM_CPPFLAGS} -D_SECURE_SCL_THROWS=0) + SET(PLATFORM_CPPFLAGS ${PLATFORM_CPPFLAGS} -D_HAS_ITERATOR_DEBUGGING=0) # To avoid runtime error during checking iterators """) pass if self.module == "jobmanager": @@ -679,6 +692,7 @@ class CMakeFile(object): newlines.append(""" IF(WINDOWS) SET(CPPUNIT_IS_OK 0) + MESSAGE(STATUS "cppunit is disabled.") ENDIF(WINDOWS) """) pass @@ -802,10 +816,10 @@ class CMakeFile(object): pass # -- newlines.append(""" - set(VERSION 7.0.0) - set(SHORT_VERSION 7.0) - set(XVERSION 0x070000) - set(VERSION_DEV 1) + set(VERSION 7.3.0) + set(SHORT_VERSION 7.3) + set(XVERSION 0x070300) + set(VERSION_DEV 0) """) pass # -- @@ -973,7 +987,13 @@ class CMakeFile(object): # Replace the $(TOTO) by ${TOTO} # Replace the @TOTO@ by ${TOTO} # -- - line = p_dollar.sub(r"${\1}", line) + # VSR 15.04.2013 - process nesting substitutions properly, e.g. $(aaa$(bbb)) + #line = p_dollar.sub(r"${\1}", line) + m_dollar = p_dollar.search(line) + while m_dollar: + line = p_dollar.sub(r"${\1}", line) + m_dollar = p_dollar.search(line) + pass line = p_arobas.sub(r"${\1}", line) # -- @@ -1119,7 +1139,7 @@ class CMakeFile(object): ) ''') self.files.append("static/header.html.in") - elif self.root[-len(mod):] == upmod and operator.contains(self.root, 'doc') or mod in ['kernel', 'gui', 'geom', 'med', 'smesh', 'visu', 'blsurfplugin'] and self.root[-len('tui'):] == 'tui' or operator.contains(self.root, 'doc') and mod in ['pyhello']: + elif self.root[-len(mod):] == upmod and operator.contains(self.root, 'doc') or mod in ['kernel', 'gui', 'geom', 'med', 'smesh', 'visu', 'blsurfplugin'] and self.root[-len('tui'):] == 'tui' or operator.contains(self.root, 'doc') and mod in ['pyhello', 'yacs']: newlines.append(r''' SET(top_builddir ${CMAKE_BINARY_DIR} @@ -1140,7 +1160,9 @@ class CMakeFile(object): ${datadir}/doc/salome ) ''') - if mod not in ['blsurfplugin']: + if mod in ['yacs']: + self.files.append("sources/header.html.in") + else: self.files.append("static/header.html.in") if mod in ['geom', 'smesh', 'visu','netgenplugin','blsurfplugin','hexoticplugin','ghs3dplugin',"ghs3dprlplugin"] and self.root[-len(mod):] == upmod: self.files.append("static/header_py.html.in") @@ -1152,13 +1174,6 @@ class CMakeFile(object): self.files.append("resources/SalomeApp.xml.in") pass pass - from os import path - if operator.contains(self.root, 'YACS_SRC'+path.sep+'doc'): - newlines.append(r''' - SET(srcdir - ${CMAKE_CURRENT_SOURCE_DIR} - ) - ''') if self.module == "jobmanager": key = "salomegui" @@ -1168,8 +1183,6 @@ class CMakeFile(object): pass for f in self.files: if f[-3:] == ".in": - if self.module == 'yacs' and f == "Doxyfile.in": - continue if f == "sstream.in": continue if f in ["runContainer.in", "stopContainer.in"]: @@ -1222,40 +1235,44 @@ class CMakeFile(object): from os import path if mod in ['geom', 'smesh', 'visu', 'netgenplugin','blsurfplugin','hexoticplugin','ghs3dplugin','ghs3dprlplugin','pyhello'] and self.root[-len(mod):] == upmod and operator.contains(self.root, 'doc') or mod in ['pyhello'] and operator.contains(self.root, 'doc'): ign = r"""'*usr_docs*', '*CMakeFiles*', '*.cmake', 'doxyfile*', '*.vcproj', 'static', 'Makefile*'""" - if mod in ['geom', 'smesh']: + if mod in ['geom']: if mod == 'geom': - tmp = 'geompy' + tmp = 'geomBuilder' input = "COMMAND ${DOXYGEN_EXECUTABLE} doxyfile_tui \n\t\t" - else: - tmp = 'smesh' - input = '' newlines.append(r""" IF(WINDOWS) STRING(REPLACE "/" "\\" f "%s") ELSE(WINDOWS) SET(f "%s") ENDIF(WINDOWS) - ADD_CUSTOM_TARGET(usr_docs ${PYTHON_EXECUTABLE} ${f} %s.py ${CMAKE_SOURCE_DIR}/src/%s_SWIG/%sDC.py %s + ADD_CUSTOM_TARGET(usr_docs ${PYTHON_EXECUTABLE} ${f} ${CMAKE_SOURCE_DIR}/src/%s_SWIG/%s.py %sCOMMAND ${DOXYGEN_EXECUTABLE} doxyfile_py COMMAND ${DOXYGEN_EXECUTABLE} doxyfile COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.remove(r'''%s.py''')" COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''%s''', True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}''', r'''%s''', ignore=shutil.ignore_patterns(%s)); shutil.copy(r'''%s''', r'''%s''')" VERBATIM WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - )"""%(prepare_generating_doc_src, prepare_generating_doc_src, tmp, upmod, tmp, tmp, input, tmp, doc_gui_destination, doc_gui_destination, ign, head_source, doc_gui_destination)) + )"""%(prepare_generating_doc_src, prepare_generating_doc_src, upmod, tmp, input, tmp, doc_gui_destination, doc_gui_destination, ign, head_source, doc_gui_destination)) newlines.append(r"""ADD_DEPENDENCIES(usr_docs html_docs)""") else: config_f = "" + extra_doc_dir = "" if mod in ['netgenplugin','blsurfplugin','hexoticplugin','ghs3dplugin', "ghs3dprlplugin"] : config_f = "${DOXYGEN_EXECUTABLE} doxyfile_py" + extra_doc_dir = "%spy_doc"%(mod) elif mod not in ['pyhello']: config_f = "${DOXYGEN_EXECUTABLE} doxyfile_idl" + if mod == 'visu': + extra_doc_dir = "%sgen_doc"%(mod) + inst_head_command = "" + if extra_doc_dir != "": + inst_head_command = "; shutil.copy(r'''%s''', r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/%s/%s''')"%(head_source, upmod, extra_doc_dir) newlines.append("""\t ADD_CUSTOM_TARGET(usr_docs %s COMMAND ${DOXYGEN_EXECUTABLE} doxyfile - COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''%s''',True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}''',r'''%s''', ignore=shutil.ignore_patterns(%s)); shutil.copy(r'''%s''',r'''%s''')" + COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''%s''',True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}''',r'''%s''', ignore=shutil.ignore_patterns(%s)); shutil.copy(r'''%s''',r'''%s''')%s" VERBATIM WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - )"""%(config_f, doc_gui_destination, doc_gui_destination, ign, head_source, doc_gui_destination)) + )"""%(config_f, doc_gui_destination, doc_gui_destination, ign, head_source, doc_gui_destination, inst_head_command)) elif mod in ['yacs', 'jobmanager'] and operator.contains(self.root, upmod + '_SRC'+path.sep+'doc'): from sys import platform params = ''; @@ -1296,7 +1313,7 @@ class CMakeFile(object): # -- upmod = self.module.upper() - if mod in ['kernel', 'gui', 'med', 'smesh', 'visu', 'blsurfplugin'] and self.root[-len('tui'):] == 'tui': + if ( mod in ['kernel', 'gui', 'med', 'smesh', 'visu', 'blsurfplugin'] and self.root[-len('tui'):] == 'tui' ) or ( mod in ['yacs'] and self.root[-len('doc'):] == 'doc' ): if mod == 'kernel': tmp = """\tADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE} -u COMMAND ${DOXYGEN_EXECUTABLE} @@ -1310,17 +1327,19 @@ class CMakeFile(object): tmp1= """\n COMMAND ${PYTHON_EXECUTABLE} -c "from shutil import copy; copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/smeshscreen.png''', r'''%s''')" """%(doc_tui_destination) else: tmp1="" - doc_source = "${CMAKE_CURRENT_BINARY_DIR}/%s"%(upmod) + if mod == 'yacs': + doc_source = "${CMAKE_CURRENT_BINARY_DIR}/htmldev" + else: + doc_source = "${CMAKE_CURRENT_BINARY_DIR}/%s"%(upmod) inst_head_command="" - if mod not in ['blsurfplugin']: - inst_head_command = "; shutil.copy(r'''%s''', r'''%s''')"%(head_source, doc_tui_destination) + inst_head_command = "; shutil.copy(r'''%s''', r'''%s''')"%(head_source, doc_tui_destination) newlines.append(tmp + """ COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''%s''', True); shutil.copytree(r'''%s''', r'''%s''')%s" """%(doc_tui_destination, doc_source, doc_tui_destination, inst_head_command) + tmp1 + """ VERBATIM WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )""") if mod == 'geom' and self.root[-len('tui'):] == 'tui': - tmp = 'geompy' + tmp = 'geomBuilder' doc_source = "${CMAKE_CURRENT_BINARY_DIR}/%s"%(upmod) newlines.append(r""" IF(WINDOWS) @@ -1328,13 +1347,13 @@ class CMakeFile(object): ELSE(WINDOWS) SET(f "%s") ENDIF(WINDOWS) - ADD_CUSTOM_TARGET(dev_docs ${PYTHON_EXECUTABLE} ${f} ${CMAKE_BINARY_DIR}/src/%s_SWIG/%s.py ${CMAKE_SOURCE_DIR}/src/%s_SWIG/%sDC.py %s + ADD_CUSTOM_TARGET(dev_docs ${PYTHON_EXECUTABLE} ${f} ${CMAKE_SOURCE_DIR}/src/%s_SWIG/%s.py COMMAND ${DOXYGEN_EXECUTABLE} doxyfile - COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.remove(r'''${CMAKE_BINARY_DIR}/src/%s_SWIG/%s.py''')" + COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.remove(r'''${CMAKE_CURRENT_BINARY_DIR}/%s.py''')" COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''%s''', True); shutil.copytree(r'''%s''', r'''%s'''); shutil.copy(r'''%s''', r'''%s'''); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/geomscreen.png''', r'''%s''')" VERBATIM WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - )"""%(prepare_generating_doc_src, prepare_generating_doc_src, upmod, tmp, upmod, tmp, tmp, upmod, tmp, doc_tui_destination, doc_source, doc_tui_destination, head_source, doc_tui_destination, doc_tui_destination)) + )"""%(prepare_generating_doc_src, prepare_generating_doc_src, upmod, tmp, tmp, doc_tui_destination, doc_source, doc_tui_destination, head_source, doc_tui_destination, doc_tui_destination)) # -- # convert the SUBDIRS in cmake grammar @@ -1761,6 +1780,7 @@ class CMakeFile(object): "sharedpkgpython_PYTHON" : "${salomepythondir}/shared_modules", "salomepypkg_PYTHON" : "${salomepypkgdir}", "mypkgpython_PYTHON" : "${mypkgpythondir}", + "stdpkgpython_PYTHON" : "${stdpkgpythondir}", "nodist_mypkgpython_PYTHON" : "${mypkgpythondir}", } if self.module == "jobmanager": @@ -1821,6 +1841,7 @@ class CMakeFile(object): ''') # -- newlines.append(r''' + STRING(REPLACE "-module" "" ${amname}_LDFLAGS "${${amname}_LDFLAGS}") SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${LDADD} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS}) FOREACH(lib SALOMEBasics SalomeBatch) IF(name STREQUAL lib) @@ -1968,6 +1989,11 @@ class CMakeFile(object): SET(vars ${vars} -ftemplate-depth-32) SET(vars ${vars} -fPIC) SET(vars ${vars} -g) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") # if platform is Windows 64 bit + IF(name STREQUAL _pilot) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # to avoid error C1128 + ENDIF(name STREQUAL _pilot) + ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") ENDIF(WINDOWS) SET(flags) FOREACH(f ${var})