From 60af0ba48077b1f285589b1436d7ccdf214775c4 Mon Sep 17 00:00:00 2001
From: Tom Finegan <tomfinegan@google.com>
Date: Fri, 8 Apr 2022 14:21:24 -0700
Subject: [PATCH] Correct the install location for CMake configuration files.
 (#839)

- Fix version file name.
- Fix install path for config and version file.
- Updates the install test to correctly set prefix and allow
  CMake's built-in search functionality to work properly.
---
 cmake/draco_install.cmake                   | 12 ++++++------
 src/draco/tools/install_test/CMakeLists.txt |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmake/draco_install.cmake b/cmake/draco_install.cmake
index 9e36b93..4a29649 100644
--- a/cmake/draco_install.cmake
+++ b/cmake/draco_install.cmake
@@ -39,19 +39,19 @@ 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")
+    DESTINATION "${data_path}/cmake/draco")
 
-  # CMake version: draco-version.cmake
+  # CMake version: draco-config-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 dd6e451..e32945e 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)