Index: SMESH-8.3.0.4/CMakeLists.txt
===================================================================
--- SMESH-8.3.0.4.orig/CMakeLists.txt
+++ SMESH-8.3.0.4/CMakeLists.txt
@@ -11,7 +11,11 @@ option(ENABLE_LIB_NAMING "Enable additio
option(BUILD_TESTS "Build unit tests" OFF)
option(NEW_NETGEN_INTERFACE "netgen >= 6.2.2004" OFF)
set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install" CACHE PATH "Installation directory.")
-set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
+#set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
+
+include(GNUInstallDirs)
+mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR)
+mark_as_advanced(CLEAR CMAKE_INSTALL_INCLUDEDIR)
# --------------------------------------------------------------------------- #
@@ -400,17 +404,17 @@ set_target_properties(${SMESH_LIBRARIES}
endif()
install(TARGETS ${SMESH_LIBRARIES}
- ARCHIVE DESTINATION "lib"
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION "bin"
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION "include/smesh")
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/smesh")
# Configuration file
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/SMESHConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/SMESHConfig.cmake @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SMESHConfig.cmake DESTINATION cmake)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SMESHConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
# --------------------------------------------------------------------------- #