]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Added assimp detection.
authorLuca Heltai <luca.heltai@sissa.it>
Sat, 16 Sep 2017 06:35:11 +0000 (08:35 +0200)
committerLuca Heltai <luca.heltai@sissa.it>
Sat, 16 Sep 2017 14:57:03 +0000 (16:57 +0200)
cmake/configure/configure_assimp.cmake [new file with mode: 0644]
cmake/modules/FindASSIMP.cmake [new file with mode: 0644]
doc/news/changes/major/20170916LucaHeltai [new file with mode: 0644]
include/deal.II/base/config.h.in

diff --git a/cmake/configure/configure_assimp.cmake b/cmake/configure/configure_assimp.cmake
new file mode 100644 (file)
index 0000000..90b404d
--- /dev/null
@@ -0,0 +1,20 @@
+## ---------------------------------------------------------------------
+##
+## Copyright (C) 2017 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE at
+## the top level of the deal.II distribution.
+##
+## ---------------------------------------------------------------------
+
+#
+# Configuration for the ASSIMP library:
+#
+
+CONFIGURE_FEATURE(ASSIMP)
diff --git a/cmake/modules/FindASSIMP.cmake b/cmake/modules/FindASSIMP.cmake
new file mode 100644 (file)
index 0000000..e5a3a24
--- /dev/null
@@ -0,0 +1,46 @@
+## ---------------------------------------------------------------------
+##
+## Copyright (C) 2017 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE at
+## the top level of the deal.II distribution.
+##
+## ---------------------------------------------------------------------
+
+#
+# Try to find the ASSIMP libraries
+#
+# This module exports
+#
+#   ASSIMP_LIBRARIES
+#   ASSIMP_INCLUDE_DIRS
+#
+
+SET(ASSIMP_DIR "" CACHE PATH "An optional hint to a Assimp installation")
+SET_IF_EMPTY(ASSIMP_DIR "$ENV{ASSIMP_DIR}")
+
+DEAL_II_FIND_LIBRARY(ASSIMP_LIB NAMES assimp
+       HINTS ${ASSIMP_DIR}
+       PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
+  )
+
+SET(ASSIMP_INC "${ASSIMP_DIR}/include")
+
+DEAL_II_PACKAGE_HANDLE(ASSIMP
+  LIBRARIES REQUIRED 
+       ASSIMP_LIB
+       INCLUDE_DIRS 
+       REQUIRED ASSIMP_INC
+       USER_INCLUDE_DIRS
+       REQUIRED ASSIMP_INC
+       CLEAR 
+       ASSIMP_LIB
+       ASSIMP_INC
+  )
+
diff --git a/doc/news/changes/major/20170916LucaHeltai b/doc/news/changes/major/20170916LucaHeltai
new file mode 100644 (file)
index 0000000..d4073ba
--- /dev/null
@@ -0,0 +1,8 @@
+New: Added support for the Open Asset Import Library (Assimp) 
+(http://assimp.sourceforge.net/). This library can be used 
+to read about 40 different 3D graphics formats, used in 3D 
+modelers (such as Blender, Maya, etc.). Some of these formats
+contain mesh information, that in turn can be read 
+into deal.II Triangulation<2,3> objects.
+<br>
+(Luca Heltai, 2017/09/16)
index 92212d903ad0cda4fb91de9d40523046cc640889..22ddfefa5597e95a38960e4f0c76753bdf400f75 100644 (file)
@@ -37,6 +37,7 @@
 #cmakedefine DEAL_II_WITH_64BIT_INDICES
 #cmakedefine DEAL_II_WITH_ADOLC
 #cmakedefine DEAL_II_WITH_ARPACK
+#cmakedefine DEAL_II_WITH_ASSIMP
 #cmakedefine DEAL_II_WITH_BZIP2
 #cmakedefine DEAL_II_WITH_CUDA
 #cmakedefine DEAL_II_WITH_CXX14

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.