Skip to content
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

Jump to bottom

lower case "open3d/3rdparty" intall dir #2083

Merged
merged 1 commit into from
Jul 17, 2020
Merged

lower case "open3d/3rdparty" intall dir #2083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions 3rdparty/find_dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function(build_3rdparty_library name)
)
endforeach()
target_include_directories(${name} PUBLIC
$<INSTALL_INTERFACE:${Open3D_INSTALL_INCLUDE_DIR}/${PROJECT_NAME}/3rdparty>
$<INSTALL_INTERFACE:${Open3D_INSTALL_INCLUDE_DIR}/open3d/3rdparty>
)
open3d_set_global_properties(${name})
set_target_properties(${name} PROPERTIES
Expand All @@ -110,7 +110,7 @@ function(build_3rdparty_library name)
)
endforeach()
target_include_directories(${name} INTERFACE
$<INSTALL_INTERFACE:${Open3D_INSTALL_INCLUDE_DIR}/${PROJECT_NAME}/3rdparty>
$<INSTALL_INTERFACE:${Open3D_INSTALL_INCLUDE_DIR}/open3d/3rdparty>
)
endif()
if(NOT BUILD_SHARED_LIBS OR arg_PUBLIC)
Expand All @@ -124,11 +124,11 @@ function(build_3rdparty_library name)
foreach(incl IN LISTS include_dirs)
if(arg_INCLUDE_ALL)
install(DIRECTORY ${incl}
DESTINATION ${Open3D_INSTALL_INCLUDE_DIR}/${PROJECT_NAME}/3rdparty
DESTINATION ${Open3D_INSTALL_INCLUDE_DIR}/open3d/3rdparty
)
else()
install(DIRECTORY ${incl}
DESTINATION ${Open3D_INSTALL_INCLUDE_DIR}/${PROJECT_NAME}/3rdparty
DESTINATION ${Open3D_INSTALL_INCLUDE_DIR}/open3d/3rdparty
FILES_MATCHING
PATTERN "*.h"
PATTERN "*.hpp"
Expand Down Expand Up @@ -210,10 +210,10 @@ function(import_3rdparty_library name)
endif()
target_include_directories(${name} SYSTEM INTERFACE $<BUILD_INTERFACE:${incl_path}>)
if(arg_PUBLIC OR arg_HEADER)
install(DIRECTORY ${arg_INCLUDE_DIR} DESTINATION ${Open3D_INSTALL_INCLUDE_DIR}/${PROJECT_NAME}/3rdparty
install(DIRECTORY ${arg_INCLUDE_DIR} DESTINATION ${Open3D_INSTALL_INCLUDE_DIR}/open3d/3rdparty
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp"
)
target_include_directories(${name} INTERFACE $<INSTALL_INTERFACE:${Open3D_INSTALL_INCLUDE_DIR}/${PROJECT_NAME}/3rdparty>)
target_include_directories(${name} INTERFACE $<INSTALL_INTERFACE:${Open3D_INSTALL_INCLUDE_DIR}/open3d/3rdparty>)
endif()
endif()
if(arg_LIBRARIES)
Expand Down