diff --git a/src/Base/UnitsSchemaInternal.cpp b/src/Base/UnitsSchemaInternal.cpp index f00be684e3..41fd5d9af7 100644 --- a/src/Base/UnitsSchemaInternal.cpp +++ b/src/Base/UnitsSchemaInternal.cpp @@ -233,7 +233,6 @@ QString UnitsSchemaInternal::schemaTranslate(const Quantity &quant, double &fact else { unitString = QString::fromLatin1("MN/m"); factor = 1e6; - } } else if (unit == Unit::Force) { diff --git a/src/Base/UnitsSchemaMKS.cpp b/src/Base/UnitsSchemaMKS.cpp index 2bb0f9ab40..1639ec3b96 100644 --- a/src/Base/UnitsSchemaMKS.cpp +++ b/src/Base/UnitsSchemaMKS.cpp @@ -185,7 +185,6 @@ QString UnitsSchemaMKS::schemaTranslate(const Quantity &quant, double &factor, Q else { unitString = QString::fromLatin1("MN/m"); factor = 1e6; - } } else if (unit == Unit::ThermalConductivity) { diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt index a037deb82d..a08f727db4 100644 --- a/src/Mod/Import/App/CMakeLists.txt +++ b/src/Mod/Import/App/CMakeLists.txt @@ -81,7 +81,7 @@ ADD_CUSTOM_TARGET(ImportPy ALL SOURCES ${SCL_Resources} ) -fc_target_copy_resource(ImportPy +fc_target_copy_resource(ImportPy ${CMAKE_SOURCE_DIR}/src/Mod/Import/App ${CMAKE_BINARY_DIR}/Mod/Import ${SCL_Resources}) diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index 8c7583f661..ecf13f8eba 100644 --- a/src/Mod/Part/App/CMakeLists.txt +++ b/src/Mod/Part/App/CMakeLists.txt @@ -24,14 +24,14 @@ include_directories( link_directories(${OCC_LIBRARY_DIR}) -set(Part_LIBS +set(Part_LIBS ${OCC_LIBRARIES} ${OCC_DEBUG_LIBRARIES} FreeCADApp ) if(FREETYPE_FOUND) - set(Part_LIBS + set(Part_LIBS ${Part_LIBS} ${FREETYPE_LIBRARIES} ) diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index a7cbaf55bf..56fe62b934 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -35,7 +35,7 @@ SET(Python_SRCS Robot6AxisPy.xml Robot6AxisPyImp.cpp TrajectoryPy.xml - TrajectoryPyImp.cpp + TrajectoryPyImp.cpp RobotObjectPy.xml RobotObjectPyImp.cpp WaypointPy.xml diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index 285c3f198c..adc4cd507a 100644 --- a/src/Mod/TechDraw/App/CMakeLists.txt +++ b/src/Mod/TechDraw/App/CMakeLists.txt @@ -263,7 +263,7 @@ ADD_CUSTOM_COMMAND(TARGET TechDraw COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/Mod/TechDraw/Patterns ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw/Patterns -) +) ADD_CUSTOM_COMMAND(TARGET TechDraw POST_BUILD @@ -277,7 +277,7 @@ ADD_CUSTOM_COMMAND(TARGET TechDraw COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/Mod/TechDraw/Symbols ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw/Symbols -) +) SET_BIN_DIR(TechDraw TechDraw /Mod/TechDraw) SET_PYTHON_PREFIX_SUFFIX(TechDraw) diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index c2b25e0a8d..d16c01d9df 100644 --- a/src/Mod/TechDraw/Gui/CMakeLists.txt +++ b/src/Mod/TechDraw/Gui/CMakeLists.txt @@ -95,7 +95,7 @@ else() qt4_wrap_ui(TechDrawGui_UIC_HDRS ${TechDrawGui_UIC_SRCS}) endif() -SET(MRTE_SRCS +SET(MRTE_SRCS mrichtextedit.ui mrichtextedit.cpp mrichtextedit.h @@ -390,7 +390,7 @@ SET(TechDrawGuiViewProvider_SRCS ViewProviderWeld.cpp ViewProviderWeld.h ViewProviderCosmeticExtension.cpp - ViewProviderCosmeticExtension.h + ViewProviderCosmeticExtension.h ) SET(TechDrawGuiTaskDlgs_SRCS