[mapguide-commits] r9803 - in sandbox/jng/vanilla_swig: . Bindings Bindings/src Bindings/src/Bindings Bindings/src/Bindings/DotNet Bindings/src/Bindings/DotNet/Foundation Bindings/src/Bindings/DotNet/Geometry Bindings/src/Bindings/DotNet/MapGuideCommon Bindings/src/Bindings/DotNet/PlatformBase Bindings/src/Bindings/DotNet/Web Bindings/src/IMake Bindings/src/SwigCommon/DotNet Common cmake/modules
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Nov 26 07:14:39 PST 2020
Author: jng
Date: 2020-11-26 07:14:38 -0800 (Thu, 26 Nov 2020)
New Revision: 9803
Added:
sandbox/jng/vanilla_swig/Bindings/CMakeLists.txt
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/CMakeLists.txt
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/CMakeLists.txt
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/CMakeLists.txt
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/CMakeLists.txt
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/CMakeLists.txt
Modified:
sandbox/jng/vanilla_swig/Bindings/TODO.txt
sandbox/jng/vanilla_swig/Bindings/src/Bindings/CMakeLists.txt
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/CMakeLists.txt
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore.i
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore_split.i
sandbox/jng/vanilla_swig/Bindings/src/CMakeLists.txt
sandbox/jng/vanilla_swig/Bindings/src/IMake/CMakeLists.txt
sandbox/jng/vanilla_swig/Bindings/src/SwigCommon/DotNet/coreclr_compat.i
sandbox/jng/vanilla_swig/CMakeLists.txt
sandbox/jng/vanilla_swig/Common/CMakeLists.txt
sandbox/jng/vanilla_swig/cmake/modules/FindMapGuideThirdparty.cmake
Log:
Get Foundation .net glue library building on the Linux side
Added: sandbox/jng/vanilla_swig/Bindings/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/CMakeLists.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/CMakeLists.txt 2020-11-26 15:14:38 UTC (rev 9803)
@@ -0,0 +1 @@
+add_subdirectory(src)
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Bindings/TODO.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/TODO.txt 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/Bindings/TODO.txt 2020-11-26 15:14:38 UTC (rev 9803)
@@ -7,6 +7,7 @@
- [x] Check in test case admin tool
- [x] Consolidate Tools.sln into Bindings.sln
- [ ] Relocate/remove existing test code
+ - [ ] Move packages dir up to to top-level MgDev subdirectory and make sure nuget.config sources from this dir
- Split .net binding into the Foundation/Geometry/PlatformBase/MapGuideCommon/Web layout (https://github.com/jumpinjackie/mapguide-api-bindings/issues/18)
- [x] Add .targets files to each C# project so that native dlls are copied properly when consumed by legacy .net framework applications/libraries
- [x] Consolidate TestCommon and TestMapGuideApi .net projects to unified netstandard2.0 libraries
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/CMakeLists.txt 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/CMakeLists.txt 2020-11-26 15:14:38 UTC (rev 9803)
@@ -1,12 +1,7 @@
-if (WITH_DOTNET)
- add_subdirectory(DotNet)
-endif (WITH_DOTNET)
-if (WITH_JAVA)
- add_subdirectory(Java)
-endif (WITH_JAVA)
-if (WITH_PHP)
- add_subdirectory(Php)
-endif (WITH_PHP)
-# Needed for api binding generation
-file(COPY "Common" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY "MapGuideApi" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
+add_subdirectory(DotNet)
+#if (WITH_JAVA)
+# add_subdirectory(Java)
+#endif (WITH_JAVA)
+#if (WITH_PHP)
+# add_subdirectory(Php)
+#endif (WITH_PHP)
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/CMakeLists.txt 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/CMakeLists.txt 2020-11-26 15:14:38 UTC (rev 9803)
@@ -1,4 +1,4 @@
-project(MapGuideDotNetUnmanagedApi)
+#project(MapGuideDotNetUnmanagedApi)
include_directories(
${MG_COMMON_DIR}/MdfModel
@@ -13,91 +13,99 @@
${XERCESC_INCLUDE_DIR}
)
-set(DotNetUnmanagedApi_SRCS
- ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp
-)
+add_subdirectory(Foundation)
+add_subdirectory(Geometry)
+add_subdirectory(PlatformBase)
+add_subdirectory(MapGuideCommon)
+add_subdirectory(Web)
-add_library(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} SHARED ${DotNetUnmanagedApi_SRCS})
-add_dependencies(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} IMake)
-if (UNIX)
- add_definitions(-DDOTNETCORE)
-endif (UNIX)
-if (MSVC)
- add_definitions(-DSWIG_PUBLIC_API)
- add_definitions(/bigobj)
- set_target_properties(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${MG_DOTNET_OUTPUT_DIR} )
- set_target_properties(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${MG_DOTNET_OUTPUT_DIR} )
- set_target_properties(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${MG_DOTNET_OUTPUT_DIR} )
-endif (MSVC)
+#set(DotNetUnmanagedApi_SRCS
+# ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp
+#)
+#
+#add_library(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} SHARED ${DotNetUnmanagedApi_SRCS})
+#add_dependencies(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} IMake)
+#if (UNIX)
+# add_definitions(-DDOTNETCORE)
+#endif (UNIX)
+#if (MSVC)
+# add_definitions(-DSWIG_PUBLIC_API)
+# add_definitions(/bigobj)
+# set_target_properties(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${MG_DOTNET_OUTPUT_DIR} )
+# set_target_properties(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${MG_DOTNET_OUTPUT_DIR} )
+# set_target_properties(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${MG_DOTNET_OUTPUT_DIR} )
+#endif (MSVC)
+#
+#set(IMAKE_RELATIVE_RESOLUTION "-r ${CMAKE_CURRENT_SOURCE_DIR}")
+#if (UNIX)
+# set(IMAKE_RELATIVE_RESOLUTION "-a")
+#endif (UNIX)
+#
+#set(SWIG_DOTNET_DEFS "")
+#if (WIN32)
+# set(SWIG_DOTNET_DEFS "-DWIN32")
+#endif (WIN32)
+#
+#message(STATUS "Using IMake at: ${IMAKE_TOOL}")
+#add_custom_command(OUTPUT ${DotNetUnmanagedApi_SRCS}
+# COMMAND ${CMAKE_COMMAND} -E echo Removing: ${MG_DOTNET_PROJECT_DIR}/*.cs
+# COMMAND ${CMAKE_COMMAND} -E remove -f
+# ${MG_DOTNET_PROJECT_DIR}/*.cs
+# COMMAND ${CMAKE_COMMAND} -E echo Regenerating: ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+# COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_BINARY_DIR}/../MapGuideApi/Constants.xml
+# -l "C#"
+# ${IMAKE_RELATIVE_RESOLUTION}
+# -o ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+# -t
+# COMMAND ${CMAKE_COMMAND} -E copy
+# ${CMAKE_CURRENT_BINARY_DIR}/dotnetcore.i
+# ${CMAKE_CURRENT_BINARY_DIR}/language.i
+# COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_BINARY_DIR}/../MapGuideApi/MapGuideApiGen.xml
+# -l "C#"
+# ${IMAKE_RELATIVE_RESOLUTION}
+# -o ${CMAKE_CURRENT_BINARY_DIR}
+# COMMAND ${CMAKE_COMMAND} -E echo Running SWIG [DotNet]. Output Dir: ${MG_DOTNET_PROJECT_DIR}
+# COMMAND ${SWIG_TOOL} -c++ -csharp
+# ${SWIG_DOTNET_DEFS} -DDOTNETCORE -DSWIG_CSHARP_NO_EXCEPTION_HELPER
+# -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER
+# -namespace OSGeo.MapGuide
+# -nodefaultctor -nodefaultdtor
+# -module MapGuideDotNetUnmanagedApi
+# -o "${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp"
+# -outdir "${MG_DOTNET_PROJECT_DIR}"
+# "${CMAKE_CURRENT_BINARY_DIR}/MapGuideApi.i"
+# COMMAND ${CMAKE_COMMAND} -E remove -f
+# ${MG_DOTNET_PROJECT_DIR}/MapGuideDotNetUnmanagedApi.cs
+#)
+#
+#target_link_libraries(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX}
+# ${ACE_LIBRARY}
+# ${MG_FOUNDATION_LIBRARY}
+# ${MG_GEOMETRY_LIBRARY}
+# ${MG_PLATFORMBASE_LIBRARY}
+# ${MG_COMMON_LIBRARY}
+# ${MG_HTTPHANDLER_LIBRARY}
+# ${MG_WEBAPP_LIBRARY}
+# ${MG_MDFMODEL_LIBRARY}
+# ${MG_MDFPARSER_LIBRARY}
+# ${MG_WEBSUPPORT_LIBRARY}
+# #MgFoundation${MG_VERSION_SUFFIX}
+# #MgGeometry${MG_VERSION_SUFFIX}
+# #MgPlatformBase${MG_VERSION_SUFFIX}
+# #MgMapGuideCommon${MG_VERSION_SUFFIX}
+# #MgHttpHandler${MG_VERSION_SUFFIX}
+# #MgMdfModel${MG_VERSION_SUFFIX}
+# #MgMdfParser${MG_VERSION_SUFFIX}
+# ${XERCESC_LIBRARIES}
+# #MgWebApp${MG_VERSION_SUFFIX}
+#)
+#
+## Only needed for Linux
+#if (UNIX)
+# file(COPY "InitializeWebTier.cpp" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+# install( TARGETS MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} DESTINATION ${MG_DOTNET_OUTPUT_DIR})
+#endif (UNIX)
+#
+#file(COPY "dotnetcore.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-set(IMAKE_RELATIVE_RESOLUTION "-r ${CMAKE_CURRENT_SOURCE_DIR}")
-if (UNIX)
- set(IMAKE_RELATIVE_RESOLUTION "-a")
-endif (UNIX)
-
-set(SWIG_DOTNET_DEFS "")
-if (WIN32)
- set(SWIG_DOTNET_DEFS "-DWIN32")
-endif (WIN32)
-
-message(STATUS "Using IMake at: ${IMAKE_TOOL}")
-add_custom_command(OUTPUT ${DotNetUnmanagedApi_SRCS}
- COMMAND ${CMAKE_COMMAND} -E echo Removing: ${MG_DOTNET_PROJECT_DIR}/*.cs
- COMMAND ${CMAKE_COMMAND} -E remove -f
- ${MG_DOTNET_PROJECT_DIR}/*.cs
- COMMAND ${CMAKE_COMMAND} -E echo Regenerating: ${MG_DOTNET_PROJECT_DIR}/Constants.cs
- COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_BINARY_DIR}/../MapGuideApi/Constants.xml
- -l "C#"
- ${IMAKE_RELATIVE_RESOLUTION}
- -o ${MG_DOTNET_PROJECT_DIR}/Constants.cs
- -t
- COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_CURRENT_BINARY_DIR}/dotnetcore.i
- ${CMAKE_CURRENT_BINARY_DIR}/language.i
- COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_BINARY_DIR}/../MapGuideApi/MapGuideApiGen.xml
- -l "C#"
- ${IMAKE_RELATIVE_RESOLUTION}
- -o ${CMAKE_CURRENT_BINARY_DIR}
- COMMAND ${CMAKE_COMMAND} -E echo Running SWIG [DotNet]. Output Dir: ${MG_DOTNET_PROJECT_DIR}
- COMMAND ${SWIG_TOOL} -c++ -csharp
- ${SWIG_DOTNET_DEFS} -DDOTNETCORE -DSWIG_CSHARP_NO_EXCEPTION_HELPER
- -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER
- -namespace OSGeo.MapGuide
- -nodefaultctor -nodefaultdtor
- -module MapGuideDotNetUnmanagedApi
- -o "${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp"
- -outdir "${MG_DOTNET_PROJECT_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/MapGuideApi.i"
- COMMAND ${CMAKE_COMMAND} -E remove -f
- ${MG_DOTNET_PROJECT_DIR}/MapGuideDotNetUnmanagedApi.cs
-)
-
-target_link_libraries(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX}
- ${ACE_LIBRARY}
- ${MG_FOUNDATION_LIBRARY}
- ${MG_GEOMETRY_LIBRARY}
- ${MG_PLATFORMBASE_LIBRARY}
- ${MG_COMMON_LIBRARY}
- ${MG_HTTPHANDLER_LIBRARY}
- ${MG_WEBAPP_LIBRARY}
- ${MG_MDFMODEL_LIBRARY}
- ${MG_MDFPARSER_LIBRARY}
- ${MG_WEBSUPPORT_LIBRARY}
- #MgFoundation${MG_VERSION_SUFFIX}
- #MgGeometry${MG_VERSION_SUFFIX}
- #MgPlatformBase${MG_VERSION_SUFFIX}
- #MgMapGuideCommon${MG_VERSION_SUFFIX}
- #MgHttpHandler${MG_VERSION_SUFFIX}
- #MgMdfModel${MG_VERSION_SUFFIX}
- #MgMdfParser${MG_VERSION_SUFFIX}
- ${XERCESC_LIBRARIES}
- #MgWebApp${MG_VERSION_SUFFIX}
-)
-
-# Only needed for Linux
-if (UNIX)
- file(COPY "InitializeWebTier.cpp" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
- install( TARGETS MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} DESTINATION ${MG_DOTNET_OUTPUT_DIR})
-endif (UNIX)
-
-file(COPY "dotnetcore.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
+file(COPY "dotnetcore_split.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
Added: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/CMakeLists.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/CMakeLists.txt 2020-11-26 15:14:38 UTC (rev 9803)
@@ -0,0 +1,79 @@
+project(FoundationUnmanagedApi)
+
+set(FoundationUnmanagedApi_SRCS
+ ${CMAKE_CURRENT_BINARY_DIR}/FoundationUnmanagedApi_wrap.cpp
+)
+
+file(COPY "InitializeLibrary.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
+add_library(FoundationUnmanagedApi SHARED ${FoundationUnmanagedApi_SRCS})
+add_dependencies(FoundationUnmanagedApi IMake)
+if (UNIX)
+ add_definitions(-DDOTNETCORE)
+ # NOTE: We don't care where this source is generated because the C# source is only built on windows
+ set(MG_DOTNET_PROJECT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ set_target_properties(FoundationUnmanagedApi PROPERTIES INSTALL_RPATH "$ORIGIN")
+endif (UNIX)
+if (MSVC)
+ add_definitions(-DSWIG_PUBLIC_API)
+ add_definitions(/bigobj)
+ set_target_properties(FoundationUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${MG_DOTNET_OUTPUT_DIR} )
+ set_target_properties(FoundationUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${MG_DOTNET_OUTPUT_DIR} )
+ set_target_properties(FoundationUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${MG_DOTNET_OUTPUT_DIR} )
+endif (MSVC)
+
+set(IMAKE_RELATIVE_RESOLUTION "-r ${CMAKE_CURRENT_SOURCE_DIR}")
+if (UNIX)
+ set(IMAKE_RELATIVE_RESOLUTION "-a")
+endif (UNIX)
+
+set(SWIG_DOTNET_DEFS "")
+if (WIN32)
+ set(SWIG_DOTNET_DEFS "-DWIN32")
+endif (WIN32)
+
+message(STATUS "Using IMake at: ${IMAKE_TOOL}")
+add_custom_command(OUTPUT ${FoundationUnmanagedApi_SRCS}
+ COMMAND ${CMAKE_COMMAND} -E echo Removing: ${MG_DOTNET_PROJECT_DIR}/*.cs
+ COMMAND ${CMAKE_COMMAND} -E remove -f
+ ${MG_DOTNET_PROJECT_DIR}/*.cs
+ COMMAND ${CMAKE_COMMAND} -E echo Regenerating: ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+ COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_SOURCE_DIR}/FoundationConstants.xml
+ -l "C#"
+ ${IMAKE_RELATIVE_RESOLUTION}
+ -o ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+ -t
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_BINARY_DIR}/../dotnetcore_split.i
+ ${CMAKE_CURRENT_BINARY_DIR}/language.i
+ COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_SOURCE_DIR}/FoundationApiGen.xml
+ -l "C#"
+ -x "FoundationApi"
+ ${IMAKE_RELATIVE_RESOLUTION}
+ -o ${CMAKE_CURRENT_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} -E echo Running SWIG [DotNet]. Output Dir: ${MG_DOTNET_PROJECT_DIR}
+ COMMAND ${SWIG_EXECUTABLE} -c++ -csharp
+ ${SWIG_DOTNET_DEFS} -DDOTNETCORE -DSWIG_CSHARP_NO_EXCEPTION_HELPER
+ -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER
+ -namespace OSGeo.MapGuide
+ -nodefaultctor -nodefaultdtor
+ -module FoundationUnmanagedApi
+ -o "${CMAKE_CURRENT_BINARY_DIR}/FoundationUnmanagedApi_wrap.cpp"
+ -outdir "${MG_DOTNET_PROJECT_DIR}"
+ "${CMAKE_CURRENT_BINARY_DIR}/FoundationApi.i"
+)
+
+target_link_libraries(FoundationUnmanagedApi
+ ${ACE_LIBRARY}
+ MgFoundation${MG_VERSION_SUFFIX}
+ #MgGeometry${MG_VERSION_SUFFIX}
+ #MgPlatformBase${MG_VERSION_SUFFIX}
+ #MgMapGuideCommon${MG_VERSION_SUFFIX}
+ #MgHttpHandler${MG_VERSION_SUFFIX}
+ #MgMdfModel${MG_VERSION_SUFFIX}
+ #MgMdfParser${MG_VERSION_SUFFIX}
+ #MgWebApp${MG_VERSION_SUFFIX}
+ ${XERCESC_LIBRARIES}
+)
+
+install( TARGETS FoundationUnmanagedApi DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
\ No newline at end of file
Added: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/CMakeLists.txt
===================================================================
Added: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/CMakeLists.txt
===================================================================
Added: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/CMakeLists.txt
===================================================================
Added: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/CMakeLists.txt
===================================================================
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore.i
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore.i 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore.i 2020-11-26 15:14:38 UTC (rev 9803)
@@ -130,7 +130,7 @@
xstring u16String;
UnicodeString::UTF32toUTF16((const LCh*) $1.c_str(), u16String);
$result = mg_string_callback((int)(u16String.length()+1)*sizeof(LCh));
- XMLString::copyString((XMLCh*)$result, u16String.c_str());
+ MgUtil::copyString((XMLCh*)$result, u16String.c_str());
}
#endif
#else
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore_split.i
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore_split.i 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/dotnetcore_split.i 2020-11-26 15:14:38 UTC (rev 9803)
@@ -129,7 +129,7 @@
xstring u16String;
UnicodeString::UTF32toUTF16((const LCh*) $1.c_str(), u16String);
$result = mg_string_callback((int)(u16String.length()+1)*sizeof(LCh));
- XMLString::copyString((XMLCh*)$result, u16String.c_str());
+ MgUtil::copyString((XMLCh*)$result, u16String.c_str());
}
#endif
#else
Modified: sandbox/jng/vanilla_swig/Bindings/src/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/CMakeLists.txt 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/Bindings/src/CMakeLists.txt 2020-11-26 15:14:38 UTC (rev 9803)
@@ -1,2 +1,10 @@
+set(MG_COMPONENT ${MG_COMPONENT_COMMON})
+set_install_subdir("")
+
+find_package(SWIG 4.0)
+set(IMAKE_TOOL ${CMAKE_CURRENT_BINARY_DIR}/IMake/IMake)
+
+file(COPY "SwigCommon" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
add_subdirectory(IMake)
add_subdirectory(Bindings)
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Bindings/src/IMake/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/IMake/CMakeLists.txt 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/Bindings/src/IMake/CMakeLists.txt 2020-11-26 15:14:38 UTC (rev 9803)
@@ -1,6 +1,6 @@
project(IMake)
include_directories(
- ${TCLAP_INCLUDE}
+ ${TCLAP_INCLUDE_DIR}
)
set(IMake_SRCS
Modified: sandbox/jng/vanilla_swig/Bindings/src/SwigCommon/DotNet/coreclr_compat.i
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/SwigCommon/DotNet/coreclr_compat.i 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/Bindings/src/SwigCommon/DotNet/coreclr_compat.i 2020-11-26 15:14:38 UTC (rev 9803)
@@ -280,7 +280,7 @@
xstring u16String;
UnicodeString::UTF32toUTF16((const LCh*) clsName.c_str(), u16String);
result = mg_string_callback((int)(u16String.length()+1)*sizeof(LCh));
- XMLString::copyString((XMLCh*)result, u16String.c_str());
+ MgUtil::copyString((XMLCh*)result, u16String.c_str());
#endif
return result;
}
Modified: sandbox/jng/vanilla_swig/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/CMakeLists.txt 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/CMakeLists.txt 2020-11-26 15:14:38 UTC (rev 9803)
@@ -265,6 +265,7 @@
if (NOT MG_COMMON_SUBSET_ONLY)
add_subdirectory(UnitTest)
endif (NOT MG_COMMON_SUBSET_ONLY)
+add_subdirectory(Bindings)
if (WITH_DESKTOP)
add_subdirectory(Desktop)
Modified: sandbox/jng/vanilla_swig/Common/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Common/CMakeLists.txt 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/Common/CMakeLists.txt 2020-11-26 15:14:38 UTC (rev 9803)
@@ -46,6 +46,11 @@
DESTINATION ${MG_INSTALL_PREFIX}/include/Common
FILES_MATCHING PATTERN *.h
)
+ file(COPY "CoordinateSystem" DESTINATION ${CMAKE_CURRENT_BINARY_DIR} FILES_MATCHING PATTERN *.h)
+ file(COPY "Foundation" DESTINATION ${CMAKE_CURRENT_BINARY_DIR} FILES_MATCHING PATTERN *.h)
+ file(COPY "Geometry" DESTINATION ${CMAKE_CURRENT_BINARY_DIR} FILES_MATCHING PATTERN *.h)
+ file(COPY "MapGuideCommon" DESTINATION ${CMAKE_CURRENT_BINARY_DIR} FILES_MATCHING PATTERN *.h)
+ file(COPY "PlatformBase" DESTINATION ${CMAKE_CURRENT_BINARY_DIR} FILES_MATCHING PATTERN *.h)
endif (NOT MG_COMMON_SUBSET_ONLY)
configure_file(${CMAKE_MODULE_PATH}/../configs/ProductVersion.h.in ${MG_AUTO_GENERATED_HEADER_DIR}/ProductVersion.h)
Modified: sandbox/jng/vanilla_swig/cmake/modules/FindMapGuideThirdparty.cmake
===================================================================
--- sandbox/jng/vanilla_swig/cmake/modules/FindMapGuideThirdparty.cmake 2020-11-21 15:32:08 UTC (rev 9802)
+++ sandbox/jng/vanilla_swig/cmake/modules/FindMapGuideThirdparty.cmake 2020-11-26 15:14:38 UTC (rev 9803)
@@ -192,10 +192,11 @@
endif (INTERNAL_ZLIB)
find_package(FDO REQUIRED)
- find_package(TCLAP REQUIRED)
find_package(CppHttpLib REQUIRED)
find_package(LinuxApt REQUIRED)
find_package(DbXmlInternal REQUIRED)
find_package(Ant REQUIRED)
-endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
+endif (NOT MG_COMMON_SUBSET_ONLY)
+
+find_package(TCLAP REQUIRED)
\ No newline at end of file
More information about the mapguide-commits
mailing list