[mapguide-commits] r9434 - in trunk/MgDev: Oem/LinuxApt Web/src/HttpHandler cmake/configs

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-01-02 14:36:27 -0800 (Wed, 02 Jan 2019)
New Revision: 9434

Modified:
   trunk/MgDev/Oem/LinuxApt/CMakeLists.txt
   trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt
   trunk/MgDev/cmake/configs/mapguide.conf.in
   trunk/MgDev/cmake/configs/tomcat_startup.sh.in
Log:
#2785: Ensure proper lib dir suffixes and absolute paths are stamped and make sure that if we're building against internal jsoncpp, that its libraries are also installed

Modified: trunk/MgDev/Oem/LinuxApt/CMakeLists.txt
===================================================================
--- trunk/MgDev/Oem/LinuxApt/CMakeLists.txt	2019-01-02 21:25:37 UTC (rev 9433)
+++ trunk/MgDev/Oem/LinuxApt/CMakeLists.txt	2019-01-02 22:36:27 UTC (rev 9434)
@@ -1,3 +1,10 @@
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+if (UNIX)
+    if (MG_CPU EQUAL 64)
+        set (LIB_SUFFIX "64")
+    endif (MG_CPU EQUAL 64)
+endif (UNIX)
+
 configure_file(${CMAKE_MODULE_PATH}/../configs/php.ini.in ${CMAKE_CURRENT_BINARY_DIR}/php.ini)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/php.ini DESTINATION ${MG_INSTALL_WEB_PREFIX}/php/lib COMPONENT ${MG_COMPONENT})
 

Modified: trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt	2019-01-02 21:25:37 UTC (rev 9433)
+++ trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt	2019-01-02 22:36:27 UTC (rev 9434)
@@ -26,4 +26,8 @@
     ${JsonCpp_LIBRARY}
     MgMdfModel${MG_VERSION_SUFFIX}
     MgMdfParser${MG_VERSION_SUFFIX}
-)
\ No newline at end of file
+)
+
+if (INTERNAL_JSON)
+    install(FILES ${MG_OEM_WORK_DIR}/jsoncpp/lib/liblib_json.so DESTINATION ${LIB_INSTALL_DIR})
+endif (INTERNAL_JSON)
\ No newline at end of file

Modified: trunk/MgDev/cmake/configs/mapguide.conf.in
===================================================================
--- trunk/MgDev/cmake/configs/mapguide.conf.in	2019-01-02 21:25:37 UTC (rev 9433)
+++ trunk/MgDev/cmake/configs/mapguide.conf.in	2019-01-02 22:36:27 UTC (rev 9434)
@@ -1,6 +1,6 @@
 # Environment variables for MapGuide
-SetEnv LD_LIBRARY_PATH "@MG_INSTALL_WEB_PREFIX_ABS@/lib:@MG_INSTALL_WEB_PREFIX_ABS@/php/lib:@MG_INSTALL_PREFIX@/lib"
-SetEnv MENTOR_DICTIONARY_PATH "@MG_INSTALL_COORDSYS_PREFIX@"
+SetEnv LD_LIBRARY_PATH "@MG_INSTALL_WEB_PREFIX_ABS@/lib at LIB_SUFFIX@:@MG_INSTALL_WEB_PREFIX_ABS@/php/lib:@MG_INSTALL_PREFIX@/lib at LIB_SUFFIX@"
+SetEnv MENTOR_DICTIONARY_PATH "@MG_INSTALL_COORDSYS_PREFIX_ABS@"
 
 LoadModule mgmapagent_module modules/mod_mgmapagent.so
 

Modified: trunk/MgDev/cmake/configs/tomcat_startup.sh.in
===================================================================
--- trunk/MgDev/cmake/configs/tomcat_startup.sh.in	2019-01-02 21:25:37 UTC (rev 9433)
+++ trunk/MgDev/cmake/configs/tomcat_startup.sh.in	2019-01-02 22:36:27 UTC (rev 9434)
@@ -17,7 +17,7 @@
 
 # Required for MapGuide integration
 export LD_LIBRARY_PATH=@MG_INSTALL_WEB_PREFIX_ABS@/lib at LIB_SUFFIX@:@MG_INSTALL_PREFIX@/lib at LIB_SUFFIX@
-export MENTOR_DICTIONARY_PATH=@MG_INSTALL_COORDSYS_PREFIX@
+export MENTOR_DICTIONARY_PATH=@MG_INSTALL_COORDSYS_PREFIX_ABS@
 export JAVA_OPTS="-Djava.library.path=@MG_INSTALL_WEB_PREFIX_ABS@/lib at LIB_SUFFIX@:@MG_INSTALL_PREFIX@/lib at LIB_SUFFIX@"
 
 # -----------------------------------------------------------------------------