[mapguide-commits] r9732 - in trunk/MgDev: Oem/DWFTK/develop/global/src/dwf Server/src/Common/Cache Server/src/Common/Manager Server/src/Services/Feature Server/src/Services/Resource

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-09-17 02:51:32 -0700 (Thu, 17 Sep 2020)
New Revision: 9732

Modified:
   trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt
   trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt
   trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt
   trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt
   trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt
Log:
Add missing RPATH for certain libraries

Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt	2020-09-17 09:51:07 UTC (rev 9731)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt	2020-09-17 09:51:32 UTC (rev 9732)
@@ -339,4 +339,6 @@
     -Wl,-Bsymbolic
     dwfcore-${DWFCORE_VERSION})
 
+set_target_properties(dwftk-${DWF_VERSION} PROPERTIES INSTALL_RPATH "$ORIGIN")
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
\ No newline at end of file

Modified: trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt	2020-09-17 09:51:07 UTC (rev 9731)
+++ trunk/MgDev/Server/src/Common/Cache/CMakeLists.txt	2020-09-17 09:51:32 UTC (rev 9732)
@@ -18,4 +18,10 @@
     MgFoundation${MG_VERSION_SUFFIX}
     MgPlatformBase${MG_VERSION_SUFFIX}
     MgMapGuideCommon${MG_VERSION_SUFFIX}
-)
\ No newline at end of file
+)
+
+if(MG_CPU EQUAL 64)
+    set_target_properties(MgServerCache${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib64:$ORIGIN/../../lib64")
+else(MG_CPU EQUAL 64)
+    set_target_properties(MgServerCache${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../lib")
+endif(MG_CPU EQUAL 64)
\ No newline at end of file

Modified: trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt	2020-09-17 09:51:07 UTC (rev 9731)
+++ trunk/MgDev/Server/src/Common/Manager/CMakeLists.txt	2020-09-17 09:51:32 UTC (rev 9732)
@@ -40,4 +40,10 @@
     MgMapGuideCommon${MG_VERSION_SUFFIX}
     MgServerThread${MG_VERSION_SUFFIX}
     MgServerCache${MG_VERSION_SUFFIX}
-)
\ No newline at end of file
+)
+
+if(MG_CPU EQUAL 64)
+    set_target_properties(MgServerManager${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib64:$ORIGIN/../../lib64")
+else(MG_CPU EQUAL 64)
+    set_target_properties(MgServerManager${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../lib")
+endif(MG_CPU EQUAL 64)
\ No newline at end of file

Modified: trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt	2020-09-17 09:51:07 UTC (rev 9731)
+++ trunk/MgDev/Server/src/Services/Feature/CMakeLists.txt	2020-09-17 09:51:32 UTC (rev 9732)
@@ -31,4 +31,10 @@
 target_link_libraries(MgServerFeatureService${MG_VERSION_SUFFIX}
     MgGwsCommon${MG_VERSION_SUFFIX}
     MgGwsQueryEngine${MG_VERSION_SUFFIX}
-)
\ No newline at end of file
+)
+
+if(MG_CPU EQUAL 64)
+    set_target_properties(MgServerFeatureService${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib64:$ORIGIN/../../lib64")
+else(MG_CPU EQUAL 64)
+    set_target_properties(MgServerFeatureService${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../lib")
+endif(MG_CPU EQUAL 64)
\ No newline at end of file

Modified: trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt	2020-09-17 09:51:07 UTC (rev 9731)
+++ trunk/MgDev/Server/src/Services/Resource/CMakeLists.txt	2020-09-17 09:51:32 UTC (rev 9732)
@@ -41,4 +41,10 @@
     minizip
 )
 install(TARGETS MgServerResourceService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
-install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerResourceService${MG_VERSION_SUFFIX}.so libMgServerResourceService.so ${MG_COMPONENT})
\ No newline at end of file
+install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerResourceService${MG_VERSION_SUFFIX}.so libMgServerResourceService.so ${MG_COMPONENT})
+
+if(MG_CPU EQUAL 64)
+    set_target_properties(MgServerResourceService${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib64:$ORIGIN/../../lib64")
+else(MG_CPU EQUAL 64)
+    set_target_properties(MgServerResourceService${MG_VERSION_SUFFIX} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../lib")
+endif(MG_CPU EQUAL 64)
\ No newline at end of file