From 28aa4012e5a5a157d65026a3e3035ca637b298b8 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Fri, 8 Apr 2022 12:58:11 -0700 Subject: [PATCH 1/4] Correct the install location for CMake configuration files. Also updates the install test to correctly set prefix and allow CMake's built-in search functionality to work properly. --- cmake/draco_install.cmake | 8 ++++---- src/draco/tools/install_test/CMakeLists.txt | 4 ++-- src/draco/tools/install_test/test.py | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/draco_install.cmake b/cmake/draco_install.cmake index 9e36b9342..748d16714 100644 --- a/cmake/draco_install.cmake +++ b/cmake/draco_install.cmake @@ -42,16 +42,16 @@ macro(draco_setup_install_target) INSTALL_DESTINATION "${data_path}/cmake") install( FILES "${draco_build}/draco-config.cmake" - DESTINATION "${data_path}/cmake") + DESTINATION "${data_path}/cmake/draco") # CMake version: draco-version.cmake write_basic_package_version_file( - "${draco_build}/draco-version.cmake" + "${draco_build}/draco-config-version.cmake" VERSION ${DRACO_VERSION} COMPATIBILITY AnyNewerVersion) install( - FILES "${draco_build}/draco-version.cmake" - DESTINATION "${data_path}/cmake") + FILES "${draco_build}/draco-config-version.cmake" + DESTINATION "${data_path}/cmake/draco") foreach(file ${draco_sources}) if(file MATCHES "h$") diff --git a/src/draco/tools/install_test/CMakeLists.txt b/src/draco/tools/install_test/CMakeLists.txt index dd6e45110..e32945e7d 100644 --- a/src/draco/tools/install_test/CMakeLists.txt +++ b/src/draco/tools/install_test/CMakeLists.txt @@ -23,10 +23,10 @@ include(GNUInstallDirs) # Tell find_package() where Draco is installed. if(BUILD_SHARED_LIBS) set(CMAKE_PREFIX_PATH - "${CMAKE_CURRENT_LIST_DIR}/_draco_install_shared/share/cmake") + "${CMAKE_CURRENT_LIST_DIR}/_draco_install_shared") else() set(CMAKE_PREFIX_PATH - "${CMAKE_CURRENT_LIST_DIR}/_draco_install_static/share/cmake") + "${CMAKE_CURRENT_LIST_DIR}/_draco_install_static") endif() find_package(draco REQUIRED) diff --git a/src/draco/tools/install_test/test.py b/src/draco/tools/install_test/test.py index 6b911af96..45dd92c7d 100755 --- a/src/draco/tools/install_test/test.py +++ b/src/draco/tools/install_test/test.py @@ -177,6 +177,7 @@ def cleanup(): shutil.rmtree(TEST_STATIC_BUILD_PATH) shutil.rmtree(TEST_SHARED_INSTALL_PATH) shutil.rmtree(TEST_STATIC_INSTALL_PATH) + pass def cmake_configure(source_path, cmake_args=None): From e8e72bc60c5b01c495a2cc545b70d9dd23fee67a Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Fri, 8 Apr 2022 13:01:50 -0700 Subject: [PATCH 2/4] Remove a line of debug cruft --- src/draco/tools/install_test/test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/draco/tools/install_test/test.py b/src/draco/tools/install_test/test.py index 45dd92c7d..6b911af96 100755 --- a/src/draco/tools/install_test/test.py +++ b/src/draco/tools/install_test/test.py @@ -177,7 +177,6 @@ def cleanup(): shutil.rmtree(TEST_STATIC_BUILD_PATH) shutil.rmtree(TEST_SHARED_INSTALL_PATH) shutil.rmtree(TEST_STATIC_INSTALL_PATH) - pass def cmake_configure(source_path, cmake_args=None): From e08dc75f7c729c74a7ab1ef584ebb15870313678 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Fri, 8 Apr 2022 13:07:36 -0700 Subject: [PATCH 3/4] Fix INSTALL_DESTINATION passed to configure_package_config_file() --- cmake/draco_install.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/draco_install.cmake b/cmake/draco_install.cmake index 748d16714..066c76b8b 100644 --- a/cmake/draco_install.cmake +++ b/cmake/draco_install.cmake @@ -39,7 +39,7 @@ macro(draco_setup_install_target) configure_package_config_file( "${draco_root}/cmake/draco-config.cmake.template" "${draco_build}/draco-config.cmake" - INSTALL_DESTINATION "${data_path}/cmake") + INSTALL_DESTINATION "${data_path}/cmake/draco") install( FILES "${draco_build}/draco-config.cmake" DESTINATION "${data_path}/cmake/draco") From 3bb0722784dc9e6071b3fe0bb398bef96ecb14e9 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Fri, 8 Apr 2022 13:10:19 -0700 Subject: [PATCH 4/4] Fix filename comment (ugh). --- cmake/draco_install.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/draco_install.cmake b/cmake/draco_install.cmake index 066c76b8b..4a29649e7 100644 --- a/cmake/draco_install.cmake +++ b/cmake/draco_install.cmake @@ -44,7 +44,7 @@ macro(draco_setup_install_target) FILES "${draco_build}/draco-config.cmake" DESTINATION "${data_path}/cmake/draco") - # CMake version: draco-version.cmake + # CMake version: draco-config-version.cmake write_basic_package_version_file( "${draco_build}/draco-config-version.cmake" VERSION ${DRACO_VERSION}