From cd4269e6af85295173d95a182c0f85389a34cc0d Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 15 Apr 2019 13:31:31 +0200 Subject: [PATCH] rename BUILD_uSE_PCH to FREECAD_USE_PCH to be consistent with other build options --- CMakeLists.txt | 2 +- src/App/CMakeLists.txt | 4 ++-- src/Base/CMakeLists.txt | 4 ++-- src/Gui/CMakeLists.txt | 4 ++-- src/Mod/Measure/App/CMakeLists.txt | 4 ++-- src/Mod/Mesh/App/CMakeLists.txt | 4 ++-- src/Mod/TechDraw/App/CMakeLists.txt | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a842d4f219..683bdf4246 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,7 +191,7 @@ if(MSVC) ELSE() set(FREECAD_LIBPACK_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "Directory of the FreeCAD LibPack") ENDIF() - OPTION(BUILD_USE_PCH "Activate precompiled headers where it's used." ON) + OPTION(FREECAD_USE_PCH "Activate precompiled headers where it's used." ON) else(MSVC) OPTION(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." OFF) set(FREECAD_LIBPACK_DIR "" CACHE PATH "Directory of the FreeCAD LibPack") diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt index 77f6ddf287..703d48070b 100644 --- a/src/App/CMakeLists.txt +++ b/src/App/CMakeLists.txt @@ -279,10 +279,10 @@ SET(FreeCADApp_SRCS PreCompiled.h ) -if(BUILD_USE_PCH) +if(FREECAD_USE_PCH) add_definitions(-D_PreComp_) ADD_MSVC_PRECOMPILED_HEADER(FreeCADApp PreCompiled.h PreCompiled.cpp FreeCADApp_CPP_SRCS) -endif(BUILD_USE_PCH) +endif(FREECAD_USE_PCH) add_library(FreeCADApp SHARED ${FreeCADApp_SRCS}) diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index 0b1a0dfb68..46a1f73023 100644 --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt @@ -383,10 +383,10 @@ else(FREECAD_USE_EXTERNAL_ZIPIOS) endif(FREECAD_USE_EXTERNAL_ZIPIOS) -if(BUILD_USE_PCH) +if(FREECAD_USE_PCH) add_definitions(-D_PreComp_) ADD_MSVC_PRECOMPILED_HEADER(FreeCADBase PreCompiled.h PreCompiled.cpp FreeCADBase_CPP_SRCS) -endif(BUILD_USE_PCH) +endif(FREECAD_USE_PCH) add_library(FreeCADBase SHARED ${FreeCADBase_SRCS}) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 7b55ab4a58..40777f8785 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -1260,10 +1260,10 @@ if(MSVC) ) endif(MSVC) -if (BUILD_USE_PCH) +if (FREECAD_USE_PCH) add_definitions(-D_PreComp_) ADD_MSVC_PRECOMPILED_HEADER(FreeCADGui PreCompiled.h PreCompiled.cpp FreeCADGui_CPP_SRCS) -endif(BUILD_USE_PCH) +endif(FREECAD_USE_PCH) if (FREECAD_USE_QT_FILEDIALOG) set_source_files_properties(FileDialog.cpp PROPERTIES COMPILE_FLAGS -DUSE_QT_FILEDIALOG) diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt index 4270ef90b8..43ba5f8fa3 100644 --- a/src/Mod/Measure/App/CMakeLists.txt +++ b/src/Mod/Measure/App/CMakeLists.txt @@ -47,11 +47,11 @@ SET(Measure_SRCS ${Python_SRCS} ) -if(BUILD_USE_PCH) +if(FREECAD_USE_PCH) add_definitions(-D_PreComp_) GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" Measure_CPP_SRCS ${Measure_SRCS}) ADD_MSVC_PRECOMPILED_HEADER(Measure PreCompiled.h PreCompiled.cpp Measure_CPP_SRCS) -endif(BUILD_USE_PCH) +endif(FREECAD_USE_PCH) SET(Measure_Scripts ../Init.py diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index c63ee79657..a0d547c3b5 100644 --- a/src/Mod/Mesh/App/CMakeLists.txt +++ b/src/Mod/Mesh/App/CMakeLists.txt @@ -361,11 +361,11 @@ SET(Mesh_SRCS Segment.h ) -if(BUILD_USE_PCH) +if(FREECAD_USE_PCH) add_definitions(-D_PreComp_) GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Core_SRCS} ${Mesh_SRCS}) ADD_MSVC_PRECOMPILED_HEADER(Mesh PreCompiled.h PreCompiled.cpp PCH_SRCS) -endif(BUILD_USE_PCH) +endif(FREECAD_USE_PCH) add_library(Mesh SHARED ${Core_SRCS} ${WildMagic4_SRCS} ${Mesh_SRCS}) target_link_libraries(Mesh ${Mesh_LIBS}) diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index a26fb81e7a..e749f3e4bb 100644 --- a/src/Mod/TechDraw/App/CMakeLists.txt +++ b/src/Mod/TechDraw/App/CMakeLists.txt @@ -154,11 +154,11 @@ SOURCE_GROUP("Features" FILES ${Draw_SRCS}) SOURCE_GROUP("Geometry" FILES ${Geometry_SRCS}) SOURCE_GROUP("Python" FILES ${Python_SRCS}) -if(BUILD_USE_PCH) +if(FREECAD_USE_PCH) #add_definitions(-D_PreComp_) #GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" TechDrawCPP_SRCS ${TechDraw_SRCS} ${Draw_SRCS} ) #ADD_MSVC_PRECOMPILED_HEADER(TechDraw PreCompiled.h PreCompiled.cpp TechDrawCPP_SRCS) -endif(BUILD_USE_PCH) +endif(FREECAD_USE_PCH) add_library(TechDraw SHARED ${TechDraw_SRCS} ${Draw_SRCS} ${TechDrawAlgos_SRCS} ${Geometry_SRCS} ${Python_SRCS})