[mapguide-commits] r9286 - in sandbox/jng/cmake_v2: . Web/src/JavaApi Web/src/JavaApiEx Web/src/PhpApi

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-01-06 22:35:46 -0800 (Sat, 06 Jan 2018)
New Revision: 9286

Modified:
   sandbox/jng/cmake_v2/CMakeLists.txt
   sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt
   sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt
   sandbox/jng/cmake_v2/Web/src/PhpApi/CMakeLists.txt
Log:
Fix CMake warnings on SWIG wrapper projects and ensure proper dependency chain on these projects

Modified: sandbox/jng/cmake_v2/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/CMakeLists.txt	2018-01-07 04:27:42 UTC (rev 9285)
+++ sandbox/jng/cmake_v2/CMakeLists.txt	2018-01-07 06:35:46 UTC (rev 9286)
@@ -59,7 +59,6 @@
 set(MG_SERVER_GWS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Server/src/Gws")
 
 set(MG_OEM_DBXML_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Oem/dbxml")
-set(MG_OEM_DBXML_WORKING_DIR "${CMAKE_CURRENT_BINARY_DIR}/Oem/dbxml")
 
 # Override install directory to match what the automake build does (/usr/local, rather than /usr/local/lib)
 set(MG_INSTALL_PREFIX "/usr/local/mapguideopensource-${MG_VERSION}")

Modified: sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt	2018-01-07 04:27:42 UTC (rev 9285)
+++ sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt	2018-01-07 06:35:46 UTC (rev 9286)
@@ -18,6 +18,9 @@
     ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp
 )
 
+set(DISPOSE_EXPR "((MgDisposable*)arg1)->Release()")
+set(RETHROW_EXPR "e->Raise()")
+
 add_custom_command(OUTPUT ${MapGuideJavaApi_SRCS}
     COMMAND ${CMAKE_COMMAND} -E remove -f 
             ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.class
@@ -38,8 +41,8 @@
             -package org.osgeo.mapguide 
             -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id 
             -catchallcode catchall.code 
-            -dispose \"((MgDisposable*)arg1)->Release()\" 
-            -rethrow \"e->Raise()\;\" 
+            -dispose \"${DISPOSE_EXPR}\" 
+            -rethrow \"${RETHROW_EXPR}\;\" 
             -nodefault -noconstants -module MapGuideJavaApi 
             -o ${MapGuideJavaApi_SRCS} 
             -lib ${SWIG_LIB_PATH} 
@@ -57,6 +60,7 @@
 )
 
 add_library(MapGuideJavaApi${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApi_SRCS})
+add_dependencies(MapGuideJavaApi${MG_VERSION_SUFFIX} swig IMake)
 install(TARGETS MapGuideJavaApi${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
 install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMapGuideJavaApi${MG_VERSION_SUFFIX}.so libMapGuideJavaApi.so ${MG_COMPONENT})
 

Modified: sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt	2018-01-07 04:27:42 UTC (rev 9285)
+++ sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt	2018-01-07 06:35:46 UTC (rev 9286)
@@ -18,6 +18,9 @@
     ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp
 )
 
+set(DISPOSE_EXPR "((MgDisposable*)arg1)->Release()")
+set(RETHROW_EXPR "e->Raise()")
+
 add_custom_command(OUTPUT ${MapGuideJavaApiEx_SRCS}
     COMMAND ${CMAKE_COMMAND} -E remove -f 
             ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.class
@@ -39,8 +42,8 @@
             -package org.osgeo.mapguide 
             -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id 
             -catchallcode catchall.code 
-            -dispose \"((MgDisposable*)arg1)->Release()\" 
-            -rethrow \"e->Raise()\;\" 
+            -dispose \"${DISPOSE_EXPR}\" 
+            -rethrow \"${RETHROW_EXPR}\;\" 
             -nodefault -noconstants -module MapGuideJavaApiEx 
             -o ${MapGuideJavaApiEx_SRCS} 
             -lib ${SWIG_LIB_PATH} 
@@ -58,6 +61,7 @@
 )
 
 add_library(MapGuideJavaApiEx${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApiEx_SRCS})
+add_dependencies(MapGuideJavaApiEx${MG_VERSION_SUFFIX} swig IMake)
 install(TARGETS MapGuideJavaApiEx${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
 install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMapGuideJavaApiEx${MG_VERSION_SUFFIX}.so libMapGuideJavaApiEx.so ${MG_COMPONENT})
 

Modified: sandbox/jng/cmake_v2/Web/src/PhpApi/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/PhpApi/CMakeLists.txt	2018-01-07 04:27:42 UTC (rev 9285)
+++ sandbox/jng/cmake_v2/Web/src/PhpApi/CMakeLists.txt	2018-01-07 06:35:46 UTC (rev 9286)
@@ -27,6 +27,9 @@
     ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp
 )
 
+set(DISPOSE_EXPR "((MgDisposable*)arg1)->Release()")
+set(RETHROW_EXPR "e->Raise()")
+
 add_custom_command(OUTPUT ${php_MapGuideApi_SRCS}
     COMMAND ${IMAKE_TOOL} -p ../MapGuideApi/MapGuideApiGen.xml
             -l PHP
@@ -44,8 +47,8 @@
     COMMAND ${SWIG_TOOL} -c++ -php -DPHPSWIG
             -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id 
             -catchallcode catchall.code 
-            -dispose \"((MgDisposable*)arg1)->Release()\" 
-            -rethrow \"e->Raise()\;\" 
+            -dispose \"${DISPOSE_EXPR}\" 
+            -rethrow \"${RETHROW_EXPR}\;\" 
             -nodefault
             -o ${php_MapGuideApi_SRCS} 
             -lib ${SWIG_LIB_PATH} 
@@ -53,6 +56,7 @@
 )
 
 add_library(php_MapGuideApi${MG_VERSION_SUFFIX} SHARED ${php_MapGuideApi_SRCS})
+add_dependencies(php_MapGuideApi${MG_VERSION_SUFFIX} swig IMake php)
 install(TARGETS php_MapGuideApi${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
 install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libphp_MapGuideApi${MG_VERSION_SUFFIX}.so libphp_MapGuideApi.so ${MG_COMPONENT})