[mapguide-commits] r9267 - in sandbox/jng/cmake_v2: Oem Oem/SWIGEx Server/src Server/src/UnitTesting

[svn_mapguide at osgeo.org]

Author: jng
Date: 2017-12-25 21:32:51 -0800 (Mon, 25 Dec 2017)
New Revision: 9267

Added:
   sandbox/jng/cmake_v2/Oem/SWIGEx/CMakeLists.txt
   sandbox/jng/cmake_v2/Server/src/UnitTesting/CMakeLists.txt
Modified:
   sandbox/jng/cmake_v2/Oem/CMakeLists.txt
   sandbox/jng/cmake_v2/Server/src/CMakeLists.txt
Log:
CMake-ify SWIG and server unit test library

Modified: sandbox/jng/cmake_v2/Oem/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/CMakeLists.txt	2017-12-26 04:48:58 UTC (rev 9266)
+++ sandbox/jng/cmake_v2/Oem/CMakeLists.txt	2017-12-26 05:32:51 UTC (rev 9267)
@@ -5,4 +5,5 @@
 #set(GEOS_ENABLE_TESTS OFF)
 #add_subdirectory(geos)
 add_subdirectory(DWFTK)
-add_subdirectory(CsMapLibrary)
\ No newline at end of file
+add_subdirectory(CsMapLibrary)
+add_subdirectory(SWIGEx)
\ No newline at end of file

Added: sandbox/jng/cmake_v2/Oem/SWIGEx/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/SWIGEx/CMakeLists.txt	                        (rev 0)
+++ sandbox/jng/cmake_v2/Oem/SWIGEx/CMakeLists.txt	2017-12-26 05:32:51 UTC (rev 9267)
@@ -0,0 +1,70 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Source/CParse
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/DOH
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/Include
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/Swig
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/Modules
+    ${CMAKE_CURRENT_SOURCE_DIR}/Source/Preprocessor
+)
+
+set(Swig_SRCS
+    Source/CParse/cscanner.c
+    Source/CParse/parser.c
+    Source/CParse/templ.c
+    Source/CParse/util.c
+    Source/DOH/base.c
+    Source/DOH/file.c
+    Source/DOH/fio.c
+    Source/DOH/hash.c
+    Source/DOH/list.c
+    Source/DOH/memory.c
+    Source/DOH/string.c
+    Source/DOH/void.c
+    Source/Modules/allocate.cxx
+    Source/Modules/browser.cxx
+    Source/Modules/chicken.cxx
+    Source/Modules/contract.cxx
+    Source/Modules/csharp.cxx
+    Source/Modules/directors.cxx
+    Source/Modules/emit.cxx
+    Source/Modules/guile.cxx
+    Source/Modules/java.cxx
+    Source/Modules/lang.cxx
+    Source/Modules/main.cxx
+    Source/Modules/module.cxx
+    Source/Modules/mzscheme.cxx
+    Source/Modules/ocaml.cxx
+    Source/Modules/overload.cxx
+    Source/Modules/perl5.cxx
+    Source/Modules/php4.cxx
+    Source/Modules/php5.cxx
+    Source/Modules/pike.cxx
+    Source/Modules/python.cxx
+    Source/Modules/ruby.cxx
+    Source/Modules/s-exp.cxx
+    Source/Modules/swigmain.cxx
+    Source/Modules/tcl8.cxx
+    Source/Modules/typepass.cxx
+    Source/Modules/utils.cxx
+    Source/Modules/xml.cxx
+    Source/Swig/cwrap.c
+    Source/Swig/error.c
+    Source/Swig/fragment.c
+    Source/Swig/getopt.c
+    Source/Swig/include.c
+    Source/Swig/misc.c
+    Source/Swig/naming.c
+    Source/Swig/parms.c
+    Source/Swig/scanner.c
+    Source/Swig/stype.c
+    Source/Swig/symbol.c
+    Source/Swig/tree.c
+    Source/Swig/typemap.c
+    Source/Swig/typeobj.c
+    Source/Swig/typesys.c
+    Source/Swig/warn.c
+    Source/Swig/wrapfunc.c
+    Source/Preprocessor/cpp.c
+    Source/Preprocessor/expr.c
+)
+
+add_executable(swig ${Swig_SRCS})
\ No newline at end of file

Modified: sandbox/jng/cmake_v2/Server/src/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/CMakeLists.txt	2017-12-26 04:48:58 UTC (rev 9266)
+++ sandbox/jng/cmake_v2/Server/src/CMakeLists.txt	2017-12-26 05:32:51 UTC (rev 9267)
@@ -2,6 +2,6 @@
 #add_subdirectory(Core)
 add_subdirectory(Gws)
 add_subdirectory(Services)
-#add_subdirectory(UnitTesting)
+add_subdirectory(UnitTesting)
 #add_subdirectory(Wfs)
 #add_subdirectory(Wms)
\ No newline at end of file

Added: sandbox/jng/cmake_v2/Server/src/UnitTesting/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/UnitTesting/CMakeLists.txt	                        (rev 0)
+++ sandbox/jng/cmake_v2/Server/src/UnitTesting/CMakeLists.txt	2017-12-26 05:32:51 UTC (rev 9267)
@@ -0,0 +1,51 @@
+include_directories(${ACE_INCLUDE_DIR}
+    ${CPPUNIT_INCLUDE_DIR}
+    ${MG_COMMON_DIR}/Foundation
+    ${MG_COMMON_DIR}/Geometry
+    ${MG_COMMON_DIR}/PlatformBase
+    ${MG_COMMON_DIR}/MapGuideCommon
+    ${MG_COMMON_DIR}/MdfModel
+    ${MG_COMMON_DIR}/MdfParser
+    ${MG_COMMON_DIR}/Stylization
+    ${MG_SERVER_COMMON_DIR}
+    ${MG_SERVER_COMMON_DIR}/Manager
+    ${MG_SERVER_SERVICES_DIR}/Feature
+    ${MG_SERVER_SERVICES_DIR}/Mapping
+    ${MG_SERVER_SERVICES_DIR}/Rendering
+    ${MG_SERVER_SERVICES_DIR}/Resource
+    ${MG_SERVER_SERVICES_DIR}/ServerAdmin
+    ${MG_SERVER_SERVICES_DIR}/Site
+    ${MG_SERVER_SERVICES_DIR}/Kml
+    ${MG_SERVER_SERVICES_DIR}/Tile
+    ${FDO_INCLUDE_DIR}
+)
+
+set(MgUnitTesting_SRCS
+    TestCoordinateSystem.cpp
+    TestDrawingService.cpp
+    TestFeatureService.cpp
+    TestGeometry.cpp
+    TestKmlService.cpp
+    TestLogManager.cpp
+    TestLogManagerThread.cpp
+    TestMappingService.cpp
+    TestMdfModel.cpp
+    TestPerformance.cpp
+    TestRenderingService.cpp
+    TestResourceService.cpp
+    TestServerAdminService.cpp
+    TestServerManager.cpp
+    TestServiceManager.cpp
+    TestSiteManager.cpp
+    TestSiteService.cpp
+    TestTileService.cpp
+    TestProfilingService.cpp
+    TestTransformMesh.cpp
+    UnitTesting.cpp
+)
+
+add_library(MgUnitTesting-${MG_VERSION} SHARED ${MgUnitTesting_SRCS})
+
+target_link_libraries(MgUnitTesting-${MG_VERSION}
+    ${CPPUNIT_LIBRARY}
+)
\ No newline at end of file