diff --git a/src/3rdParty/CMakeLists.txt b/src/3rdParty/CMakeLists.txt
index 1804280f4..569f6eb02 100644
--- a/src/3rdParty/CMakeLists.txt
+++ b/src/3rdParty/CMakeLists.txt
@@ -1,21 +1,21 @@
 
-if(FREECAD_BUILD_CAM)
+if(BUILD_CAM)
     add_subdirectory(ANN)
-endif(FREECAD_BUILD_CAM)
+endif(BUILD_CAM)
 
-if(FREECAD_BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
+if(BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
     if(FREECAD_LIBPACK_CHECKFILE6X)
         add_subdirectory(Pivy)
     elseif(FREECAD_LIBPACK_CHECKFILE7X)
         add_subdirectory(Pivy-0.5)
-#elseif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKCUSTOM)
+#elseif(BUILD_GUI AND FREECAD_LIBPACK_CHECKCUSTOM)
 #   find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
 #   if (COIN_VERSION3)
 #   add_subdirectory(Pivy-0.5)
 #   else (COIN_VERSION3)
 #   add_subdirectory(Pivy)
 #   endif(COIN_VERSION3)
-#endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
+#endif(BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
 #if (MINGW)
 #   add_subdirectory(Pivy)
 #endif(MINGW)
@@ -32,10 +32,10 @@ if(FREECAD_BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
         endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Pivy)
         endif(COIN_VERSION3)
     endif (FREECAD_LIBPACK_CHECKFILE6X)
-endif(FREECAD_BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
+endif(BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY)
 
 # Build SalomeMesh for all Platforms since heavily patched
-if (FREECAD_BUILD_SMESH)
+if (BUILD_SMESH)
     add_subdirectory(salomesmesh)
-endif(FREECAD_BUILD_SMESH)
+endif(BUILD_SMESH)
 
diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt
index a07903f8c..afdf3abd7 100644
--- a/src/3rdParty/salomesmesh/CMakeLists.txt
+++ b/src/3rdParty/salomesmesh/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
 link_directories(${OCC_LIBRARY_DIR})
 
 if(MSVC)
-	if(FREECAD_BUILD_FEM_NETGEN)
+	if(BUILD_FEM_NETGEN)
 		set(SMESH_LIBS
 			debug     MSVCRTD.LIB
 			debug     MSVCPRTD.LIB
@@ -41,7 +41,7 @@ if(MSVC)
 			${OCC_OCAF_DEBUG_LIBRARIES}
 			${OCC_OCAF_LIBRARIES}
 		)
-	else(FREECAD_BUILD_FEM_NETGEN)
+	else(BUILD_FEM_NETGEN)
 		set(SMESH_LIBS
 			debug     MSVCRTD.LIB
 			debug     MSVCPRTD.LIB
@@ -53,21 +53,21 @@ if(MSVC)
 			${OCC_OCAF_DEBUG_LIBRARIES}
 			${OCC_OCAF_LIBRARIES}
 		)
-	endif(FREECAD_BUILD_FEM_NETGEN)
+	endif(BUILD_FEM_NETGEN)
 	
 else(MSVC)
-    if(FREECAD_BUILD_FEM_NETGEN)
+    if(BUILD_FEM_NETGEN)
         set(SMESH_LIBS
             ${NGLIB_LIBRARIES}
             ${OCC_LIBRARIES}
             ${OCC_OCAF_LIBRARIES}
         )
-    else(FREECAD_BUILD_FEM_NETGEN)
+    else(BUILD_FEM_NETGEN)
         set(SMESH_LIBS
             ${OCC_LIBRARIES}
             ${OCC_OCAF_LIBRARIES}
         )
-    endif(FREECAD_BUILD_FEM_NETGEN)
+    endif(BUILD_FEM_NETGEN)
 endif(MSVC)
 
 
@@ -337,7 +337,7 @@ endif(WIN32)
 #ENDIF(MINGW)
 
 # Disable for all other compilers but MSVC
-if (FREECAD_BUILD_FEM_NETGEN)
+if (BUILD_FEM_NETGEN)
 
 ################
 # NETGENPlugin #
@@ -351,7 +351,7 @@ if(WIN32)
     set_target_properties(NETGENPlugin PROPERTIES COMPILE_FLAGS "-DNETGENPLUGIN_EXPORTS -DNO_PARALLEL_THREADS -DOCCGEOMETRY -DNETGEN_V5")
 endif(WIN32)
 
-endif (FREECAD_BUILD_FEM_NETGEN)
+endif (BUILD_FEM_NETGEN)
 
 #IF(WIN32)
 #  SET_TARGET_PROPERTIES(SMESH PROPERTIES COMPILE_FLAGS "-DNETGENPluginimpl_EXPORTS ")
@@ -372,7 +372,7 @@ else(WIN32)
     )
 endif(WIN32)
 
-if (FREECAD_BUILD_FEM_NETGEN)
+if (BUILD_FEM_NETGEN)
     if(WIN32)
         INSTALL(TARGETS NETGENPlugin
             RUNTIME DESTINATION bin
@@ -383,5 +383,5 @@ if (FREECAD_BUILD_FEM_NETGEN)
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         )
     endif(WIN32)
-endif (FREECAD_BUILD_FEM_NETGEN)
+endif (BUILD_FEM_NETGEN)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 555abac59..aed73e059 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,16 +5,16 @@ add_subdirectory(Base)
 add_subdirectory(App)
 add_subdirectory(Main)
 add_subdirectory(Mod)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
 	add_subdirectory(Gui)
 	configure_file(Doc/Start_Page.html ${CMAKE_BINARY_DIR}/doc/Start_Page.html COPYONLY)
 	configure_file(Doc/freecad.qhc ${CMAKE_BINARY_DIR}/doc/freecad.qhc COPYONLY)
 	configure_file(Doc/freecad.qch ${CMAKE_BINARY_DIR}/doc/freecad.qch COPYONLY)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
-if(FREECAD_BUILD_TEMPLATE)
+if(BUILD_TEMPLATE)
 	add_subdirectory(Tools/_TEMPLATE_)
-endif(FREECAD_BUILD_TEMPLATE)
+endif(BUILD_TEMPLATE)
 
 add_subdirectory(Doc)
 
diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt
index fe0774624..a3dec2a45 100644
--- a/src/Doc/CMakeLists.txt
+++ b/src/Doc/CMakeLists.txt
@@ -12,9 +12,9 @@ if(DOXYGEN_FOUND)
     MARK_AS_ADVANCED(DOXYGEN_LANGUAGE)
 
 # note: this test is obsolete if DevDoc target is used
-    if (NOT FREECAD_BUILD_GUI)
+    if (NOT BUILD_GUI)
         message("Note: Gui is not built. Documentation may lack some parts.")
-    endif (NOT FREECAD_BUILD_GUI)
+    endif (NOT BUILD_GUI)
 
     # directory order seems important for correct macro expansion
     # (files containing macros definitions must be parsed before the files using them)
@@ -97,7 +97,7 @@ if(DOXYGEN_FOUND)
         # generate source documentation
         # delete CMakeCache to reset to default build options next time 
         ADD_CUSTOM_TARGET(DevDoc
-            ${CMAKE_COMMAND} -D FREECAD_BUILD_GUI:BOOL=ON -D FREECAD_BUILD_FEM:BOOL=ON ${CMAKE_SOURCE_DIR}
+            ${CMAKE_COMMAND} -D BUILD_GUI:BOOL=ON -D BUILD_FEM:BOOL=ON ${CMAKE_SOURCE_DIR}
             COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/BuildDevDoc.cfg
             COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_BINARY_DIR}/CMakeCache.txt
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 0078b2e0b..bb85cd371 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -1,7 +1,7 @@
 #add_defintions(-D_FC_GUI_ENABLED_)
 #add_defintions(-DFREECADMAINPY)
 
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     include_directories(
         ${Boost_INCLUDE_DIRS}
         ${COIN3D_INCLUDE_DIR}
@@ -11,7 +11,7 @@ if(FREECAD_BUILD_GUI)
         ${PYTHON_INCLUDE_PATH}
         ${XERCESC_INCLUDE_DIR}
     )
-else(FREECAD_BUILD_GUI)
+else(BUILD_GUI)
     include_directories(
         ${Boost_INCLUDE_DIRS}
         ${ZLIB_INCLUDE_DIR}
@@ -19,10 +19,10 @@ else(FREECAD_BUILD_GUI)
         ${PYTHON_INCLUDE_PATH}
         ${XERCESC_INCLUDE_DIR}
     )
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 ######################## FreeCADMain ########################
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
 
     SET(FreeCAD_SRCS
         freecad.rc
@@ -57,7 +57,7 @@ if(FREECAD_BUILD_GUI)
             RUNTIME DESTINATION bin
         )
     endif(WIN32)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 ######################## FreeCADMainCmd ########################
 
 SET(FreeCADMainCmd_SRCS
@@ -109,7 +109,7 @@ else(WIN32)
 endif(WIN32)
 
 ######################## FreeCADGuiPy ########################
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
 
     SET(FreeCADGuiPy_SRCS
         FreeCADGuiPy.cpp
@@ -138,4 +138,4 @@ if(FREECAD_BUILD_GUI)
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         )
     endif(WIN32)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
diff --git a/src/Mod/Assembly/CMakeLists.txt b/src/Mod/Assembly/CMakeLists.txt
index d586e7ae3..ff46393cc 100644
--- a/src/Mod/Assembly/CMakeLists.txt
+++ b/src/Mod/Assembly/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/CMakeLists.txt b/src/Mod/CMakeLists.txt
index 72becca9b..4f0511843 100644
--- a/src/Mod/CMakeLists.txt
+++ b/src/Mod/CMakeLists.txt
@@ -1,127 +1,127 @@
 
-if(FREECAD_BUILD_POINTS)
+if(BUILD_POINTS)
   add_subdirectory(Points)
-endif(FREECAD_BUILD_POINTS)
+endif(BUILD_POINTS)
 
-if(FREECAD_BUILD_COMPLETE)
+if(BUILD_COMPLETE)
   add_subdirectory(Complete)
-endif(FREECAD_BUILD_COMPLETE)
+endif(BUILD_COMPLETE)
 
-if(FREECAD_BUILD_TEST)
+if(BUILD_TEST)
   add_subdirectory(Test)
-endif(FREECAD_BUILD_TEST)
+endif(BUILD_TEST)
 
 #add_subdirectory(TemplatePyMod)
 
-if(FREECAD_BUILD_IMAGE)
+if(BUILD_IMAGE)
   add_subdirectory(Image)
-endif(FREECAD_BUILD_IMAGE)
+endif(BUILD_IMAGE)
 
-if(FREECAD_BUILD_MESH)
+if(BUILD_MESH)
   add_subdirectory(Mesh)
-endif(FREECAD_BUILD_MESH)
+endif(BUILD_MESH)
 
-if(FREECAD_BUILD_PART)
+if(BUILD_PART)
   add_subdirectory(Part)
-endif(FREECAD_BUILD_PART)
+endif(BUILD_PART)
 
-if(FREECAD_BUILD_MATERIAL)
+if(BUILD_MATERIAL)
   add_subdirectory(Material)
-endif(FREECAD_BUILD_MATERIAL)
+endif(BUILD_MATERIAL)
 
-if(FREECAD_BUILD_PART_DESIGN)
+if(BUILD_PART_DESIGN)
   add_subdirectory(PartDesign)
-endif(FREECAD_BUILD_PART_DESIGN)
+endif(BUILD_PART_DESIGN)
 
-if(FREECAD_BUILD_RAYTRACING)
+if(BUILD_RAYTRACING)
   add_subdirectory(Raytracing)
-endif(FREECAD_BUILD_RAYTRACING)
+endif(BUILD_RAYTRACING)
 
-if(FREECAD_BUILD_DRAWING)
+if(BUILD_DRAWING)
   add_subdirectory(Drawing)
-endif(FREECAD_BUILD_DRAWING)
+endif(BUILD_DRAWING)
 
 IF(EIGEN3_FOUND)
-    if(FREECAD_BUILD_SKETCHER)
+    if(BUILD_SKETCHER)
       add_subdirectory(Sketcher)
-    endif(FREECAD_BUILD_SKETCHER)
+    endif(BUILD_SKETCHER)
     
-    if(FREECAD_BUILD_ROBOT)
+    if(BUILD_ROBOT)
       add_subdirectory(Robot)
-    endif(FREECAD_BUILD_ROBOT)
+    endif(BUILD_ROBOT)
 ELSE(EIGEN3_FOUND)
     MESSAGE("Due to the missing Eigen3 library the Sketcher module won't be built")
     MESSAGE("Due to the missing Eigen3 library the Robot module won't be built")
 ENDIF(EIGEN3_FOUND)
 
-if(FREECAD_BUILD_REVERSEENGINEERING)
+if(BUILD_REVERSEENGINEERING)
   add_subdirectory(ReverseEngineering)
-endif(FREECAD_BUILD_REVERSEENGINEERING)
+endif(BUILD_REVERSEENGINEERING)
 
-if(FREECAD_BUILD_MESH_PART)
+if(BUILD_MESH_PART)
   add_subdirectory(MeshPart)
-endif(FREECAD_BUILD_MESH_PART)
+endif(BUILD_MESH_PART)
 
-if(FREECAD_BUILD_DRAFT)
+if(BUILD_DRAFT)
   add_subdirectory(Draft)
-endif(FREECAD_BUILD_DRAFT)
+endif(BUILD_DRAFT)
 
-if(FREECAD_BUILD_WEB)
+if(BUILD_WEB)
   add_subdirectory(Web)
-endif(FREECAD_BUILD_WEB)
+endif(BUILD_WEB)
 
-if(FREECAD_BUILD_START)
+if(BUILD_START)
   add_subdirectory(Start)
-endif(FREECAD_BUILD_START)
+endif(BUILD_START)
 
-if(FREECAD_BUILD_IDF)
+if(BUILD_IDF)
   add_subdirectory(Idf)
-endif(FREECAD_BUILD_IDF)
+endif(BUILD_IDF)
 
-if(FREECAD_BUILD_IMPORT)
+if(BUILD_IMPORT)
   add_subdirectory(Import)
-endif(FREECAD_BUILD_IMPORT)
+endif(BUILD_IMPORT)
 
-if(FREECAD_BUILD_INSPECTION)
+if(BUILD_INSPECTION)
   add_subdirectory(Inspection)
-endif(FREECAD_BUILD_INSPECTION)
+endif(BUILD_INSPECTION)
 
-if(FREECAD_BUILD_ARCH)
+if(BUILD_ARCH)
   add_subdirectory(Arch)
-endif(FREECAD_BUILD_ARCH)
+endif(BUILD_ARCH)
 
-if(FREECAD_BUILD_ASSEMBLY)
+if(BUILD_ASSEMBLY)
   add_subdirectory(Assembly)
-endif(FREECAD_BUILD_ASSEMBLY)
+endif(BUILD_ASSEMBLY)
 
-if(FREECAD_BUILD_CAM)
+if(BUILD_CAM)
     add_subdirectory(Cam)
-endif(FREECAD_BUILD_CAM)
+endif(BUILD_CAM)
 
-if(FREECAD_BUILD_FEM)
+if(BUILD_FEM)
     add_subdirectory(Fem)
-endif(FREECAD_BUILD_FEM)
+endif(BUILD_FEM)
 
-if(FREECAD_BUILD_SANDBOX)
+if(BUILD_SANDBOX)
     add_subdirectory(Sandbox)
-endif(FREECAD_BUILD_SANDBOX)
+endif(BUILD_SANDBOX)
 
-if(FREECAD_BUILD_SHIP)
+if(BUILD_SHIP)
   add_subdirectory(Ship)
-endif(FREECAD_BUILD_SHIP)
+endif(BUILD_SHIP)
 
-if(FREECAD_BUILD_OPENSCAD)
+if(BUILD_OPENSCAD)
   add_subdirectory(OpenSCAD)
-endif(FREECAD_BUILD_OPENSCAD)
+endif(BUILD_OPENSCAD)
 
-if(FREECAD_BUILD_PLOT)
+if(BUILD_PLOT)
   add_subdirectory(Plot)
-endif(FREECAD_BUILD_PLOT)
+endif(BUILD_PLOT)
 
-if(FREECAD_BUILD_SPREADSHEET)
+if(BUILD_SPREADSHEET)
   add_subdirectory(Spreadsheet)
-endif(FREECAD_BUILD_SPREADSHEET)
+endif(BUILD_SPREADSHEET)
 
-if(FREECAD_BUILD_JTREADER)
+if(BUILD_JTREADER)
   add_subdirectory(JtReader)
-endif(FREECAD_BUILD_JTREADER)
+endif(BUILD_JTREADER)
diff --git a/src/Mod/Cam/CMakeLists.txt b/src/Mod/Cam/CMakeLists.txt
index c04cfbdb0..fac0a1a32 100644
--- a/src/Mod/Cam/CMakeLists.txt
+++ b/src/Mod/Cam/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Complete/CMakeLists.txt b/src/Mod/Complete/CMakeLists.txt
index 1d74f0afa..e553da149 100644
--- a/src/Mod/Complete/CMakeLists.txt
+++ b/src/Mod/Complete/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Drawing/CMakeLists.txt b/src/Mod/Drawing/CMakeLists.txt
index 23d46b5fa..ee0b8e2e2 100644
--- a/src/Mod/Drawing/CMakeLists.txt
+++ b/src/Mod/Drawing/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
index 923ca32c8..08bc96ccb 100755
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -4,9 +4,9 @@ else(MSVC)
     add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)
 
-if(FREECAD_BUILD_FEM_NETGEN)
+if(BUILD_FEM_NETGEN)
     add_definitions(-DFCWithNetgen)
-endif(FREECAD_BUILD_FEM_NETGEN)
+endif(BUILD_FEM_NETGEN)
 
 
 include_directories(
@@ -27,7 +27,7 @@ include_directories(
 link_directories(${OCC_LIBRARY_DIR})
 
 
-if(FREECAD_BUILD_FEM_NETGEN)
+if(BUILD_FEM_NETGEN)
     set(Fem_LIBS
         Part
         FreeCADApp
@@ -35,14 +35,14 @@ if(FREECAD_BUILD_FEM_NETGEN)
         NETGENPlugin
         SMESH
     )
-else(FREECAD_BUILD_FEM_NETGEN)
+else(BUILD_FEM_NETGEN)
     set(Fem_LIBS
         Part
         FreeCADApp
         StdMeshers
         SMESH
     )
-endif(FREECAD_BUILD_FEM_NETGEN)
+endif(BUILD_FEM_NETGEN)
 
 generate_from_xml(FemMeshPy)
 
diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt
index 8cd9b186c..93697eab5 100755
--- a/src/Mod/Fem/CMakeLists.txt
+++ b/src/Mod/Fem/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 
 INSTALL(
diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt
index 35d93abe5..7444599b5 100755
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -4,9 +4,9 @@ else(MSVC)
     add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)
 
-if(FREECAD_BUILD_FEM_NETGEN)
+if(BUILD_FEM_NETGEN)
     add_definitions(-DFCWithNetgen)
-endif(FREECAD_BUILD_FEM_NETGEN)
+endif(BUILD_FEM_NETGEN)
 
 include_directories(
     ${CMAKE_BINARY_DIR}
diff --git a/src/Mod/Image/CMakeLists.txt b/src/Mod/Image/CMakeLists.txt
index 1aff16719..2735cbb6b 100644
--- a/src/Mod/Image/CMakeLists.txt
+++ b/src/Mod/Image/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Import/CMakeLists.txt b/src/Mod/Import/CMakeLists.txt
index c5d848810..578a86d0f 100644
--- a/src/Mod/Import/CMakeLists.txt
+++ b/src/Mod/Import/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Inspection/CMakeLists.txt b/src/Mod/Inspection/CMakeLists.txt
index 8e0f1c8e8..15398581a 100644
--- a/src/Mod/Inspection/CMakeLists.txt
+++ b/src/Mod/Inspection/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Mesh/CMakeLists.txt b/src/Mod/Mesh/CMakeLists.txt
index 67bd20a68..7283a44c8 100644
--- a/src/Mod/Mesh/CMakeLists.txt
+++ b/src/Mod/Mesh/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt
index cc8e92be5..48b3c4a0b 100644
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -4,13 +4,13 @@ else(MSVC)
     add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)
 
-if (FREECAD_BUILD_SMESH)
+if (BUILD_SMESH)
     add_definitions(-DHAVE_SMESH -DHAVE_MEFISTO)
-endif(FREECAD_BUILD_SMESH)
+endif(BUILD_SMESH)
 
-if(FREECAD_BUILD_FEM_NETGEN)
+if(BUILD_FEM_NETGEN)
     add_definitions(-DHAVE_NETGEN)
-endif(FREECAD_BUILD_FEM_NETGEN)
+endif(BUILD_FEM_NETGEN)
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/src
@@ -27,7 +27,7 @@ include_directories(
 link_directories(${OCC_LIBRARY_DIR})
 
 
-if(FREECAD_BUILD_FEM_NETGEN)
+if(BUILD_FEM_NETGEN)
     set(MeshPart_LIBS
         Part
         Mesh
@@ -35,14 +35,14 @@ if(FREECAD_BUILD_FEM_NETGEN)
         NETGENPlugin
         SMESH
     )
-else(FREECAD_BUILD_FEM_NETGEN)
+else(BUILD_FEM_NETGEN)
     set(MeshPart_LIBS
         Part
         Mesh
         StdMeshers
         SMESH
     )
-endif(FREECAD_BUILD_FEM_NETGEN)
+endif(BUILD_FEM_NETGEN)
 
 
 SET(MeshPart_SRCS
diff --git a/src/Mod/MeshPart/CMakeLists.txt b/src/Mod/MeshPart/CMakeLists.txt
index 70b320b0c..60e74bf07 100644
--- a/src/Mod/MeshPart/CMakeLists.txt
+++ b/src/Mod/MeshPart/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt
index 4a7363fa2..1a87ae2b2 100644
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -4,13 +4,13 @@ else(MSVC)
     add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)
 
-if (FREECAD_BUILD_SMESH)
+if (BUILD_SMESH)
     add_definitions(-DHAVE_SMESH -DHAVE_MEFISTO)
-endif(FREECAD_BUILD_SMESH)
+endif(BUILD_SMESH)
 
-if(FREECAD_BUILD_FEM_NETGEN)
+if(BUILD_FEM_NETGEN)
     add_definitions(-DHAVE_NETGEN)
-endif(FREECAD_BUILD_FEM_NETGEN)
+endif(BUILD_FEM_NETGEN)
 
 include_directories(
     ${CMAKE_BINARY_DIR}
diff --git a/src/Mod/Part/CMakeLists.txt b/src/Mod/Part/CMakeLists.txt
index 06ebf2ce6..958502f5a 100644
--- a/src/Mod/Part/CMakeLists.txt
+++ b/src/Mod/Part/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/PartDesign/CMakeLists.txt b/src/Mod/PartDesign/CMakeLists.txt
index 526755f72..44b920041 100644
--- a/src/Mod/PartDesign/CMakeLists.txt
+++ b/src/Mod/PartDesign/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Points/CMakeLists.txt b/src/Mod/Points/CMakeLists.txt
index ddc7da06b..4b1d1edcd 100644
--- a/src/Mod/Points/CMakeLists.txt
+++ b/src/Mod/Points/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Raytracing/CMakeLists.txt b/src/Mod/Raytracing/CMakeLists.txt
index 28ab1741b..f1c7ae03f 100644
--- a/src/Mod/Raytracing/CMakeLists.txt
+++ b/src/Mod/Raytracing/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/ReverseEngineering/CMakeLists.txt b/src/Mod/ReverseEngineering/CMakeLists.txt
index 85256fe05..191653efc 100644
--- a/src/Mod/ReverseEngineering/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Robot/CMakeLists.txt b/src/Mod/Robot/CMakeLists.txt
index 750eb19bf..fa7cea7db 100644
--- a/src/Mod/Robot/CMakeLists.txt
+++ b/src/Mod/Robot/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Sandbox/CMakeLists.txt b/src/Mod/Sandbox/CMakeLists.txt
index 3e476d5ae..ba183437b 100644
--- a/src/Mod/Sandbox/CMakeLists.txt
+++ b/src/Mod/Sandbox/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
 	add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Sketcher/CMakeLists.txt b/src/Mod/Sketcher/CMakeLists.txt
index 33dcaae19..9250a2a68 100644
--- a/src/Mod/Sketcher/CMakeLists.txt
+++ b/src/Mod/Sketcher/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Start/CMakeLists.txt b/src/Mod/Start/CMakeLists.txt
index 0330776cc..de658001f 100644
--- a/src/Mod/Start/CMakeLists.txt
+++ b/src/Mod/Start/CMakeLists.txt
@@ -1,9 +1,9 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
     add_subdirectory(StartPage)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Mod/Test/CMakeLists.txt b/src/Mod/Test/CMakeLists.txt
index a77582da0..73777daac 100644
--- a/src/Mod/Test/CMakeLists.txt
+++ b/src/Mod/Test/CMakeLists.txt
@@ -28,6 +28,6 @@ INSTALL(
         Mod/Test
 )
 
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
diff --git a/src/Mod/Web/CMakeLists.txt b/src/Mod/Web/CMakeLists.txt
index f9122617f..a83d91c5e 100644
--- a/src/Mod/Web/CMakeLists.txt
+++ b/src/Mod/Web/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 INSTALL(
     FILES
diff --git a/src/Tools/_TEMPLATE_/CMakeLists.txt b/src/Tools/_TEMPLATE_/CMakeLists.txt
index a08cef009..198f943f4 100644
--- a/src/Tools/_TEMPLATE_/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 add_subdirectory(App)
-if(FREECAD_BUILD_GUI)
+if(BUILD_GUI)
     add_subdirectory(Gui)
-endif(FREECAD_BUILD_GUI)
+endif(BUILD_GUI)
 
 install(
     FILES