From 5048074542e67de8edeb0aef6880ad66ff33a3fa Mon Sep 17 00:00:00 2001 From: liukaiwen Date: Wed, 30 Aug 2023 15:31:56 +0800 Subject: [PATCH] fix: json is a 3rdparty library, move to 3rdparty --- .../App => 3rdParty/json/single_include/nlohmann}/json.hpp | 0 .../App => 3rdParty/json/single_include/nlohmann}/json_fwd.hpp | 0 src/Mod/PartDesign/App/CMakeLists.txt | 1 + src/Mod/PartDesign/Gui/CMakeLists.txt | 1 + 4 files changed, 2 insertions(+) rename src/{Mod/PartDesign/App => 3rdParty/json/single_include/nlohmann}/json.hpp (100%) rename src/{Mod/PartDesign/App => 3rdParty/json/single_include/nlohmann}/json_fwd.hpp (100%) diff --git a/src/Mod/PartDesign/App/json.hpp b/src/3rdParty/json/single_include/nlohmann/json.hpp similarity index 100% rename from src/Mod/PartDesign/App/json.hpp rename to src/3rdParty/json/single_include/nlohmann/json.hpp diff --git a/src/Mod/PartDesign/App/json_fwd.hpp b/src/3rdParty/json/single_include/nlohmann/json_fwd.hpp similarity index 100% rename from src/Mod/PartDesign/App/json_fwd.hpp rename to src/3rdParty/json/single_include/nlohmann/json_fwd.hpp diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index d74a77c1d5..d8db758576 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -16,6 +16,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${QT_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/ ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index b3f5767dc7..d80be20bda 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/ ) link_directories(${OCC_LIBRARY_DIR})