From 6f4e2fea829b5986863403d6a611c52c5ac8b2a9 Mon Sep 17 00:00:00 2001 From: raahilsha-z Date: Wed, 7 Jul 2021 16:00:30 -0400 Subject: [PATCH] pcl_utils --- cmake/pcl_utils.cmake | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake index d87d02da9..7c951bfd5 100644 --- a/cmake/pcl_utils.cmake +++ b/cmake/pcl_utils.cmake @@ -94,21 +94,12 @@ macro(SET_INSTALL_DIRS) if(NOT DEFINED LIB_INSTALL_DIR) set(LIB_INSTALL_DIR "lib") endif() - if(NOT ANDROID) - set(INCLUDE_INSTALL_ROOT - "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") - else() - set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir - endif() + set(INCLUDE_INSTALL_ROOT "include") set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl") set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") set(BIN_INSTALL_DIR "bin") set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig") - if(WIN32 AND NOT MINGW) - set(PCLCONFIG_INSTALL_DIR "cmake") - else() - set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") - endif() + set(PCLCONFIG_INSTALL_DIR "share/pcl") endmacro() -- 2.32.0.windows.1