[mapguide-commits] r9420 - trunk/MgDev/Server/src/Core

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-12-07 23:45:34 -0800 (Fri, 07 Dec 2018)
New Revision: 9420

Modified:
   trunk/MgDev/Server/src/Core/CMakeLists.txt
Log:
#2785: Ensure correct rpath for mgserver for 64-bit

Modified: trunk/MgDev/Server/src/Core/CMakeLists.txt
===================================================================
--- trunk/MgDev/Server/src/Core/CMakeLists.txt	2018-12-07 13:12:24 UTC (rev 9419)
+++ trunk/MgDev/Server/src/Core/CMakeLists.txt	2018-12-08 07:45:34 UTC (rev 9420)
@@ -123,4 +123,8 @@
 install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_upgrade DESTINATION ${MG_SERVER_BIN_DIR})
 install(PROGRAMS ${MG_OEM_WORK_DIR}/dbxml/install/bin/db_verify DESTINATION ${MG_SERVER_BIN_DIR})
 # When installed into $PREFIX/server/bin, it will auto find libraries under $PREFIX/lib and $PREFIX/server/lib
-set_target_properties(mgserver PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../lib")
\ No newline at end of file
+if(MG_CPU EQUAL 64)
+    set_target_properties(mgserver PROPERTIES INSTALL_RPATH "$ORIGIN/../lib64:$ORIGIN/../../lib64")
+else(MG_CPU EQUAL 64)
+    set_target_properties(mgserver PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../lib")
+endif(MG_CPU EQUAL 64)