2
0
Эх сурвалжийг харах

remove all hunter-dependencies for pugixml.

Kim Kulling 5 жил өмнө
parent
commit
52826a03f8

+ 1 - 1
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(

+ 0 - 1
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}/@[email protected]")
 check_required_components("@PROJECT_NAME@")

+ 5 - 12
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