Arch becomes BIM

cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake

@@ -17,7 +17,7 @@ macro(CheckInterModuleDependencies)
  endif(${dependent})
  endfunction(REQUIRES_MODS)
 
- REQUIRES_MODS(BUILD_ARCH BUILD_PART BUILD_MESH BUILD_DRAFT)
+ REQUIRES_MODS(BUILD_BIM  BUILD_PART BUILD_MESH BUILD_DRAFT)
  REQUIRES_MODS(BUILD_DRAFT BUILD_SKETCHER)
  REQUIRES_MODS(BUILD_DRAWING BUILD_PART BUILD_SPREADSHEET)
  REQUIRES_MODS(BUILD_FEM BUILD_PART)

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -104,7 +104,7 @@ macro(InitializeFreeCADBuildOptions)
  option(BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
  option(BUILD_TEMPLATE "Build the FreeCAD template module which is only for testing purposes" OFF)
  option(BUILD_ADDONMGR "Build the FreeCAD addon manager module" ON)
- option(BUILD_ARCH "Build the FreeCAD Architecture module" ON)
+ option(BUILD_BIM "Build the FreeCAD BIM module" ON)
  option(BUILD_DRAFT "Build the FreeCAD draft module" ON)
  option(BUILD_DRAWING "Build the FreeCAD drawing module" OFF)
  option(BUILD_HELP "Build the FreeCAD help module" ON)

cMake/FreeCAD_Helpers/PrintFinalReport.cmake

@@ -89,7 +89,7 @@ macro(PrintFinalReport)
  value(FREECAD_USE_PYBIND11)
  value(FREECAD_USE_EXTERNAL_KDL)
  value(BUILD_ADDONMGR)
- value(BUILD_ARCH)
+ value(BUILD_BIM)
  value(BUILD_ASSEMBLY)
  value(BUILD_CLOUD)
  value(BUILD_DRAFT)

cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake

@@ -262,7 +262,9 @@ MACRO(PYSIDE_WRAP_RC outfiles)
  # we follow the tool command with in-place sed.
  ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
  COMMAND "${PYSIDE_RCC_EXECUTABLE}" ${RCCOPTIONS} "${infile}" ${PY_ATTRIBUTE} -o "${outfile}"
- COMMAND sed "/^# /d" "${outfile}" >"${outfile}.tmp" && mv "${outfile}.tmp" "${outfile}"
+ # The line below sometimes catches unwanted lines too - but there is no date in the file
+ # anymore with Qt5 RCC, so commenting it out for now...
+ #COMMAND sed "/^# /d" "${outfile}" >"${outfile}.tmp" && mv "${outfile}.tmp" "${outfile}"
  MAIN_DEPENDENCY "${infile}"
  )
  endif()