Merge branch 'refs/heads/master' into review-CL-Bundler
This commit is contained in:
jriegel
@@ -1,85 +0,0 @@
|
||||
|
||||
lib_LTLIBRARIES=libFem.la Fem.la
|
||||
|
||||
BUILT_SOURCES=\
|
||||
FemMeshPy.cpp
|
||||
|
||||
libFem_la_BUILT=\
|
||||
FemMeshPy.h
|
||||
|
||||
libFem_la_SOURCES = \
|
||||
AppFemPy.cpp \
|
||||
FemMesh.cpp \
|
||||
FemMesh.h \
|
||||
FemMeshPyImp.cpp \
|
||||
FemMeshObject.cpp \
|
||||
FemMeshObject.h \
|
||||
FemMeshProperty.cpp \
|
||||
FemMeshProperty.h \
|
||||
HypothesisPy.cpp \
|
||||
HypothesisPy.h \
|
||||
PreCompiled.cpp \
|
||||
PreCompiled.h
|
||||
|
||||
%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py
|
||||
$(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $<
|
||||
|
||||
# the library search path.
|
||||
libFem_la_LDFLAGS = -L../../../Base -L../../../App -L$(OCC_LIB) \
|
||||
-L$(top_builddir)/src/Mod/Mesh/App -L$(top_builddir)/src/Mod/Part/App \
|
||||
-L$(top_builddir)/src/3rdParty/salomesmesh $(all_libraries) \
|
||||
-version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
|
||||
libFem_la_CPPFLAGS = -DFemAppExport=
|
||||
|
||||
libFem_la_LIBADD = \
|
||||
@BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \
|
||||
-l@PYTHON_LIB@ \
|
||||
-lxerces-c \
|
||||
-lFreeCADBase \
|
||||
-lFreeCADApp \
|
||||
-lPart \
|
||||
-lMesh \
|
||||
-lTKernel \
|
||||
-lTKG2d \
|
||||
-lTKG3d \
|
||||
-lTKMath \
|
||||
-lTKXSBase \
|
||||
-lTKBRep \
|
||||
-lTKTopAlgo \
|
||||
-lTKGeomAlgo \
|
||||
-lTKGeomBase \
|
||||
-lSMESH \
|
||||
-lSMESHDS \
|
||||
-lSMDS \
|
||||
-lStdMeshers
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
# Loader of libFem
|
||||
|
||||
Fem_la_SOURCES=\
|
||||
AppFem.cpp
|
||||
|
||||
# the library search path.
|
||||
Fem_la_LDFLAGS = $(libFem_la_LDFLAGS) -module -avoid-version
|
||||
Fem_la_CPPFLAGS = $(libFem_la_CPPFLAGS)
|
||||
|
||||
Fem_la_LIBADD = \
|
||||
$(libFem_la_LIBADD) \
|
||||
-lFem
|
||||
|
||||
Fem_la_DEPENDENCIES = libFem.la
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
|
||||
# set the include path found by configure
|
||||
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/3rdParty/salomesmesh/inc \
|
||||
$(all_includes) -I$(OCC_INC)
|
||||
|
||||
|
||||
libdir = $(prefix)/Mod/Fem
|
||||
|
||||
CLEANFILES = $(BUILT_SOURCES) $(libFem_la_BUILT)
|
||||
|
||||
EXTRA_DIST = \
|
||||
FemMeshPy.xml \
|
||||
CMakeLists.txt
|
||||
@@ -1,89 +0,0 @@
|
||||
SUBDIRS=Resources
|
||||
|
||||
lib_LTLIBRARIES=libFemGui.la FemGui.la
|
||||
|
||||
BUILT_SOURCES=\
|
||||
ui_Hypothesis.h \
|
||||
moc_Hypothesis.cpp
|
||||
|
||||
libFemGui_la_SOURCES=\
|
||||
AppFemGuiPy.cpp \
|
||||
Command.cpp \
|
||||
Hypothesis.cpp \
|
||||
Hypothesis.h \
|
||||
PreCompiled.cpp \
|
||||
PreCompiled.h \
|
||||
ViewProviderFemMesh.cpp \
|
||||
ViewProviderFemMesh.h \
|
||||
Workbench.cpp \
|
||||
Workbench.h
|
||||
|
||||
# the library search path.
|
||||
libFemGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App \
|
||||
-L$(top_builddir)/src/3rdParty/salomesmesh \
|
||||
$(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \
|
||||
$(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \
|
||||
$(QT_LIBS) $(GL_LIBS) $(all_libraries) \
|
||||
-version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
|
||||
libFemGui_la_CPPFLAGS = -DFemAppExport= -DFemGuiExport=
|
||||
|
||||
libFemGui_la_LIBADD = \
|
||||
@BOOST_SYSTEM_LIB@ \
|
||||
-l@PYTHON_LIB@ \
|
||||
-lxerces-c \
|
||||
-lFreeCADBase \
|
||||
-lFreeCADApp \
|
||||
-lFreeCADGui \
|
||||
-lSMESH \
|
||||
-lSMDS \
|
||||
-lFem
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
# Loader of libFemGui
|
||||
|
||||
FemGui_la_SOURCES=\
|
||||
AppFemGui.cpp
|
||||
|
||||
# the library search path.
|
||||
FemGui_la_LDFLAGS = $(libFemGui_la_LDFLAGS) -module -avoid-version
|
||||
FemGui_la_CPPFLAGS = $(libFemGui_la_CPPFLAGS)
|
||||
|
||||
FemGui_la_LIBADD = \
|
||||
$(libFemGui_la_LIBADD) \
|
||||
Resources/libResources.la \
|
||||
-lFemGui
|
||||
|
||||
FemGui_la_DEPENDENCIES = libFemGui.la
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
|
||||
# rule for Qt MetaObject Compiler:
|
||||
moc_%.cpp: %.h
|
||||
$(QT_MOC) $< -o $(@F)
|
||||
|
||||
# rule for Qt MetaObject Compiler:
|
||||
%.moc: %.h
|
||||
$(QT_MOC) $< -o $(@F)
|
||||
|
||||
# rules for Qt User Interface Compiler:
|
||||
ui_%.h: %.ui
|
||||
$(QT_UIC) $< -o $(@F)
|
||||
|
||||
# rules for Qt Resource Compiler:
|
||||
qrc_%.cpp: %.qrc
|
||||
$(QT_RCC) -name $(*F) $< -o $(@F)
|
||||
|
||||
# set the include path found by configure
|
||||
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(QT_CXXFLAGS) $(all_includes) \
|
||||
-I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) \
|
||||
-I$(OCC_INC) -I$(top_srcdir)/src/3rdParty/salomesmesh/inc
|
||||
|
||||
|
||||
libdir = $(prefix)/Mod/Fem
|
||||
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
||||
EXTRA_DIST = \
|
||||
CMakeLists.txt \
|
||||
Hypothesis.ui
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
noinst_LTLIBRARIES=libResources.la
|
||||
|
||||
BUILT_SOURCES=\
|
||||
qrc_Fem.cpp
|
||||
|
||||
nodist_libResources_la_SOURCES=\
|
||||
qrc_Fem.cpp
|
||||
|
||||
EXTRA_DIST = \
|
||||
icons/Fem_FemMesh.svg \
|
||||
translations/Fem_af.qm \
|
||||
translations/Fem_af.ts \
|
||||
translations/Fem_de.qm \
|
||||
translations/Fem_de.ts \
|
||||
translations/Fem_es-ES.qm \
|
||||
translations/Fem_es-ES.ts \
|
||||
translations/Fem_fi.qm \
|
||||
translations/Fem_fi.ts \
|
||||
translations/Fem_fr.qm \
|
||||
translations/Fem_fr.ts \
|
||||
translations/Fem_hr.qm \
|
||||
translations/Fem_hr.ts \
|
||||
translations/Fem_it.qm \
|
||||
translations/Fem_it.ts \
|
||||
translations/Fem_nl.qm \
|
||||
translations/Fem_nl.ts \
|
||||
translations/Fem_no.qm \
|
||||
translations/Fem_no.ts \
|
||||
translations/Fem_pl.qm \
|
||||
translations/Fem_pl.ts \
|
||||
translations/Fem_pt-BR.qm \
|
||||
translations/Fem_pt-BR.ts \
|
||||
translations/Fem_ru.qm \
|
||||
translations/Fem_ru.ts \
|
||||
translations/Fem_sv-SE.qm \
|
||||
translations/Fem_sv-SE.ts \
|
||||
translations/Fem_uk.qm \
|
||||
translations/Fem_uk.ts \
|
||||
translations/Fem_zh-CN.qm \
|
||||
translations/Fem_zh-CN.ts \
|
||||
translations/Fem_zh-TW.qm \
|
||||
translations/Fem_zh-TW.ts \
|
||||
translations/Fem_ro.qm \
|
||||
translations/Fem_ro.ts \
|
||||
translations/Fem_cs.qm \
|
||||
translations/Fem_cs.ts \
|
||||
translations/Fem_sk.qm \
|
||||
translations/Fem_sk.ts \
|
||||
translations/Fem_tr.qm \
|
||||
translations/Fem_tr.ts \
|
||||
translations/Fem_hu.qm \
|
||||
translations/Fem_hu.ts \
|
||||
translations/Fem_ja.qm \
|
||||
translations/Fem_ja.ts \
|
||||
Fem.qrc \
|
||||
UpdateResources.bat
|
||||
|
||||
|
||||
# rule for Qt MetaObject Compiler:
|
||||
moc_%.cpp: %.h
|
||||
$(QT_MOC) $< -o $(@F)
|
||||
|
||||
# rule for Qt MetaObject Compiler:
|
||||
%.moc: %.h
|
||||
$(QT_MOC) $< -o $(@F)
|
||||
|
||||
# rules for Qt Resource Compiler:
|
||||
qrc_%.cpp: %.qrc
|
||||
$(QT_RCC) -name $(*F) $< -o $(@F)
|
||||
|
||||
|
||||
# set the include path found by configure
|
||||
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(all_includes) $(QT_CXXFLAGS)
|
||||
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
SUBDIRS=App Gui
|
||||
|
||||
# Change data dir from default ($(prefix)/share) to $(prefix)
|
||||
datadir = $(prefix)/Mod/Fem
|
||||
|
||||
data_DATA = Init.py InitGui.py convert2TetGen.py FemExample.py
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(data_DATA) \
|
||||
CMakeLists.txt \
|
||||
fem.dox
|
||||
Reference in New Issue
Block a user