suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad

Browse Source
This commit is contained in:
jriegel 2012-09-08 11:22:34 +02:00
commit 90929ad832
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -1056,6 +1056,7 @@ src/Mod/Sandbox/App/Makefile
src/Mod/Sandbox/Gui/Makefile
src/Mod/Surfaces/Makefile
src/Mod/Ship/Makefile
src/Mod/OpenSCAD/Makefile
src/Tools/Makefile
src/Tools/_TEMPLATE_/Makefile
src/Tools/_TEMPLATE_/App/Makefile

5
src/CMakeLists.txt
View File

@ -16,14 +16,11 @@ if(FREECAD_BUILD_TEMPLATE)
add_subdirectory(Tools/_TEMPLATE_)
endif(FREECAD_BUILD_TEMPLATE)
if(FREECAD_MAINTAINERS_BUILD)
add_subdirectory(Doc)
endif(FREECAD_MAINTAINERS_BUILD)
add_subdirectory(Doc)
if(FREECAD_MAINTAINERS_BUILD AND WIN32)
#add_subdirectory(WindowsInstaller)
endif(FREECAD_MAINTAINERS_BUILD AND WIN32)
INSTALL(FILES Doc/Start_Page.html Doc/freecad.qhc Doc/freecad.qch
DESTINATION ${CMAKE_INSTALL_DOCDIR}
)

8
src/Doc/CMakeLists.txt
View File

@ -49,7 +49,7 @@ if(DOXYGEN_FOUND)
STRING(REGEX REPLACE ";" " " DOXYGEN_EXCLUDE_LIST "${DOXYGEN_EXCLUDE_DIR}")
SET(DOXYGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/Doc/SourceDocu)
SET(DOXYGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/doc/SourceDocu)
SET(DOXYGEN_IMAGE_PATH ${CMAKE_SOURCE_DIR}/src/Gui/Icons)
SET(DOXYGEN_LAYOUT_FILE ${CMAKE_SOURCE_DIR}/src/Doc/FreecadDoxygenLayout.xml)
@ -66,8 +66,8 @@ if(DOXYGEN_FOUND)
if( FREECAD_MAINTAINERS_BUILD )
ADD_CUSTOM_TARGET(SourceDocu
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
COMMAND ${QT_HELPCOMPILER_EXECUTABLE} "\"${CMAKE_BINARY_DIR}/Doc/SourceDocu/html/index.qhp\""
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/Doc/SourceDocu/html/index.qch ${CMAKE_BINARY_DIR}/Doc/FreeCADSource.qch
COMMAND ${QT_HELPCOMPILER_EXECUTABLE} "\"${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qhp\""
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/doc/SourceDocu/html/index.qch ${CMAKE_BINARY_DIR}/doc/FreeCADSource.qch
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
)
@ -77,7 +77,7 @@ if(DOXYGEN_FOUND)
${CMAKE_SOURCE_DIR}/src/Tools/wiki2qhelp.py
-c ${QT_HELPCOMPILER_EXECUTABLE}
-g ${QT_COLLECTIOMGENERATOR_EXECUTABLE}
-o ${CMAKE_BINARY_DIR}/Doc
-o ${CMAKE_BINARY_DIR}/doc
)
else( FREECAD_MAINTAINERS_BUILD )

5
src/Gui/Makefile.am
View File

@ -13,6 +13,7 @@ BUILT_SOURCES=\
moc_DlgCommandsImp.cpp \
moc_DlgCustomizeImp.cpp \
moc_DlgCustomizeSpaceball.cpp \
moc_DlgCustomizeSpNavSettings.cpp \
moc_DlgDisplayPropertiesImp.cpp \
moc_DlgEditorImp.cpp \
moc_DlgGeneralImp.cpp \
@ -84,6 +85,7 @@ BUILT_SOURCES=\
ui_DlgAuthorization.h \
ui_DlgChooseIcon.h \
ui_DlgCommands.h \
ui_DlgCustomizeSpNavSettings.h \
ui_DlgDisplayProperties.h \
ui_DlgEditor.h \
ui_DlgInputDialog.h \
@ -133,6 +135,7 @@ libFreeCADGui_la_UI=\
DlgAuthorization.ui \
DlgChooseIcon.ui \
DlgCommands.ui \
DlgCustomizeSpNavSettings.ui \
DlgDisplayProperties.ui \
DlgEditor.ui \
DlgGeneral.ui \
@ -208,6 +211,8 @@ libFreeCADGui_la_SOURCES=\
DlgCustomizeImp.h \
DlgCustomizeSpaceball.cpp \
DlgCustomizeSpaceball.h \
DlgCustomizeSpNavSettings.cpp \
DlgCustomizeSpNavSettings.h \
DlgDisplayPropertiesImp.cpp \
DlgDisplayPropertiesImp.h \
DlgEditorImp.cpp \

4
src/Mod/Makefile.am
View File

@ -1,5 +1,5 @@
#SUBDIRS=Part Mesh Points Raytracing Image Drawing Complete Draft Test TemplatePyMod
SUBDIRS=Points Complete Draft Test TemplatePyMod Web Start Idf Arch Surfaces Ship OpenSCAD
SUBDIRS=Points Complete Draft Test TemplatePyMod Web Start Idf
#if HAVE_OPENCV
SUBDIRS += Image
@ -10,7 +10,7 @@ SUBDIRS += Mesh
#endif
if HAVE_OPENCASCADE
SUBDIRS += Part Import PartDesign Raytracing Drawing
SUBDIRS += Part Import PartDesign Raytracing Drawing Arch Surfaces Ship OpenSCAD
endif
if HAVE_EIGEN3