"vtkImagingPythonD",
]
kernel_list = [
+ "CalciumC",
"DF",
"Launcher",
+ "LifeCycleCORBATest",
+ "NamingServiceTest",
"OpUtil",
"Registry",
"ResourcesManager",
"SALOMEBasics",
- "SalomeBatch",
"SalomeCatalog",
"SalomeCommunication",
"SalomeContainer",
+ "SalomeDatastream",
"SalomeDSCContainer",
"SalomeDSClient",
+ "SalomeDSCSupervBasic",
+ "SalomeDSCSuperv",
"SalomeDSImpl",
+ "SALOMEDSImplTest",
"SalomeDS",
+ "SALOMEDSTest",
"SalomeGenericObj",
"SalomeHDFPersist",
"SalomeIDLKernel",
"SalomeLauncher",
"SalomeLifeCycleCORBA",
"SALOMELocalTrace",
+ "SALOMELocalTraceTest",
"SalomeLoggerServer",
+ "SalomeMPIContainer",
"SalomeNotification",
"SalomeNS",
"SalomeResourcesManager",
+ "SalomeTestComponentEngine",
+ "SalomeTestMPIComponentEngine",
+ "SALOMETraceCollectorTest",
"TOOLSDS",
+ "UtilsTest",
"with_loggerTraceCollector",
]
gui_list = [
"LogWindow",
"ObjBrowser",
"OCCViewer",
+ "OpenGLUtils",
"Plot2d",
"PyConsole",
"PyInterp",
"qtx",
"QxScene",
"SalomeApp",
+ "SalomeAppTest",
"SalomeIDLGUI",
"SalomeObject",
"SalomePrs",
+ "SalomePyQtGUILight",
+ "SalomePyQtGUI",
+ "SalomePyQt",
+ "SalomePy",
"SalomeSession",
"SalomeStyle",
"SOCC",
"SUPERVGraph",
"SVTK",
"ToolsGUI",
+ "ViewerTools",
"VTKViewer",
]
geom_list = [
+ "AdvancedGUI",
"BasicGUI",
"BlocksGUI",
"BooleanGUI",
"MeasureGUI",
"NMTDS",
"NMTTools",
+ "OCC2VTK",
"OperationGUI",
"PrimitiveGUI",
"RepairGUI",
"STEPImport",
"STLExport",
"TransformationGUI",
+ "VTKExport",
]
med_list = [
- "InterpGeometric2DAlg",
- "interpkernelbases",
"interpkernel",
+ "InterpKernelTest",
"MEDClientcmodule",
+ "medcouplingclient",
+ "medcouplingcorba",
+ "medcouplingremapper",
"medcoupling",
"MEDEngine",
+ "medloader",
+ "MEDMEMCppTest",
"MEDMEMImpl",
"medmem",
"MED",
+ "medsplitter",
+ "MEDSPLITTERTest",
"med_V2_1",
"MEDWrapperBase",
"MEDWrapper",
"MEDWrapper_V2_1",
"MEDWrapper_V2_2",
+ "paramedcouplingcorba",
+ "paramedloader",
+ "paramedmemcompo",
+ "paramedmem",
+ "ParaMEDMEMTest",
"SalomeIDLMED",
+ "SalomeIDLMEDTests",
]
smesh_list = [
"GeomSelectionTools",
ENDIF(COMMAND cmake_policy)
""")
# --
+ newlines.append("""
+ ENABLE_TESTING()
+ """)
+ # --
if self.module == "kernel":
newlines.append("""
INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindPLATFORM.cmake)
INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake)
INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindDOXYGEN.cmake)
INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindMPI.cmake)
+ INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindLIBBATCH.cmake)
""")
pass
else:
INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake)
INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindDOXYGEN.cmake)
INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindMPI.cmake)
+ INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindLIBBATCH.cmake)
INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindKERNEL.cmake)
ELSE(KERNEL_ROOT_DIR)
INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindPLATFORM.cmake)
INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake)
INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindDOXYGEN.cmake)
INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindMPI.cmake)
+ INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindLIBBATCH.cmake)
INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindKERNEL.cmake)
""")
pass
INCLUDE(${CMAKE_SOURCE_DIR}/adm/cmake/FindGRAPHVIZ.cmake)
""")
pass
+ if self.module == "hxx2salome":
+ newlines.append("""
+ SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR})
+ INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMEDFILE.cmake)
+ INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMED.cmake)
+ """)
+ pass
pass
pass
# --
newlines.append("""
SET(WITH_LOCAL 1)
SET(WITH_BATCH 1)
- set(VERSION 5.1.4)
- set(XVERSION 0x050104)
SET(CALCIUM_IDL_INT_F77 long)
SET(CALCIUM_CORBA_INT_F77 CORBA::Long)
SET(LONG_OR_INT int)
SET(ENABLE_PYCONSOLE ON)
SET(ENABLE_SUPERVGRAPHVIEWER ON)
SET(ENABLE_QXGRAPHVIEWER ON)
- set(VERSION 5.1.4)
- set(XVERSION 0x050104)
+ """)
+ pass
+ elif self.module == "jobmanager":
+ newlines.append("""
+ IF(GUI_ROOT_DIR)
+ SET(HAS_GUI ON)
+ ENDIF(GUI_ROOT_DIR)
""")
pass
elif self.module == "geom":
ENDIF(GUI_ROOT_DIR)
""")
pass
+ elif self.module == "netgen":
+ newlines.append("""
+ SET(OCCFLAGS ${CAS_CPPFLAGS})
+ SET(OCCLIBS ${CAS_LDPATH})
+ SET(OCCLIBS ${OCCLIBS} ${TKernel} ${TKGeomBase} ${TKMath} ${TKG2d} ${TKG3d} ${TKXSBase} ${TKOffset} ${TKFillet} ${TKShHealing})
+ SET(OCCLIBS ${OCCLIBS} ${TKMesh} ${TKMeshVS} ${TKTopAlgo} ${TKGeomAlgo} ${TKBool} ${TKPrim} ${TKBO} ${TKIGES} ${TKBRep})
+ SET(OCCLIBS ${OCCLIBS} ${TKSTEPBase} ${TKSTEP} ${TKSTL} ${TKSTEPAttr} ${TKSTEP209} ${TKXDESTEP} ${TKXDEIGES} ${TKXCAF} ${TKLCAF} ${FWOSPlugin})
+ """)
+ pass
elif self.module == "netgenplugin":
newlines.append("""
IF(GUI_ROOT_DIR)
""")
pass
# --
+ newlines.append("""
+ set(VERSION 6.3.0)
+ set(XVERSION 0x060300)
+ """)
pass
# --
newlines.append("""
SET(AM_CPPFLAGS)
SET(AM_CXXFLAGS)
SET(LDADD)
+ SET(pythondir lib/python${PYTHON_VERSION}/site-packages)
+ SET(salomepythondir ${pythondir}/salome)
+ SET(salomepypkgdir ${salomepythondir}/salome)
""")
- if self.module == "kernel":
+ if self.module == "netgen":
+ newlines.append(r'''
+ SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DNO_PARALLEL_THREADS -DOCCGEOMETRY -I${CMAKE_BINARY_DIR} -I${CMAKE_CURRENT_SOURCE_DIR})
+ ''')
+ elif self.module == "kernel":
newlines.append(r'''
SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${CMAKE_BINARY_DIR}/salome_adm/unix -include SALOMEconfig.h)
SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${CMAKE_BINARY_DIR}/salome_adm/unix -include SALOMEconfig.h)
ENDIF(KERNEL_ROOT_DIR)
''')
pass
+ if self.module == "hxx2salome":
+ key = "_SRC"
+ if self.the_root[-len(key):] != key:
+ msg = "Source dir must finished with %s !"%(key)
+ raise Exception(msg)
+ hxxmodule = self.the_root[:-len(key)]
+ from os.path import basename
+ hxxmodule = basename(hxxmodule)
+ hxxmodule = hxxmodule.lower()
+ self.hxxmodule = hxxmodule
+ newlines.append(r'''
+ SET(HXXCPP_ROOT_DIR $ENV{%sCPP_ROOT_DIR})
+ SET(AM_CPPFLAGS ${AM_CPPFLAGS} -I${HXXCPP_ROOT_DIR}/include)
+ SET(AM_CXXFLAGS ${AM_CXXFLAGS} -I${HXXCPP_ROOT_DIR}/include)
+ SET(LDADD ${LDADD} -L${HXXCPP_ROOT_DIR}/lib)
+ '''%(hxxmodule.upper()))
+ pass
pass
# --
return
return
def finalize(self, newlines):
-
+
# --
# Convert the .in files in build dir
# --
+
+ import operator
+ mod = self.module
+ if mod in ['kernel', 'gui'] and self.root[-len('gui'):] == 'gui' or mod == 'med' and operator.contains(self.root, 'doxygen'):
+ newlines.append(r'''
+ SET(top_builddir
+ ${CMAKE_BINARY_DIR}
+ )
+ SET(top_srcdir
+ ${CMAKE_SOURCE_DIR}
+ )
+ SET(srcdir
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+ SET(builddir
+ ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ SET(datadir
+ ${CMAKE_INSTALL_PREFIX}/share
+ )
+ SET(docdir
+ ${datadir}/doc/salome
+ )
+ ''')
+ self.files.append("static/header.html.in")
+ elif self.root[-len(mod):] == mod.upper() and operator.contains(self.root, 'doc') or mod in ['kernel', 'gui', 'geom', 'med', 'smesh', 'visu'] and self.root[-len('tui'):] == 'tui':
+ newlines.append(r'''
+ SET(top_builddir
+ ${CMAKE_BINARY_DIR}
+ )
+ SET(top_srcdir
+ ${CMAKE_SOURCE_DIR}
+ )
+ SET(srcdir
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+ SET(builddir
+ ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ SET(datadir
+ ${CMAKE_INSTALL_PREFIX}/share
+ )
+ SET(docdir
+ ${datadir}/doc/salome
+ )
+ ''')
+ self.files.append("static/header.html.in")
if self.module == "yacs":
key = "salomegui"
if self.root[-len(key):] == key:
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"]:
''')
pass
pass
-
+
+ # --
+ # add commands for generating of user's documentation
+ # --
+
+ upmod = self.module.upper()
+ doc_gui_destination = "${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/%s"%(upmod)
+ doc_tui_destination = "${CMAKE_INSTALL_PREFIX}/share/doc/salome/tui/%s"%(upmod)
+ doc_destination = "${CMAKE_INSTALL_PREFIX}/share/doc/salome"
+ head_source = "${CMAKE_CURRENT_SOURCE_DIR}/images/head.png"
+ if mod == 'kernel':
+ copytree_src = "${CMAKE_SOURCE_DIR}/salome_adm/cmake_files"
+ else:
+ copytree_src = "$ENV{KERNEL_ROOT_DIR}/salome_adm/cmake_files"
+ str = "import re \nimport sys \noutfile = open(sys.argv[1], 'wb') \nfor line in open(sys.argv[2], 'rb').readlines():"
+ str += "\n if re.match('class '+sys.argv[3]+'DC', line): \n continue \n line = re.sub(r'^\s+\#', '#', line) \n line = re.sub(r'^\s+def', 'def', line) \n line = re.sub(sys.argv[3]+'DC', sys.argv[3], line)"
+ str += "\n outfile.write(line) \noutfile.close()"
+
+ if mod in ['kernel', 'gui'] and self.root[-len('gui'):] == 'gui' or mod == 'med' and operator.contains(self.root, 'doxygen'):
+ if mod == 'med':
+ doc_source = "${CMAKE_CURRENT_BINARY_DIR}/doc_ref_user/html"
+ input = "Doxyfile_med_user"
+ else:
+ doc_source = "${CMAKE_CURRENT_BINARY_DIR}/%s"%(upmod)
+ input = ""
+ newlines.append("""\t ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE} %s
+ COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; sys.path.append(r'''%s'''); shutil.rmtree(r'''%s''', True); import copytree1; copytree1.copytree(r'''%s''', r'''%s'''); shutil.copy(r'''%s''', r'''%s''')"
+ VERBATIM
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )"""%(input, copytree_src, doc_gui_destination, doc_source, doc_gui_destination, head_source, doc_gui_destination))
+
+ if mod in ['geom', 'smesh', 'visu'] and self.root[-len(mod):] == upmod and operator.contains(self.root, 'doc'):
+ ign = r"""'tempfile', '*usr_docs*', '*CMakeFiles*', '*.cmake', 'doxyfile*', '*.vcproj', 'static', 'Makefile*'"""
+ if mod in ['geom', 'smesh']:
+ if mod == 'geom':
+ tmp = 'geompy'
+ input = "COMMAND ${DOXYGEN_EXECUTABLE} doxyfile_tui \n\t\t"
+ else:
+ tmp = 'smesh'
+ input = ''
+ newlines.append(r"""
+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tempfile "%s")
+ ADD_CUSTOM_TARGET(usr_docs ${PYTHON_EXECUTABLE} tempfile ${CMAKE_BINARY_DIR}/src/%s_SWIG/%s.py ${CMAKE_SOURCE_DIR}/src/%s_SWIG/%sDC.py %s
+ %sCOMMAND ${DOXYGEN_EXECUTABLE} doxyfile_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 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}
+ )"""%(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
+ 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
+ # --
+
+ upmod = self.module.upper()
+ if mod in ['kernel', 'gui', 'med', 'smesh', 'visu'] and self.root[-len('tui'):] == 'tui':
+ if mod == 'kernel':
+ tmp = """\tADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE} -u
+ COMMAND ${DOXYGEN_EXECUTABLE}
+ COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.remove(r'''${CMAKE_CURRENT_BINARY_DIR}/doxyfile.bak''')" """
+ tmp1=""
+ else:
+ tmp = """\tADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE}"""
+ if mod == 'visu':
+ tmp1= r"""\n COMMAND ${PYTHON_EXECUTABLE} -c "from shutil import copy; copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/visuscreen.png''', r'''%s''')" """%(doc_tui_destination)
+ elif mod == 'smesh':
+ extra_srcdir = "${CMAKE_CURRENT_SOURCE_DIR}/extra"
+ tmp1= """\n COMMAND ${PYTHON_EXECUTABLE} -c "from shutil import copy; copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/smeshscreen.png''', r'''%s'''); copy(r'''%s/AddNetgenInSalome2.pdf''', r'''%s'''); copy(r'''%s/PluginMeshers.html''', r'''%s''')"
+ COMMAND ${PYTHON_EXECUTABLE} -c "from shutil import copy; copy(r'''%s/AddNetgenInSalome2.ps''', r'''%s'''); copy(r'''%s/AddNetgenInSalome2.sxw''', r'''%s''')" """%(doc_tui_destination, extra_srcdir,doc_destination, extra_srcdir,doc_destination, extra_srcdir,doc_destination,extra_srcdir,doc_destination)
+ else:
+ tmp1=""
+ doc_source = "${CMAKE_CURRENT_BINARY_DIR}/%s"%(upmod)
+ newlines.append(tmp + """
+ COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; sys.path.append(r'''%s'''); shutil.rmtree(r'''%s''', True); import copytree1; copytree1.copytree(r'''%s''', r'''%s'''); shutil.copy(r'''%s''', r'''%s''')" """%(copytree_src, doc_tui_destination, doc_source, doc_tui_destination, head_source, doc_tui_destination) + tmp1 + """
+ VERBATIM
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )""")
+ if mod == 'geom' and self.root[-len('tui'):] == 'tui':
+ tmp = 'geompy'
+ doc_source = "${CMAKE_CURRENT_BINARY_DIR}/%s"%(upmod)
+ newlines.append(r"""
+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tempfile "%s")
+ ADD_CUSTOM_TARGET(dev_docs ${PYTHON_EXECUTABLE} tempfile ${CMAKE_BINARY_DIR}/src/%s_SWIG/%s.py ${CMAKE_SOURCE_DIR}/src/%s_SWIG/%sDC.py %s
+ 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 shutil, sys; sys.path.append(r'''%s'''); shutil.rmtree(r'''%s''', True); import copytree1; copytree1.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}
+ )"""%(str, upmod, tmp, upmod, tmp, tmp, upmod, tmp, copytree_src, doc_tui_destination, doc_source, doc_tui_destination, head_source, doc_tui_destination, doc_tui_destination))
+
# --
# convert the SUBDIRS in cmake grammar
# --
pass
newlines.append('''
INSTALL(CODE "SET(IDL_FILE ${input})")
- INSTALL(CODE "SET(DIR lib/python${PYTHON_VERSION}/site-packages/salome)")
+ INSTALL(CODE "SET(DIR ${salomepythondir})")
+ IF(WINDOWS)
+ INSTALL(CODE "SET(DIR bin/salome)")
+ ENDIF(WINDOWS)
INSTALL(CODE "SET(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})")
INSTALL(CODE "SET(OMNIORB_IDL_PYTHON ${OMNIORB_IDL_PYTHON})")
# --
newlines.append('''
FOREACH(output ${MOC_FILES})
''')
- if self.module == "yacs":
+ if self.module in ["jobmanager", "yacs"]:
newlines.append('''
STRING(REGEX REPLACE _moc.cxx .hxx input ${output})
''')
ENDFOREACH(input ${SIP_FILES})
''')
pass
+
+ # --
+ # For make check
+ # --
+ for key in ["TESTS"]:
+ if self.__thedict__.has_key(key):
+ newlines.append('''
+ SET(UNIT_TEST_PROG ${%s})
+ '''%(key))
+ self.__thedict__["UNIT_TEST_PROG"] = self.__thedict__[key]
+ pass
+ pass
+ key = "UNIT_TEST_PROG"
+ if self.__thedict__.has_key(key):
+ newlines.append('''
+ FOREACH(input ${UNIT_TEST_PROG})
+ GET_FILENAME_COMPONENT(ext ${input} EXT)
+ IF(ext STREQUAL .py)
+ SET(test ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${input})
+ ELSE(ext STREQUAL .py)
+ IF(WINDOWS)
+ SET(test ${CMAKE_CURRENT_BINARY_DIR}/${input}_exe.exe)
+ ELSE()
+ SET(test ${CMAKE_CURRENT_BINARY_DIR}/${input}_exe)
+ ENDIF()
+ ENDIF(ext STREQUAL .py)
+ ADD_TEST(${input} ${test})
+ SET(fail_regex "KO")
+ SET_PROPERTY(TEST ${input} PROPERTY FAIL_REGULAR_EXPRESSION "${fail_regex}")
+ # IF(NOT WINDOWS)
+ # ADD_TEST(${input}_valgrind valgrind ${test})
+ # SET_PROPERTY(TEST ${input}_valgrind PROPERTY FAIL_REGULAR_EXPRESSION "${fail_regex}")
+ # SET_PROPERTY(TEST ${input}_valgrind PROPERTY PASS_REGULAR_EXPRESSION "no leaks are possible")
+ # ENDIF()
+ ENDFOREACH(input ${UNIT_TEST_PROG})
+ ''')
+ pass
# --
# Treat the install targets
# --
+ resdir = self.module
+ if resdir == "hxx2salome":
+ resdir = self.hxxmodule
+ pass
d = {
- "salomeadmux_DATA" : "salome_adm/unix",
- "dist_salomeadmux_DATA" : "salome_adm/unix",
- "dist_salome_cmake_DATA" : "salome_adm/cmake_files",
- "dist_salomem4_DATA" : "salome_adm/unix/config_files",
- "dist_salome4depr_DATA" : "salome_adm/unix/config_files/DEPRECATED",
- "dist_admlocalm4_DATA" : "adm_local/unix/config_files",
- "dist_admlocal_cmake_DATA" : "adm_local/cmake_files",
- "salomeinclude_DATA" : "include/salome",
- "salomeinclude_HEADERS" : "include/salome",
- "dist_salomeres_DATA" : "share/salome/resources/%s"%(self.module),
- "nodist_salomeres_DATA" : "share/salome/resources/%s"%(self.module),
- "nodist_salomeres_SCRIPTS" : "share/salome/resources/%s"%(self.module),
- "dist_salomescript_SCRIPTS" : "bin/salome",
- "dist_salomescript_DATA" : "bin/salome",
- "dist_salomescript_PYTHON" : "bin/salome",
- "nodist_salomescript_DATA" : "bin/salome",
- "salomepython_PYTHON" : "lib/python${PYTHON_VERSION}/site-packages/salome",
- "nodist_salomepython_PYTHON" : "lib/python${PYTHON_VERSION}/site-packages/salome",
- "dist_salomepython_DATA" : "lib/python${PYTHON_VERSION}/site-packages/salome",
- "sharedpkgpython_PYTHON" : "lib/python${PYTHON_VERSION}/site-packages/salome/shared_modules",
+ "salomeadmux_DATA" : "salome_adm/unix",
+ "dist_salomeadmux_DATA" : "salome_adm/unix",
+ "dist_salome_cmake_DATA" : "salome_adm/cmake_files",
+ "dist_salomem4_DATA" : "salome_adm/unix/config_files",
+ "dist_salome4depr_DATA" : "salome_adm/unix/config_files/DEPRECATED",
+ "dist_admlocalm4_DATA" : "adm_local/unix/config_files",
+ "dist_admlocal_cmake_DATA" : "adm_local/cmake_files",
+ "salomeinclude_DATA" : "include/salome",
+ "salomeinclude_HEADERS" : "include/salome",
+ "nodist_salomeinclude_HEADERS" : "include/salome",
+ "dist_salomeres_DATA" : "share/salome/resources/%s"%(resdir),
+ "nodist_salomeres_DATA" : "share/salome/resources/%s"%(resdir),
+ "nodist_salomeres_SCRIPTS" : "share/salome/resources/%s"%(resdir),
+ "dist_salomescript_SCRIPTS" : "bin/salome",
+ "dist_salomescript_DATA" : "bin/salome",
+ "dist_salomescript_PYTHON" : "bin/salome",
+ "nodist_salomescript_DATA" : "bin/salome",
+ "salomepython_PYTHON" : "${salomepythondir}",
+ "nodist_salomepython_PYTHON" : "${salomepythondir}",
+ "dist_salomepython_DATA" : "${salomepythondir}",
+ "sharedpkgpython_PYTHON" : "${salomepythondir}/shared_modules",
+ "salomepypkg_PYTHON" : "${salomepypkgdir}",
+ "mypkgpython_PYTHON" : "${mypkgpythondir}",
}
+ if self.module == "jobmanager":
+ d["bin_SCRIPTS"] = "bin"
+ pass
if self.module == "medfile":
d = {
"include_HEADERS" : "include",
"doc_DATA" : "${docdir}",
}
pass
+ if self.module == "netgen":
+ d = {
+ "include_HEADERS" : "include",
+ "noinst_HEADERS" : "share/netgen/include",
+ "dist_pkgdata_DATA" : "share/netgen",
+ "dist_doc_DATA" : "share/doc/netgen",
+ }
+ pass
for key, value in d.items():
if self.__thedict__.has_key(key):
self.addInstallTarget(key, value, newlines)
''')
# --
newlines.append(r'''
- SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS})
+ SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${LDADD} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS})
FOREACH(lib SALOMEBasics SalomeBatch)
IF(name STREQUAL lib)
SET(libs ${libs} ${PTHREAD_LIBS})
ENDIF(name STREQUAL lib)
ENDFOREACH(lib SALOMEBasics SalomeBatch)
''')
- if key == "bin_PROGRAMS":
- newlines.append(r'''
- SET(libs ${libs} ${LDADD})
- ''')
- pass
# --
newlines.append(r'''
FOREACH(lib ${libs})
SET(lib)
ENDIF(lib STREQUAL v)
ENDFOREACH(v ${vars})
+ SET(test OFF)
+ IF(lib)
+ STRING(REGEX MATCH "^-lQt" test ${lib})
+ ENDIF(lib)
+ IF(NOT test)
SET(libadd ${libadd} ${lib})
+ ENDIF(NOT test)
ENDFOREACH(lib ${libs})
TARGET_LINK_LIBRARIES(${name} ${libadd})
''')
SET(var ${var} ${AM_CPPFLAGS})
SET(var ${var} ${AM_CXXFLAGS})
''')
+ # --
+ newlines.append(r'''
+ IF(type STREQUAL STATIC)
+ SET(var ${var} -fPIC)
+ ENDIF(type STREQUAL STATIC)
+ ''')
+ # --
if self.module == "yacs":
newlines.append(r'''
SET(var ${var} -DYACS_PTHREAD)
SET(f)
ENDIF(f STREQUAL v)
ENDFOREACH(v ${vars})
+ IF(f)
+ string(REGEX MATCH "^-I" test_include ${f})
+ if(test_include)
+ string(REGEX REPLACE "^-I" "" include_dir ${f})
+ if(include_dir)
+ if(include_dir STREQUAL /usr/include)
+ else(include_dir STREQUAL /usr/include)
+ string(REGEX MATCH "^\\." test_dot ${include_dir})
+ if(test_dot)
+ set(include_dir ${CMAKE_CURRENT_BINARY_DIR}/${include_dir})
+ endif(test_dot)
+ include_directories(${include_dir})
+ endif(include_dir STREQUAL /usr/include)
+ endif(include_dir)
+ else(test_include)
SET(flags "${flags} ${f}")
+ endif(test_include)
+ ENDIF(f)
ENDFOREACH(f ${var})
SET_TARGET_PROPERTIES(${name} PROPERTIES COMPILE_FLAGS "${flags}")
''')
STRING(REPLACE ".f" ".c" src ${src})
SET(src ${CMAKE_CURRENT_BINARY_DIR}/${src})
SET(output ${src})
+ SET(cmd f2c)
+ IF(NOT WINDOWS)
+ IF(CMAKE_SIZEOF_VOID_P STREQUAL 8)
+ SET(cmd valgrind f2c) # f2c seems to be buggy on 64 bits ... but with valgrind, it works :)
+ ENDIF()
+ ENDIF(NOT WINDOWS)
ADD_CUSTOM_COMMAND(
OUTPUT ${output}
- COMMAND f2c ${input}
+ COMMAND ${cmd} ${input}
MAIN_DEPENDENCY ${input}
)
ELSE(src STREQUAL trte.f)
# --
self.setLibAdd(key, newlines)
# --
- if key != "noinst_LTLIBRARIES":
- if self.module == "medfile":
+ if 1: # key != "noinst_LTLIBRARIES":
+ newlines.append(r'''
+ SET(key %s)
+ '''%(key))
+ newlines.append(r'''
+ SET(test ON)
+ IF(${key} STREQUAL noinst_LTLIBRARIES)
+ SET(test OFF)
+ ENDIF(${key} STREQUAL noinst_LTLIBRARIES)
+ ''')
+ if self.module == "netgen" :
+ newlines.append(r'''
+ IF(${key} STREQUAL noinst_LTLIBRARIES)
+ IF(WINDOWS)
+ SET(test ON)
+ ENDIF(WINDOWS)
+ ENDIF(${key} STREQUAL noinst_LTLIBRARIES)
+ ''')
+ pass
+ newlines.append(r'''
+ IF(test)
+ ''')
+ if self.module in ["medfile", "netgen"]:
newlines.append(r'''
SET(DEST lib)
''')
''')
newlines.append(r'''
IF(WINDOWS)
- INSTALL(TARGETS ${name} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome)
+ INSTALL(TARGETS ${name} DESTINATION ${salomepythondir})
IF(CMAKE_BUILD_TYPE STREQUAL Release)
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome/${name}.dll DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.pyd)
+ INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/${salomepythondir}/${name}.dll DESTINATION ${salomepythondir} RENAME ${name}.pyd)
ELSE(CMAKE_BUILD_TYPE STREQUAL Release)
- INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome/${name}.dll DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}_d.pyd)
+ INSTALL(FILES ${CMAKE_INSTALL_PREFIX}/${salomepythondir}/${name}.dll DESTINATION ${salomepythondir} RENAME ${name}_d.pyd)
ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
ELSE(WINDOWS)
GET_TARGET_PROPERTY(version ${name} VERSION)
GET_TARGET_PROPERTY(soversion ${name} SOVERSION)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so.${version})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so.${soversion})
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION lib/python${PYTHON_VERSION}/site-packages/salome RENAME ${name}.so)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION ${salomepythondir} RENAME ${name}.so.${version})
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION ${salomepythondir} RENAME ${name}.so.${soversion})
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${name}.so.${version} DESTINATION ${salomepythondir} RENAME ${name}.so)
ENDIF(WINDOWS)
''')
newlines.append(r'''
ENDIF(BEGIN_WITH_lib)
''')
+ newlines.append(r'''
+ ENDIF(test)
+ ''')
pass
# --
newlines.append(r'''
# --
self.setLibAdd(key, newlines)
# --
- if self.module == "medfile":
+ if self.module in ["jobmanager", "medfile", "netgen"]:
newlines.append(r'''
SET(DEST bin)
''')
ELSE(f STREQUAL SALOME_ContainerPy.py)
IF(f STREQUAL am2cmake.py)
ELSE(f STREQUAL am2cmake.py)
+ IF(f STREQUAL copytree1.py)
+ ELSE(f STREQUAL copytree1.py)
INSTALL(SCRIPT ${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/install_and_compile_python_file.cmake)
+ ENDIF(f STREQUAL copytree1.py)
ENDIF(f STREQUAL am2cmake.py)
ENDIF(f STREQUAL SALOME_ContainerPy.py)
''')
from os import getcwd
the_root = getcwd()
#
+ nok = 0
+ #
from os import walk
for root, dirs, files in walk(the_root):
# --
from sys import stdout
for f in files:
if f in ["Makefile.am", "Makefile.am.cmake"]:
- stdout.write("Scanning %s %s ..."%(root, f))
- stdout.flush()
convertAmFile(the_root, root, dirs, files, f, module)
- stdout.write(" done.\n")
+ nok += 1
pass
pass
pass
#
+ if nok:
+ if nok == 1:
+ msg = "%s file has been converted to cmake"%(nok)
+ else:
+ msg = "%s files have been converted to cmake"%(nok)
+ pass
+ stdout.write(msg)
+ stdout.write("\n")
+ stdout.flush()
+ pass
pass