]>
Commit | Line | Data |
---|---|---|
dfd2f590 AM |
1 | diff -Naur freecad-0.14.3702.orig/CMakeLists.txt freecad-0.14.3702/CMakeLists.txt |
2 | --- freecad-0.14.3702.orig/CMakeLists.txt 2014-07-13 10:33:02.000000000 -0500 | |
3 | +++ freecad-0.14.3702/CMakeLists.txt 2014-11-30 16:28:11.540834321 -0600 | |
4 | @@ -117,6 +117,7 @@ | |
5 | OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3rd party libs. On Windows the Installer is build." OFF) | |
6 | OPTION(FREECAD_USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF) | |
7 | OPTION(FREECAD_USE_EXTERNAL_PIVY "Use system installed python-pivy instead of the bundled." OFF) | |
8 | +OPTION(FREECAD_USE_EXTERNAL_SMESH "Use system installed smesh instead of the bundled." OFF) | |
9 | OPTION(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF) | |
10 | ||
11 | OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF) | |
12 | @@ -165,6 +166,7 @@ | |
13 | if (FREECAD_BUILD_DEBIAN) | |
14 | set(FREECAD_USE_EXTERNAL_ZIPIOS ON) | |
15 | set(FREECAD_USE_EXTERNAL_PIVY ON) | |
16 | + set(FREECAD_USE_EXTERNAL_SMESH ON) | |
17 | endif (FREECAD_BUILD_DEBIAN) | |
18 | ||
19 | # ============================================================================== | |
20 | @@ -348,10 +350,6 @@ | |
21 | message(SEND_ERROR "Could not find libpack in specified location:" ${FREECAD_LIBPACK_DIR}) | |
22 | ENDIF(FREECAD_LIBPACK_CHECKFILE6X) | |
23 | ||
24 | -# -------------------------------- PyCXX -------------------------------- | |
25 | - | |
26 | - find_package(PyCXX REQUIRED) | |
27 | - | |
28 | # -------------------------------- Swig ---------------------------------- | |
29 | ||
30 | find_package(SWIG) | |
31 | @@ -473,24 +471,29 @@ | |
32 | ||
33 | # Salome SMESH sources are under src/3rdParty now | |
34 | IF(OCC_FOUND) | |
35 | - set(SMESH_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc) | |
36 | - set(SMESH_LIBRARIES | |
37 | - StdMeshers | |
38 | - #MEFISTO2 | |
39 | - SMESH | |
40 | - DriverUNV | |
41 | - SMESHDS | |
42 | - DriverSTL | |
43 | - DriverDAT | |
44 | - Driver | |
45 | - SMDS | |
46 | - ) | |
47 | - set(SMESH_FOUND TRUE) | |
48 | - ENDIF(OCC_FOUND) | |
49 | - #find_package(SMESH) | |
50 | - #IF(NOT SMESH_FOUND) | |
51 | - # MESSAGE("Salome SMESH was not found!") | |
52 | - #ENDIF(NOT SMESH_FOUND) | |
53 | + if(NOT FREECAD_USE_EXTERNAL_SMESH) | |
54 | + set(SMESH_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc) | |
55 | + else() | |
56 | + include_directories(${SMESH_INCLUDE_DIR}) | |
57 | + set(SMESH_LIBRARIES "") | |
58 | + foreach(SMESH_LIB | |
59 | + StdMeshers | |
60 | + #MEFISTO2 | |
61 | + SMESH | |
62 | + DriverUNV | |
63 | + SMESHDS | |
64 | + DriverSTL | |
65 | + DriverDAT | |
66 | + Driver | |
67 | + SMDS | |
68 | + ) | |
69 | + find_library(SMESH_${SMESH_LIB} ${SMESH_LIB} REQUIRED) | |
70 | + list(APPEND SMESH_LIBRARIES ${SMESH_${SMESH_LIB}}) | |
71 | + endforeach() | |
72 | + message(STATUS "Found SMESH library: ${SMESH_LIBRARIES}") | |
73 | + endif() | |
74 | + set(SMESH_FOUND TRUE) | |
75 | + ENDIF(OCC_FOUND) | |
76 | ||
77 | # -------------------------------- Netgen -------------------------------- | |
78 | ||
79 | diff -Naur freecad-0.14.3702.orig/src/3rdParty/CMakeLists.txt freecad-0.14.3702/src/3rdParty/CMakeLists.txt | |
80 | --- freecad-0.14.3702.orig/src/3rdParty/CMakeLists.txt 2014-07-13 10:33:02.000000000 -0500 | |
81 | +++ freecad-0.14.3702/src/3rdParty/CMakeLists.txt 2014-07-26 21:31:55.617168862 -0500 | |
82 | @@ -34,8 +34,8 @@ | |
83 | endif (FREECAD_LIBPACK_CHECKFILE6X) | |
84 | endif(FREECAD_BUILD_GUI AND NOT FREECAD_USE_EXTERNAL_PIVY) | |
85 | ||
86 | -# Build SalomeMesh for all Platforms since heavily patched | |
87 | -if (FREECAD_BUILD_SMESH) | |
88 | +if(NOT FREECAD_USE_EXTERNAL_SMESH) | |
89 | + # Build SalomeMesh for all Platforms since heavily patched | |
90 | add_subdirectory(salomesmesh) | |
91 | -endif(FREECAD_BUILD_SMESH) | |
92 | +endif(NOT FREECAD_USE_EXTERNAL_SMESH) | |
93 | ||
94 | diff -Naur freecad-0.14.3702.orig/src/Mod/Fem/App/CMakeLists.txt freecad-0.14.3702/src/Mod/Fem/App/CMakeLists.txt | |
95 | --- freecad-0.14.3702.orig/src/Mod/Fem/App/CMakeLists.txt 2014-07-13 10:33:02.000000000 -0500 | |
96 | +++ freecad-0.14.3702/src/Mod/Fem/App/CMakeLists.txt 2014-12-15 14:23:39.548135756 -0600 | |
97 | @@ -21,7 +21,7 @@ | |
98 | ${PYTHON_INCLUDE_PATH} | |
99 | ${ZLIB_INCLUDE_DIR} | |
100 | ${XERCESC_INCLUDE_DIR} | |
101 | - ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc | |
102 | + ${SMESH_INCLUDE_DIR} | |
103 | ) | |
104 | ||
105 | link_directories(${OCC_LIBRARY_DIR}) | |
106 | @@ -34,6 +34,8 @@ | |
107 | StdMeshers | |
108 | NETGENPlugin | |
109 | SMESH | |
110 | + SMDS | |
111 | + SMESHDS | |
112 | ) | |
113 | else(FREECAD_BUILD_FEM_NETGEN) | |
114 | set(Fem_LIBS | |
115 | @@ -41,6 +43,8 @@ | |
116 | FreeCADApp | |
117 | StdMeshers | |
118 | SMESH | |
119 | + SMDS | |
120 | + SMESHDS | |
121 | ) | |
122 | endif(FREECAD_BUILD_FEM_NETGEN) | |
123 | ||
124 | diff -Naur freecad-0.14.3702.orig/src/Mod/Fem/Gui/CMakeLists.txt freecad-0.14.3702/src/Mod/Fem/Gui/CMakeLists.txt | |
125 | --- freecad-0.14.3702.orig/src/Mod/Fem/Gui/CMakeLists.txt 2014-07-13 10:33:02.000000000 -0500 | |
126 | +++ freecad-0.14.3702/src/Mod/Fem/Gui/CMakeLists.txt 2014-12-15 11:16:24.706617437 -0600 | |
127 | @@ -20,7 +20,7 @@ | |
128 | ${SOQT_INCLUDE_DIR} | |
129 | ${PYTHON_INCLUDE_PATH} | |
130 | ${XERCESC_INCLUDE_DIR} | |
131 | - ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc | |
132 | + ${SMESH_INCLUDE_DIR} | |
133 | ) | |
134 | ||
135 | link_directories(${OCC_LIBRARY_DIR}) | |
136 | diff -Naur freecad-0.14.3702.orig/src/Mod/MeshPart/App/CMakeLists.txt freecad-0.14.3702/src/Mod/MeshPart/App/CMakeLists.txt | |
137 | --- freecad-0.14.3702.orig/src/Mod/MeshPart/App/CMakeLists.txt 2014-07-13 10:33:02.000000000 -0500 | |
138 | +++ freecad-0.14.3702/src/Mod/MeshPart/App/CMakeLists.txt 2014-12-15 12:55:44.292060698 -0600 | |
139 | @@ -14,7 +14,6 @@ | |
140 | ||
141 | include_directories( | |
142 | ${CMAKE_SOURCE_DIR}/src | |
143 | - ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc | |
144 | ${Boost_INCLUDE_DIRS} | |
145 | ${OCC_INCLUDE_DIR} | |
146 | ${ZLIB_INCLUDE_DIR} | |
147 | @@ -34,6 +33,7 @@ | |
148 | StdMeshers | |
149 | NETGENPlugin | |
150 | SMESH | |
151 | + SMDS | |
152 | ) | |
153 | else(FREECAD_BUILD_FEM_NETGEN) | |
154 | set(MeshPart_LIBS | |
155 | @@ -41,6 +41,7 @@ | |
156 | Mesh | |
157 | StdMeshers | |
158 | SMESH | |
159 | + SMDS | |
160 | ) | |
161 | endif(FREECAD_BUILD_FEM_NETGEN) | |
162 |