GitHub-Proxy/draco
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/google/draco synced 2025-08-14 01:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct the install location for CMake configuration files. (#839)

Browse Source 
- 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.
This commit is contained in:
Tom Finegan 2022-04-08 14:21:24 -07:00 committed by GitHub
parent befe2d8809
commit 60af0ba480
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/draco_install.cmake
View File

@ -39,19 +39,19 @@ macro(draco_setup_install_target)
configure_package_config_file( configure_package_config_file(
"${draco_root}/cmake/draco-config.cmake.template" "${draco_root}/cmake/draco-config.cmake.template"
"${draco_build}/draco-config.cmake" "${draco_build}/draco-config.cmake"
INSTALL_DESTINATION "${data_path}/cmake") INSTALL_DESTINATION "${data_path}/cmake/draco")
install( install(
FILES "${draco_build}/draco-config.cmake" 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( write_basic_package_version_file(
"${draco_build}/draco-version.cmake" "${draco_build}/draco-config-version.cmake"
VERSION ${DRACO_VERSION} VERSION ${DRACO_VERSION}
COMPATIBILITY AnyNewerVersion) COMPATIBILITY AnyNewerVersion)
install( install(
FILES "${draco_build}/draco-version.cmake" FILES "${draco_build}/draco-config-version.cmake"
DESTINATION "${data_path}/cmake") DESTINATION "${data_path}/cmake/draco")
foreach(file ${draco_sources}) foreach(file ${draco_sources})
if(file MATCHES "h$") if(file MATCHES "h$")

4
src/draco/tools/install_test/CMakeLists.txt
View File

@ -23,10 +23,10 @@ include(GNUInstallDirs)
# Tell find_package() where Draco is installed. # Tell find_package() where Draco is installed.
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
set(CMAKE_PREFIX_PATH set(CMAKE_PREFIX_PATH
"${CMAKE_CURRENT_LIST_DIR}/_draco_install_shared/share/cmake") "${CMAKE_CURRENT_LIST_DIR}/_draco_install_shared")
else() else()
set(CMAKE_PREFIX_PATH set(CMAKE_PREFIX_PATH
"${CMAKE_CURRENT_LIST_DIR}/_draco_install_static/share/cmake") "${CMAKE_CURRENT_LIST_DIR}/_draco_install_static")
endif() endif()
find_package(draco REQUIRED) find_package(draco REQUIRED)