PartDesign: [skip ci] minor cosmetic changes

FreeCAD · Oct 31, 2020 · 9eb0804 · 9eb0804
1 parent 6d1b292
commit 9eb0804
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -171,7 +171,7 @@ class PartDesignExport Hole : public ProfileBased
 
     std::map<std::string, CutDimensionSet> 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
@@ -7,6 +7,12 @@
 #include <string> // string
 #include <vector> // vector
 
+/*
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+*/
+
 /*!
 @brief namespace for Niels Lohmann
 @see https://github.com/nlohmann

diff --git a/src/Mod/PartDesign/CMakeLists.txt b/src/Mod/PartDesign/CMakeLists.txt
@@ -148,15 +148,15 @@ 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}
 )
 
 INSTALL(
     FILES
         ${PartDesignHoleDefines}
     DESTINATION
-        share/Mod/PartDesign/Resources/Hole
+        ${CMAKE_INSTALL_DATADIR}/Mod/PartDesign/Resources/Hole
 )
 
 if(BUILD_FEM)