]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Set up the Include directories at an appropriate time...
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 10 Sep 2012 13:02:41 +0000 (13:02 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 10 Sep 2012 13:02:41 +0000 (13:02 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26263 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/cmake/modules/prepare_umfpack.cmake
deal.II/contrib/umfpack/UMFPACK/Source/umf_internal.h

index abbb96ea6b84e5f77514b3fad3b8b0c4cdfc4b7a..d74a9630c93ce878d39657aef6cacf4c532e7bfe 100644 (file)
@@ -6,14 +6,14 @@ IF(DEAL_II_USE_CONTRIB)
   # Add umfpack and amd directly to the object files of deal.II
   #
 
-  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Source)
-  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Source)
-
   INCLUDE_DIRECTORIES(
     ${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Include
     ${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Include
     )
 
+  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Source)
+  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Source)
+
   LIST(APPEND deal_ii_additional_object_files
     ${obj_umfpack_object_files}
     $<TARGET_OBJECTS:obj_amd_int>
index cd46b032983a5bf4f9b7f8322ff0c136a0be1a06..2935299e5dd18491025633700a1eecaafe3a4312 100644 (file)
@@ -14,7 +14,6 @@
     routine names all start with the letters "umfpack_".  Non-user-accessible
     file names and routine names all start with "umf_".
 */
-
 #ifndef _UMF_INTERNAL
 #define _UMF_INTERNAL
 
 
 #include "umfpack.h"
 
+
 /* -------------------------------------------------------------------------- */
 /* for contents of Info.  This must correlate with umfpack.h */
 /* -------------------------------------------------------------------------- */

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.