File: 2070-use-nlohmann-json3-dev.patch

package info (click to toggle)
freecad 1.0.2%2Bdfsg-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 464,352 kB
  • sloc: cpp: 931,303; python: 587,869; xml: 103,037; ansic: 9,568; fortran: 3,878; sh: 715; lex: 699; javascript: 311; yacc: 271; makefile: 120
file content (39 lines) | stat: -rw-r--r-- 1,025 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
Description: Use packaged json3 library.
Author: Tobias Frost <tobi@debian.org>
Last-Update: 2024-12-23

--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
@@ -1,3 +1,6 @@
+
+find_package(nlohmann_json REQUIRED)
+
 include_directories(
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/src
@@ -14,7 +17,7 @@
     ${PYTHON_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}
     ${QT_INCLUDE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/
+    /usr/include/nlohmann/
 )
 link_directories(${OCC_LIBRARY_DIR})
 
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(nlohmann_json REQUIRED)
+
 include_directories(
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/src
@@ -13,7 +15,7 @@
     ${PYTHON_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}
     ${EIGEN3_INCLUDE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/
+    /usr/include/nlohmann/
 )
 link_directories(${OCC_LIBRARY_DIR})