From 0de89f6ca30e1f8b86627a26b9d6391566a827f9 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 7 Apr 2012 16:07:42 +0200 Subject: [PATCH] 0000658: Automake lacks option to build Mods: Assembly and Cam --- configure.ac | 32 +++++++++++++++++++++++++++++++- src/Mod/Makefile.am | 8 ++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0484ab274..6883a2f39 100644 --- a/configure.ac +++ b/configure.ac @@ -795,6 +795,26 @@ AC_ARG_ENABLE([sandbox], AM_CONDITIONAL(BUILD_SANDBOX, test x"$fc_set_sandbox" = xtrue) +AC_ARG_ENABLE([assembly], + AC_HELP_STRING([--enable-assembly], [Enable the build of the Assembly module (disabled by default)]), + [case $enableval in + no | false) fc_set_assembly=false ;; + *) fc_set_assembly=true ;; + esac], + [fc_set_assembly=false]) + +AM_CONDITIONAL(BUILD_ASSEMBLY, test x"$fc_set_assembly" = xtrue) + +AC_ARG_ENABLE([cam], + AC_HELP_STRING([--enable-cam], [Enable the build of the Cam module (disabled by default)]), + [case $enableval in + no | false) fc_set_cam=false ;; + *) fc_set_cam=true ;; + esac], + [fc_set_cam=false]) + +AM_CONDITIONAL(BUILD_CAM, test x"$fc_set_cam" = xtrue) + dnl Check if you want debug information enabled, or not dnl ************************************************************************** @@ -952,6 +972,13 @@ src/Main/Makefile src/Doc/Makefile src/Doc/BuildDevDoc.cfg src/Mod/Makefile +src/Mod/Assembly/App/Makefile +src/Mod/Assembly/Gui/Resources/Makefile +src/Mod/Assembly/Gui/Makefile +src/Mod/Assembly/Makefile +src/Mod/Cam/App/Makefile +src/Mod/Cam/Gui/Makefile +src/Mod/Cam/Makefile src/Mod/Part/Makefile src/Mod/Part/App/Makefile src/Mod/Part/Gui/Makefile @@ -1055,7 +1082,10 @@ AC_MSG_NOTICE([ RTTI enabled (forced): true Compiler warnings enabled: $fc_set_warn installation prefix: $prefix - + eneble-assembly: $fc_set_assembly + eneble-cam: $fc_set_cam + enable-sandbox: $fc_set_sandbox + eneble-template: $fc_set_template Now, run 'make' to build FreeCAD. ************************************************************************** diff --git a/src/Mod/Makefile.am b/src/Mod/Makefile.am index 7fe7c3973..bc7e873c5 100644 --- a/src/Mod/Makefile.am +++ b/src/Mod/Makefile.am @@ -31,10 +31,18 @@ SUBDIRS += ReverseEngineering MeshPart Fem Inspection endif #endif +if BUILD_ASSEMBLY +SUBDIRS += Assembly +endif + if BUILD_SANDBOX SUBDIRS += Sandbox endif +if BUILD_CAM +SUBDIRS += Cam +endif + EXTRA_DIST = \ __init__.py \ CMakeLists.txt \