From 80c88ffc73a176de44b641d166057e68780d4cdc Mon Sep 17 00:00:00 2001 From: xiaozhuai <798047000@qq.com> Date: Mon, 18 May 2020 15:40:12 +0800 Subject: [PATCH 1/2] optimize CMakeLists.txt --- CMakeLists.txt | 2 +- code/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b350f6e3..495e161c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -351,7 +351,7 @@ ELSE() ENDIF() # Only generate this target if no higher-level project already has -IF (NOT TARGET uninstall) +IF (NOT TARGET uninstall AND ASSIMP_INSTALL) # add make uninstall capability CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 000ebad6c..d390e525c 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1036,7 +1036,7 @@ ENDIF() # Check dependencies for glTF importer with Open3DGC-compression. # RT-extensions is used in "contrib/Open3DGC/o3dgcTimer.h" for collecting statistics. Pointed file # has implementation for different platforms: WIN32, __MACH__ and other ("else" block). -FIND_PACKAGE(RT QUIET) +FIND_PACKAGE(rt QUIET) IF (NOT ASSIMP_HUNTER_ENABLED AND (RT_FOUND OR MSVC)) SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 ) ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 ) From 37c09ecb69f7d6acd8c0ddd089e5159450ac8ff7 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 17 Oct 2020 10:58:06 +0200 Subject: [PATCH 2/2] Update CMakeLists.txt --- code/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 7d9b03ce1..5a4e2dafd 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1014,7 +1014,7 @@ ENDIF() # Check dependencies for glTF importer with Open3DGC-compression. # RT-extensions is used in "contrib/Open3DGC/o3dgcTimer.h" for collecting statistics. Pointed file # has implementation for different platforms: WIN32, __MACH__ and other ("else" block). -FIND_PACKAGE(rt QUIET) +FIND_PACKAGE(RT QUIET) IF (NOT ASSIMP_HUNTER_ENABLED AND (RT_FOUND OR MSVC)) SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 ) ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 )