Skip to content

[cmake] Re-fix the cmake config files #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JackBoosY wants to merge 3 commits into from
Closed

[cmake] Re-fix the cmake config files #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3d0fc4
[cmake] Re-fix the cmake config files
Dec 24, 2021
6d9fb5a
format
Dec 24, 2021
1b72209
Merge branch 'master' into dev/jack/refactory-cmake-config
tomfinegan Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cmake/draco-config.cmake.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@PACKAGE_INIT@
include("${CMAKE_CURRENT_LIST_DIR}/dracoTargets.cmake")
set(DRACO_FOUND TRUE)
set_and_check(DRACO_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
set_and_check(DRACO_LIB_DIR "@CMAKE_INSTALL_FULL_LIBDIR@")
set_and_check(DRACO_LIBRARY "draco")
set_and_check(DRACO_LIBRARY_DIR "@CMAKE_INSTALL_FULL_LIBDIR@")
set(DRACO_LIBRARY @DRACO_TARGETS@)
51 changes: 29 additions & 22 deletions cmake/draco_install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,6 @@ macro(draco_setup_install_target)
"${draco_build}/draco.pc" @ONLY NEWLINE_STYLE UNIX)
install(FILES "${draco_build}/draco.pc" DESTINATION "${libs_path}/pkgconfig")

# CMake config: draco-config.cmake
set(DRACO_INCLUDE_DIR "${includes_path}")
configure_package_config_file(
"${draco_root}/cmake/draco-config.cmake.template"
"${draco_build}/draco-config.cmake"
INSTALL_DESTINATION "${data_path}/cmake")
install(
FILES "${draco_build}/draco-config.cmake"
DESTINATION "${data_path}/cmake")

# CMake version: draco-version.cmake
write_basic_package_version_file(
"${draco_build}/draco-version.cmake"
VERSION ${DRACO_VERSION}
COMPATIBILITY AnyNewerVersion)
install(
FILES "${draco_build}/draco-version.cmake"
DESTINATION "${data_path}/cmake")

foreach(file ${draco_sources})
if(file MATCHES "h$")
list(APPEND draco_api_includes ${file})
Expand Down Expand Up @@ -80,15 +61,41 @@ macro(draco_setup_install_target)
install(TARGETS draco_encoder DESTINATION "${bin_path}")

if(MSVC)
install(TARGETS draco DESTINATION "${libs_path}")
install(TARGETS draco DESTINATION "${libs_path}" EXPORT dracoTargets)
set(DRACO_TARGETS draco::draco)
else()
install(TARGETS draco_static DESTINATION "${libs_path}")
install(TARGETS draco_static DESTINATION "${libs_path}" EXPORT dracoTargets)
set(DRACO_TARGETS draco::draco_static)

if(BUILD_SHARED_LIBS)
install(TARGETS draco_shared DESTINATION "${libs_path}")
install(TARGETS draco_shared DESTINATION "${libs_path}" EXPORT dracoTargets)
set(DRACO_TARGETS ${DRACO_TARGETS} draco::draco_shared)
endif()
endif()

install(EXPORT dracoTargets
NAMESPACE draco::
DESTINATION ${data_path}/cmake)

# CMake config: draco-config.cmake
set(DRACO_INCLUDE_DIR "${includes_path}")
configure_package_config_file(
"${draco_root}/cmake/draco-config.cmake.template"
"${draco_build}/draco-config.cmake"
INSTALL_DESTINATION "${data_path}/cmake")
install(
FILES "${draco_build}/draco-config.cmake"
DESTINATION "${data_path}/cmake")

# CMake version: draco-version.cmake
write_basic_package_version_file(
"${draco_build}/draco-version.cmake"
VERSION ${DRACO_VERSION}
COMPATIBILITY AnyNewerVersion)
install(
FILES "${draco_build}/draco-version.cmake"
DESTINATION "${data_path}/cmake")

if(DRACO_UNITY_PLUGIN)
install(TARGETS dracodec_unity DESTINATION "${libs_path}")
endif()
Expand Down