From b131c8b6dd141a186768623dfeb9cdbe51e207de Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 25 Sep 2017 16:35:33 -0500 Subject: [PATCH] CMake: Make FindASSIMP.cmake more pretty - use DEAL_II_FIND_PATH to set up include directory - don't use tabs :-) --- cmake/modules/FindASSIMP.cmake | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/cmake/modules/FindASSIMP.cmake b/cmake/modules/FindASSIMP.cmake index e5a3a2462f..4edc211422 100644 --- a/cmake/modules/FindASSIMP.cmake +++ b/cmake/modules/FindASSIMP.cmake @@ -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 ) - -- 2.39.5