From 52826a03f8a8eb722221b595dc5eb993338eb334 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 5 Oct 2020 18:53:42 +0200 Subject: [PATCH] remove all hunter-dependencies for pugixml. --- CMakeLists.txt | 2 +- cmake/assimp-hunter-config.cmake.in | 1 - code/CMakeLists.txt | 17 +++++------------ 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a68fca1f7..003ad77c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,7 +210,7 @@ IF(NOT GIT_COMMIT_HASH) ENDIF() IF(ASSIMP_DOUBLE_PRECISION) - ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION) + ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION) ENDIF() CONFIGURE_FILE( diff --git a/cmake/assimp-hunter-config.cmake.in b/cmake/assimp-hunter-config.cmake.in index b5283f4fb..ecd9b988b 100644 --- a/cmake/assimp-hunter-config.cmake.in +++ b/cmake/assimp-hunter-config.cmake.in @@ -8,7 +8,6 @@ find_package(openddlparser CONFIG REQUIRED) find_package(poly2tri CONFIG REQUIRED) find_package(polyclipping CONFIG REQUIRED) find_package(zip CONFIG REQUIRED) -find_package(pugixml CONFIG REQUIRED) include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") check_required_components("@PROJECT_NAME@") diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 5bae6a3ff..8accf5690 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -862,17 +862,11 @@ SET( Extra_SRCS SOURCE_GROUP( Extra FILES ${Extra_SRCS}) # pugixml -IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(pugixml) - find_package(pugixml CONFIG REQUIRED) -ELSE() - SET( Pugixml_SRCS - ../contrib/pugixml/src/pugiconfig.hpp - ../contrib/pugixml/src/pugixml.hpp - #../contrib/pugixml/src/pugixml.cpp - ) - SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS}) -ENDIF() +SET( Pugixml_SRCS + ../contrib/pugixml/src/pugiconfig.hpp + ../contrib/pugixml/src/pugixml.hpp +) +SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS}) # utf8 IF(ASSIMP_HUNTER_ENABLED) @@ -1135,7 +1129,6 @@ IF(ASSIMP_HUNTER_ENABLED) TARGET_LINK_LIBRARIES(assimp PUBLIC polyclipping::polyclipping - pugixml::pugixml openddlparser::openddl_parser poly2tri::poly2tri minizip::minizip