From ca08cbcb0cfb3e966480fdaaf603cb8c8d367819 Mon Sep 17 00:00:00 2001 From: iamAdrianIusca Date: Sun, 9 Feb 2020 20:31:06 +0200 Subject: [PATCH] - don't include HunterGate.cmake if you don't enable HUNTER package manager - don't check for DirectX if you don't build the assimp tools or samples --- CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd3f1b802..38ebf3480 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,13 +41,13 @@ CMAKE_MINIMUM_REQUIRED( VERSION 3.0 ) # Toggles the use of the hunter package manager option(HUNTER_ENABLED "Enable Hunter package manager support" OFF) -include("cmake/HunterGate.cmake") -HunterGate( +IF(HUNTER_ENABLED) + include("cmake/HunterGate.cmake") + HunterGate( URL "https://github.com/ruslo/hunter/archive/v0.23.176.tar.gz" SHA1 "2e9ae973d028660b735ac4c6142725ca36a0048a" -) + ) -IF(HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) ENDIF(HUNTER_ENABLED) @@ -437,7 +437,9 @@ ELSE(HUNTER_ENABLED) DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT}) ENDIF(HUNTER_ENABLED) -FIND_PACKAGE( DirectX ) +if (ASSIMP_BUILD_SAMPLES OR ASSIMP_BUILD_SAMPLES) + FIND_PACKAGE(DirectX) +endif(ASSIMP_BUILD_SAMPLES OR ASSIMP_BUILD_SAMPLES) IF( BUILD_DOCS ) ADD_SUBDIRECTORY(doc)