mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 00:30:25 +08:00
112 lines
4.3 KiB
Diff
112 lines
4.3 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 4cb6927..d642832 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -352,7 +352,7 @@ IF (NOT TARGET uninstall)
|
||
|
|
ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
|
||
|
|
ENDIF()
|
||
|
|
|
||
|
|
-IF(HUNTER_ENABLED)
|
||
|
|
+IF(HUNTER_ENABLED OR 1)
|
||
|
|
set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")
|
||
|
|
set(INCLUDE_INSTALL_DIR "include")
|
||
|
|
|
||
|
|
@@ -389,7 +389,7 @@ IF(HUNTER_ENABLED)
|
||
|
|
NAMESPACE "${NAMESPACE}"
|
||
|
|
DESTINATION "${CONFIG_INSTALL_DIR}"
|
||
|
|
)
|
||
|
|
-ELSE(HUNTER_ENABLED)
|
||
|
|
+ELSE()
|
||
|
|
# cmake configuration files
|
||
|
|
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)
|
||
|
|
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE)
|
||
|
|
@@ -412,7 +412,7 @@ ELSE(HUNTER_ENABLED)
|
||
|
|
"${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake"
|
||
|
|
${PACKAGE_TARGETS_FILE}
|
||
|
|
DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT})
|
||
|
|
-ENDIF(HUNTER_ENABLED)
|
||
|
|
+ENDIF()
|
||
|
|
|
||
|
|
FIND_PACKAGE( DirectX )
|
||
|
|
|
||
|
|
diff --git a/cmake/assimp-hunter-config.cmake.in b/cmake/assimp-hunter-config.cmake.in
|
||
|
|
index 34762ac..ec1f554 100644
|
||
|
|
--- a/cmake/assimp-hunter-config.cmake.in
|
||
|
|
+++ b/cmake/assimp-hunter-config.cmake.in
|
||
|
|
@@ -1,14 +1,8 @@
|
||
|
|
@PACKAGE_INIT@
|
||
|
|
|
||
|
|
find_package(RapidJSON CONFIG REQUIRED)
|
||
|
|
-find_package(ZLIB CONFIG REQUIRED)
|
||
|
|
-find_package(utf8 CONFIG REQUIRED)
|
||
|
|
-find_package(irrXML CONFIG REQUIRED)
|
||
|
|
+find_package(ZLIB REQUIRED)
|
||
|
|
find_package(minizip CONFIG REQUIRED)
|
||
|
|
-find_package(openddlparser CONFIG REQUIRED)
|
||
|
|
-find_package(poly2tri CONFIG REQUIRED)
|
||
|
|
-find_package(polyclipping CONFIG REQUIRED)
|
||
|
|
-find_package(zip 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 8e14fcf..91a3a7b 100644
|
||
|
|
--- a/code/CMakeLists.txt
|
||
|
|
+++ b/code/CMakeLists.txt
|
||
|
|
@@ -676,7 +676,7 @@ SET( PostProcessing_SRCS
|
||
|
|
)
|
||
|
|
SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})
|
||
|
|
|
||
|
|
-SET( IrrXML_SRCS ${HEADER_PATH}/irrXMLWrapper.h )
|
||
|
|
+SET( IrrXML_SRCS ${PROJECT_SOURCE_DIR}/contrib/irrXML/irrXML.cpp ${HEADER_PATH}/irrXMLWrapper.h )
|
||
|
|
SOURCE_GROUP( IrrXML FILES ${IrrXML_SRCS})
|
||
|
|
|
||
|
|
ADD_ASSIMP_IMPORTER( Q3D
|
||
|
|
@@ -1125,7 +1125,7 @@ IF(HUNTER_ENABLED)
|
||
|
|
zip::zip
|
||
|
|
)
|
||
|
|
ELSE(HUNTER_ENABLED)
|
||
|
|
- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} minizip::minizip)
|
||
|
|
+ TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} minizip::minizip)
|
||
|
|
ENDIF(HUNTER_ENABLED)
|
||
|
|
|
||
|
|
if(ASSIMP_ANDROID_JNIIOSYSTEM)
|
||
|
|
@@ -1222,7 +1222,7 @@ IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC)
|
||
|
|
TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY})
|
||
|
|
ENDIF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC)
|
||
|
|
|
||
|
|
-IF(HUNTER_ENABLED)
|
||
|
|
+IF(HUNTER_ENABLED OR 1)
|
||
|
|
INSTALL( TARGETS assimp
|
||
|
|
EXPORT "${TARGETS_EXPORT_NAME}"
|
||
|
|
LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|
||
|
|
@@ -1231,14 +1231,14 @@ IF(HUNTER_ENABLED)
|
||
|
|
FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|
||
|
|
COMPONENT ${LIBASSIMP_COMPONENT}
|
||
|
|
INCLUDES DESTINATION "include")
|
||
|
|
-ELSE(HUNTER_ENABLED)
|
||
|
|
+ELSE()
|
||
|
|
INSTALL( TARGETS assimp
|
||
|
|
LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|
||
|
|
ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|
||
|
|
RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR}
|
||
|
|
FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|
||
|
|
COMPONENT ${LIBASSIMP_COMPONENT})
|
||
|
|
-ENDIF(HUNTER_ENABLED)
|
||
|
|
+ENDIF()
|
||
|
|
INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev)
|
||
|
|
INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev)
|
||
|
|
|
||
|
|
diff --git a/contrib/irrXML/CMakeLists.txt b/contrib/irrXML/CMakeLists.txt
|
||
|
|
index 7f58af3..6d4b41e 100644
|
||
|
|
--- a/contrib/irrXML/CMakeLists.txt
|
||
|
|
+++ b/contrib/irrXML/CMakeLists.txt
|
||
|
|
@@ -21,6 +21,7 @@ ENDIF()
|
||
|
|
set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" )
|
||
|
|
set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" )
|
||
|
|
|
||
|
|
+return()
|
||
|
|
install(TARGETS IrrXML
|
||
|
|
LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|
||
|
|
ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|