2017-06-15 06:46:30 +08:00
|
|
|
diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake
|
2018-11-29 10:20:09 +08:00
|
|
|
index f523dbc8c..a171b6d24 100644
|
2017-06-15 06:46:30 +08:00
|
|
|
--- a/cmake/pcl_utils.cmake
|
|
|
|
|
+++ b/cmake/pcl_utils.cmake
|
2018-11-29 10:20:09 +08:00
|
|
|
@@ -97,21 +97,12 @@ macro(SET_INSTALL_DIRS)
|
|
|
|
|
if (NOT DEFINED LIB_INSTALL_DIR)
|
|
|
|
|
set(LIB_INSTALL_DIR "lib")
|
2017-08-11 02:07:08 +08:00
|
|
|
endif (NOT DEFINED LIB_INSTALL_DIR)
|
2018-11-29 10:20:09 +08:00
|
|
|
- if(NOT ANDROID)
|
|
|
|
|
- set(INCLUDE_INSTALL_ROOT
|
|
|
|
|
- "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
|
|
|
|
- else(NOT ANDROID)
|
|
|
|
|
- set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir
|
|
|
|
|
- endif(NOT ANDROID)
|
|
|
|
|
+ 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}")
|
2017-06-15 06:46:30 +08:00
|
|
|
set(BIN_INSTALL_DIR "bin")
|
|
|
|
|
set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
|
2018-11-29 10:20:09 +08:00
|
|
|
- if(WIN32 AND NOT MINGW)
|
2017-06-15 06:46:30 +08:00
|
|
|
- set(PCLCONFIG_INSTALL_DIR "cmake")
|
2018-11-29 10:20:09 +08:00
|
|
|
- else(WIN32 AND NOT MINGW)
|
|
|
|
|
- set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
|
|
|
|
- endif(WIN32 AND NOT MINGW)
|
|
|
|
|
+ set(PCLCONFIG_INSTALL_DIR "share/pcl")
|
|
|
|
|
endmacro(SET_INSTALL_DIRS)
|
|
|
|
|
|
|
|
|
|
|
