]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Bugfix: Also install bundled Umfpack headers 578/head
authorMatthias Maier <matthias.maier@iwr.uni-heidelberg.de>
Thu, 19 Feb 2015 19:17:05 +0000 (20:17 +0100)
committerMatthias Maier <matthias.maier@iwr.uni-heidelberg.de>
Thu, 19 Feb 2015 19:17:05 +0000 (20:17 +0100)
With "sparse_direct.h" directly including "umfpack.h" we also have to make
sure to install the bundled header files...

bundled/CMakeLists.txt

index bf12d185cff15e4d3f2b064e50d2083d31cd4640..eb56adc4c7334b40046ecea8c5b5838b0c9faac1 100644 (file)
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2012 - 2014 by the deal.II authors
+## Copyright (C) 2012 - 2015 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -24,7 +24,6 @@ IF(FEATURE_BOOST_BUNDLED_CONFIGURED)
   INSTALL(DIRECTORY ${BOOST_FOLDER}/include/boost
     DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled
     COMPONENT library
-    PATTERN ".svn" EXCLUDE
     )
 
   ADD_SUBDIRECTORY(${BOOST_FOLDER}/libs/serialization/src)
@@ -47,7 +46,6 @@ IF(FEATURE_THREADS_BUNDLED_CONFIGURED)
     DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled
     COMPONENT library
     FILES_MATCHING PATTERN "*.h"
-    PATTERN ".svn" EXCLUDE
     )
 
   ADD_SUBDIRECTORY(${TBB_FOLDER}/src)
@@ -57,6 +55,14 @@ ENDIF()
 IF(FEATURE_UMFPACK_BUNDLED_CONFIGURED)
   ADD_SUBDIRECTORY(${UMFPACK_FOLDER}/UMFPACK/Source)
   ADD_SUBDIRECTORY(${UMFPACK_FOLDER}/AMD/Source)
+
+  INSTALL(DIRECTORY
+      ${UMFPACK_FOLDER}/UMFPACK/Include/
+      ${UMFPACK_FOLDER}/AMD/Include/
+    DESTINATION ${DEAL_II_INCLUDE_RELDIR}/deal.II/bundled
+    COMPONENT library
+    FILES_MATCHING PATTERN "*.h"
+    )
 ENDIF()
 
 

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.