From 620e8fbdd11278e2e0e479591899f4acb2808355 Mon Sep 17 00:00:00 2001 From: Mathieu Labbe Date: Sat, 20 Dec 2014 14:14:35 -0500 Subject: [PATCH] using CMAKE_INSTALL_DATAROOTDIR variable instead of explicitly setting "share" --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba75b015..7d3ed098 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,9 +80,6 @@ IF(APPLE) ENDIF() ####### Build libraries as shared or static ####### -# It is a bit messed up on Windows between STATIC and SHARED, if we don't want -# to add UtiLite_DEFINITIONS in FindUtiLite.cmake... to know from 3rd party application if it needs to -# link dynamically [UTILITE_EXP __declspec( dllimport )] or statically (UTILITE_EXP "nothing"). OPTION( BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON ) @@ -214,7 +211,7 @@ install(FILES #### ### Install package.xml for catkin -install(FILES package.xml DESTINATION "share/${PROJECT_PREFIX}") +install(FILES package.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_PREFIX}") ####################### # CPACK (Packaging)