diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index 5c00c66b17e0..91230d9c7e12 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -1301,7 +1301,7 @@ App::DocumentObjectExecReturn *Hole::execute(void) } } -void Hole::addCounterType(const CutDimensionSet dimensions) +void Hole::addCounterType(const CutDimensionSet& dimensions) { HoleCutTypeMap.emplace(dimensions.name, dimensions); const std::string &name = dimensions.name; diff --git a/src/Mod/PartDesign/App/FeatureHole.h b/src/Mod/PartDesign/App/FeatureHole.h index 6b621bf203ca..a3bbf81a96e0 100644 --- a/src/Mod/PartDesign/App/FeatureHole.h +++ b/src/Mod/PartDesign/App/FeatureHole.h @@ -171,7 +171,7 @@ class PartDesignExport Hole : public ProfileBased std::map HoleCutTypeMap; - void addCounterType(const CutDimensionSet dimensions); + void addCounterType(const CutDimensionSet& dimensions); bool isDynamicCounterbore(const std::string &holeCutType); bool isDynamicCountersink(const std::string &holeCutType); void updateHoleCutParams(); diff --git a/src/Mod/PartDesign/App/json_fwd.hpp b/src/Mod/PartDesign/App/json_fwd.hpp index 332227c1ba28..80a1d4295059 100644 --- a/src/Mod/PartDesign/App/json_fwd.hpp +++ b/src/Mod/PartDesign/App/json_fwd.hpp @@ -7,6 +7,12 @@ #include // string #include // vector +/* +Licensed under the MIT License . +SPDX-License-Identifier: MIT +Copyright (c) 2013-2019 Niels Lohmann . +*/ + /*! @brief namespace for Niels Lohmann @see https://github.com/nlohmann diff --git a/src/Mod/PartDesign/CMakeLists.txt b/src/Mod/PartDesign/CMakeLists.txt index 6a4f911f3921..dc326aa5f056 100644 --- a/src/Mod/PartDesign/CMakeLists.txt +++ b/src/Mod/PartDesign/CMakeLists.txt @@ -148,7 +148,7 @@ add_custom_target(PartDesignHole ALL SOURCES fc_target_copy_resource(PartDesignHole ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/share/Mod/PartDesign + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/PartDesign ${PartDesignHoleDefines} ) @@ -156,7 +156,7 @@ INSTALL( FILES ${PartDesignHoleDefines} DESTINATION - share/Mod/PartDesign/Resources/Hole + ${CMAKE_INSTALL_DATADIR}/Mod/PartDesign/Resources/Hole ) if(BUILD_FEM)