[mapguide-commits] r9723 - in trunk/MgDev/Common: Foundation Geometry MapGuideCommon MdfModel MdfParser PlatformBase

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-08-25 05:03:57 -0700 (Tue, 25 Aug 2020)
New Revision: 9723

Modified:
   trunk/MgDev/Common/Foundation/CMakeLists.txt
   trunk/MgDev/Common/Geometry/CMakeLists.txt
   trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt
   trunk/MgDev/Common/MdfModel/CMakeLists.txt
   trunk/MgDev/Common/MdfParser/CMakeLists.txt
   trunk/MgDev/Common/PlatformBase/CMakeLists.txt
Log:
CMake: Set RPATH for common MG libs. Fixes #2817

Modified: trunk/MgDev/Common/Foundation/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/Foundation/CMakeLists.txt	2020-08-24 15:07:43 UTC (rev 9722)
+++ trunk/MgDev/Common/Foundation/CMakeLists.txt	2020-08-25 12:03:57 UTC (rev 9723)
@@ -22,6 +22,8 @@
     MgMdfParser${MG_VERSION_SUFFIX}
 )
 
+set_target_properties(MgFoundation${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+
 install( TARGETS MgFoundation${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
 install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgFoundation${MG_VERSION_SUFFIX}.so libMgFoundation.so ${MG_COMPONENT} )
 

Modified: trunk/MgDev/Common/Geometry/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/Geometry/CMakeLists.txt	2020-08-24 15:07:43 UTC (rev 9722)
+++ trunk/MgDev/Common/Geometry/CMakeLists.txt	2020-08-25 12:03:57 UTC (rev 9723)
@@ -73,5 +73,7 @@
     pthread
 )
 
+set_target_properties(MgGeometry${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+
 install( TARGETS MgGeometry${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
 install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGeometry${MG_VERSION_SUFFIX}.so libMgGeometry.so ${MG_COMPONENT} )
\ No newline at end of file

Modified: trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt	2020-08-24 15:07:43 UTC (rev 9722)
+++ trunk/MgDev/Common/MapGuideCommon/CMakeLists.txt	2020-08-25 12:03:57 UTC (rev 9723)
@@ -27,6 +27,8 @@
     MgSecurity${MG_VERSION_SUFFIX}
 )
 
+set_target_properties(MgMapGuideCommon${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+
 install(TARGETS MgMapGuideCommon${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
 install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMapGuideCommon${MG_VERSION_SUFFIX}.so libMgMapGuideCommon.so ${MG_COMPONENT})
 

Modified: trunk/MgDev/Common/MdfModel/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/MdfModel/CMakeLists.txt	2020-08-24 15:07:43 UTC (rev 9722)
+++ trunk/MgDev/Common/MdfModel/CMakeLists.txt	2020-08-25 12:03:57 UTC (rev 9723)
@@ -119,5 +119,7 @@
 
 add_library(MgMdfModel${MG_VERSION_SUFFIX} SHARED ${MgMdfModel_SRCS})
 
+set_target_properties(MgMdfModel${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+
 install( TARGETS MgMdfModel${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
 install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMdfModel${MG_VERSION_SUFFIX}.so libMgMdfModel.so ${MG_COMPONENT} )
\ No newline at end of file

Modified: trunk/MgDev/Common/MdfParser/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/MdfParser/CMakeLists.txt	2020-08-24 15:07:43 UTC (rev 9722)
+++ trunk/MgDev/Common/MdfParser/CMakeLists.txt	2020-08-25 12:03:57 UTC (rev 9723)
@@ -127,5 +127,7 @@
     MgMdfModel${MG_VERSION_SUFFIX}
 )
 
+set_target_properties(MgMdfParser${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+
 install( TARGETS MgMdfParser${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
 install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMdfParser${MG_VERSION_SUFFIX}.so libMgMdfParser.so ${MG_COMPONENT} )
\ No newline at end of file

Modified: trunk/MgDev/Common/PlatformBase/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/PlatformBase/CMakeLists.txt	2020-08-24 15:07:43 UTC (rev 9722)
+++ trunk/MgDev/Common/PlatformBase/CMakeLists.txt	2020-08-25 12:03:57 UTC (rev 9723)
@@ -26,5 +26,7 @@
     MgGeometry${MG_VERSION_SUFFIX}
 )
 
+set_target_properties(MgPlatformBase${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN")
+
 install( TARGETS MgPlatformBase${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
 install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgPlatformBase${MG_VERSION_SUFFIX}.so libMgPlatformBase.so ${MG_COMPONENT} )
\ No newline at end of file