]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Make FindASSIMP.cmake more pretty
authorMatthias Maier <tamiko@43-1.org>
Mon, 25 Sep 2017 21:35:33 +0000 (16:35 -0500)
committerMatthias Maier <tamiko@43-1.org>
Mon, 25 Sep 2017 21:35:33 +0000 (16:35 -0500)
 - use DEAL_II_FIND_PATH to set up include directory
 - don't use tabs :-)

cmake/modules/FindASSIMP.cmake

index e5a3a2462fee6a5d8c883b4400859fbf3d1e4510..4edc211422665e35b44d9e2826b299d6fa0e07bd 100644 (file)
@@ -26,21 +26,17 @@ 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
+  HINTS ${ASSIMP_DIR}
+  PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib
   )
 
-SET(ASSIMP_INC "${ASSIMP_DIR}/include")
+DEAL_II_FIND_PATH(ASSIMP_INC assimp/defs.h
+  HINTS ${ASSIMP_DIR}
+  )
 
 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
+  LIBRARIES REQUIRED ASSIMP_LIB
+  INCLUDE_DIRS REQUIRED ASSIMP_INC
+  USER_INCLUDE_DIRS REQUIRED ASSIMP_INC
+  CLEAR ASSIMP_LIB ASSIMP_INC
   )
-

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.