Merge branch 'master' of github.com:FreeCAD/FreeCAD

FreeCAD · Sep 10, 2016 · ee314ed · ee314ed
2 parents a932f7a + 5e0a60b
commit ee314ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/cMake/FindNETGEN.cmake b/cMake/FindNETGEN.cmake
@@ -60,6 +60,15 @@ ELSEIF(WIN32)
     ENDIF(NOT NETGENDATA)
 
 ELSE(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
+    IF(NETGEN_ROOT)
+        SET(NETGEN_INCLUDEDIR ${NETGEN_ROOT}/include)
+        SET(NETGEN_LIBDIR ${NETGEN_ROOT}/lib)
+        # allow to customize if NETGEN_ROOT is used
+        IF(NOT NETGENDATA)
+            SET(NETGENDATA ${NETGEN_ROOT}/libsrc)
+        ENDIF(NOT NETGENDATA)
+    ENDIF()
+
     FIND_PATH(NGLIB_INCLUDE_DIR NAMES nglib.h PATHS ${NETGEN_INCLUDEDIR} /usr/include)
     FIND_LIBRARY(NGLIB_LIBNGLIB nglib PATHS ${NETGEN_LIBDIR} /usr/lib /usr/local/lib)
     SET(NGLIB_LIBRARIES ${NGLIB_LIBNGLIB})

diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt
@@ -21,6 +21,7 @@ include_directories(
     ${ZLIB_INCLUDE_DIR}
     ${XercesC_INCLUDE_DIRS}
     ${SMESH_INCLUDE_DIR}
+    ${NETGEN_INCLUDE_DIRS}
     ${VTK_INCLUDE_DIR}
 )