From ad7b8c67cd1dbb17efd7b85aa1d7f02d67ea31ee Mon Sep 17 00:00:00 2001 From: Nicholas Yue Date: Sat, 5 Aug 2017 14:19:37 -0700 Subject: [PATCH 1/2] Clean up superfluous directories draco/src in include The way header files are glob resulted in two additional directories being nested in include. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb5f71a..9d40f27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -816,10 +816,10 @@ else () # Collect all of the header files in the tree, and add an install rule for # each. - file(GLOB_RECURSE draco_headers RELATIVE ${draco_root} "*.h") + file(GLOB_RECURSE draco_headers RELATIVE ${draco_root}/src/draco "*.h") foreach (filename ${draco_headers}) get_filename_component(file_directory ${filename} DIRECTORY) - install(FILES ${filename} DESTINATION + install(FILES ./src/draco/${filename} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/draco/${file_directory}") endforeach() From 29f50ba31cb9d9b7429a491e4231f8724abc2039 Mon Sep 17 00:00:00 2001 From: tomfinegan Date: Mon, 7 Aug 2017 12:16:04 -0700 Subject: [PATCH 2/2] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d40f27..48e64da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -819,7 +819,7 @@ else () file(GLOB_RECURSE draco_headers RELATIVE ${draco_root}/src/draco "*.h") foreach (filename ${draco_headers}) get_filename_component(file_directory ${filename} DIRECTORY) - install(FILES ./src/draco/${filename} DESTINATION + install(FILES src/draco/${filename} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/draco/${file_directory}") endforeach()