[mapguide-commits] r9304 - in sandbox/jng/cmake_v2: . Common/Foundation Common/Geometry Common/MapGuideCommon Common/MdfModel Common/MdfParser Common/PlatformBase Common/Renderers Common/Stylization Desktop/MgDesktop Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops Server/src/Common/Base Server/src/Common/Cache Server/src/Common/Manager Server/src/Common/Thread Server/src/Gws/GwsCommon Server/src/Gws/GwsQueryEngine Server/src/Gws/GwsResource Server/src/Services/Drawing Server/src/Services/Feature Server/src/Services/Kml Server/src/Services/Mapping Server/src/Services/Profiling Server/src/Services/Rendering Server/src/Services/Resource Server/src/Services/ServerAdmin Server/src/Services/Site Server/src/Services/Tile Server/src/UnitTesting Web/src/ApacheAgent Web/src/HttpHandler Web/src/JavaApi Web/src/JavaApiEx Web/src/PhpApi Web/src/WebApp Web/src/WebSupport
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jan 9 23:33:01 PST 2018
Author: jng
Date: 2018-01-09 23:33:00 -0800 (Tue, 09 Jan 2018)
New Revision: 9304
Modified:
sandbox/jng/cmake_v2/CMakeLists.txt
sandbox/jng/cmake_v2/Common/Foundation/CMakeLists.txt
sandbox/jng/cmake_v2/Common/Geometry/CMakeLists.txt
sandbox/jng/cmake_v2/Common/MapGuideCommon/CMakeLists.txt
sandbox/jng/cmake_v2/Common/MdfModel/CMakeLists.txt
sandbox/jng/cmake_v2/Common/MdfParser/CMakeLists.txt
sandbox/jng/cmake_v2/Common/PlatformBase/CMakeLists.txt
sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt
sandbox/jng/cmake_v2/Common/Stylization/CMakeLists.txt
sandbox/jng/cmake_v2/Desktop/MgDesktop/CMakeLists.txt
sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/trialate.c
sandbox/jng/cmake_v2/Server/src/Common/Base/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Common/Cache/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Common/Manager/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Common/Thread/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Gws/GwsCommon/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Gws/GwsQueryEngine/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Gws/GwsResource/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/Drawing/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/Feature/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/Kml/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/Mapping/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/Profiling/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/Rendering/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/Resource/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/ServerAdmin/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/Site/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/Services/Tile/CMakeLists.txt
sandbox/jng/cmake_v2/Server/src/UnitTesting/CMakeLists.txt
sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt
sandbox/jng/cmake_v2/Web/src/HttpHandler/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
sandbox/jng/cmake_v2/Web/src/WebApp/CMakeLists.txt
sandbox/jng/cmake_v2/Web/src/WebSupport/CMakeLists.txt
sandbox/jng/cmake_v2/cmake_build.sh
Log:
Add asan support in cmake_build.sh. Remove unnecessary add_sanitizer() calls (it only seems to be needed on the entry executable. Also has some fixes for building in debug
Modified: sandbox/jng/cmake_v2/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -124,7 +124,7 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
endif(MG_CPU EQUAL 64)
- if (CMAKE_BUILD_TYPE MATCHES DEBUG)
+ if (CMAKE_BUILD_TYPE MATCHES Debug)
add_definitions(-DDEBUG -D_DEBUG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
Modified: sandbox/jng/cmake_v2/Common/Foundation/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/Foundation/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Common/Foundation/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -13,7 +13,6 @@
)
add_library(MgFoundation${MG_VERSION_SUFFIX} SHARED ${MgFoundation_SRCS})
-add_sanitizers(MgFoundation${MG_VERSION_SUFFIX})
target_link_libraries(MgFoundation${MG_VERSION_SUFFIX}
${ACE_LIBRARY}
Modified: sandbox/jng/cmake_v2/Common/Geometry/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/Geometry/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Common/Geometry/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -64,7 +64,6 @@
)
add_library(MgGeometry${MG_VERSION_SUFFIX} SHARED ${MgGeometry_SRCS})
-add_sanitizers(MgGeometry${MG_VERSION_SUFFIX})
target_link_libraries(MgGeometry${MG_VERSION_SUFFIX}
MgFoundation${MG_VERSION_SUFFIX}
Modified: sandbox/jng/cmake_v2/Common/MapGuideCommon/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/MapGuideCommon/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Common/MapGuideCommon/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -17,7 +17,6 @@
)
add_library(MgMapGuideCommon${MG_VERSION_SUFFIX} SHARED ${MgMapGuideCommon_SRCS})
-add_sanitizers(MgMapGuideCommon${MG_VERSION_SUFFIX})
target_link_libraries(MgMapGuideCommon${MG_VERSION_SUFFIX}
${ACE_LIBRARY}
Modified: sandbox/jng/cmake_v2/Common/MdfModel/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/MdfModel/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Common/MdfModel/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -118,7 +118,6 @@
)
add_library(MgMdfModel${MG_VERSION_SUFFIX} SHARED ${MgMdfModel_SRCS})
-add_sanitizers(MgMdfModel${MG_VERSION_SUFFIX})
install( TARGETS MgMdfModel${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
install_symlink( ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgMdfModel${MG_VERSION_SUFFIX}.so libMgMdfModel.so ${MG_COMPONENT} )
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Common/MdfParser/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/MdfParser/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Common/MdfParser/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -119,7 +119,6 @@
)
add_library(MgMdfParser${MG_VERSION_SUFFIX} SHARED ${MgMdfParser_SRCS})
-add_sanitizers(MgMdfParser${MG_VERSION_SUFFIX})
target_link_libraries(MgMdfParser${MG_VERSION_SUFFIX}
${XERCESC_LIBRARIES}
Modified: sandbox/jng/cmake_v2/Common/PlatformBase/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/PlatformBase/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Common/PlatformBase/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -15,7 +15,6 @@
)
add_library(MgPlatformBase${MG_VERSION_SUFFIX} SHARED ${MgPlatformBase_SRCS})
-add_sanitizers(MgPlatformBase${MG_VERSION_SUFFIX})
target_link_libraries(MgPlatformBase${MG_VERSION_SUFFIX}
${ACE_LIBRARY}
Modified: sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -55,7 +55,6 @@
add_definitions(-DDWFTK_BUILD_EXPAT)
add_library(MgRenderers${MG_VERSION_SUFFIX} SHARED ${MgRenderers_SRCS})
-add_sanitizers(MgRenderers${MG_VERSION_SUFFIX})
target_link_libraries(MgRenderers${MG_VERSION_SUFFIX}
${GD_LIBRARY}
Modified: sandbox/jng/cmake_v2/Common/Stylization/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/Stylization/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Common/Stylization/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -98,7 +98,6 @@
)
add_library(MgStylization${MG_VERSION_SUFFIX} SHARED ${MgStylization_SRCS})
-add_sanitizers(MgStylization${MG_VERSION_SUFFIX})
target_link_libraries(MgStylization${MG_VERSION_SUFFIX}
${FDO_EXPRESSIONENGINE_LIBRARY}
Modified: sandbox/jng/cmake_v2/Desktop/MgDesktop/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Desktop/MgDesktop/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Desktop/MgDesktop/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -30,7 +30,6 @@
add_definitions(-DDWFCORE_STATIC -DDWFTK_STATIC -DDWFTK_USE_DWFCORE_ZLIB -DDWFTK_BUILD_EXPAT -DWHIP_STATIC_LIB)
add_library(MgDesktop${MG_VERSION_SUFFIX} SHARED ${MgDesktop_SRCS})
-add_sanitizers(MgDesktop${MG_VERSION_SUFFIX})
install(TARGETS MgDesktop${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgDesktop${MG_VERSION_SUFFIX}.so libMgDesktop.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/trialate.c
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/trialate.c 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/hoops/trialate.c 2018-01-10 07:33:00 UTC (rev 9304)
@@ -1145,7 +1145,7 @@
* making no progress - uh oh
* you know what that means
*/
-#ifdef DEBUG
+#ifdef JEFFS_DEBUG
HI_Warning (HEC_POLYGON, HES_SELF_INTERSECTING_FACE,
"Encountered a badly self-intersecting or disjoint face");
#endif
@@ -1156,7 +1156,7 @@
/*
* rats.
*/
-#ifdef DEBUG
+#ifdef JEFFS_DEBUG
HI_Warning (HEC_POLYGON, HES_SELF_INTERSECTING_FACE,
"Encountered a badly self-intersecting or disjoint face");
#endif
@@ -1238,7 +1238,7 @@
/* sanity check - shouldn't be null for behaved figures */
if (current_edge == null) {
-#ifdef DEBUG
+#ifdef JEFFS_DEBUG
HI_Warning (HEC_POLYGON, HES_SELF_INTERSECTING_FACE,
"Encountered a badly self-intersecting or disjoint face");
#endif
Modified: sandbox/jng/cmake_v2/Server/src/Common/Base/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Common/Base/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Common/Base/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -14,7 +14,6 @@
)
add_library(MgServerBase${MG_VERSION_SUFFIX} SHARED ${MgServerBase_SRCS})
-add_sanitizers(MgServerBase${MG_VERSION_SUFFIX})
install(TARGETS MgServerBase${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerBase${MG_VERSION_SUFFIX}.so libMgServerBase.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/Server/src/Common/Cache/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Common/Cache/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Common/Cache/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -11,7 +11,6 @@
)
add_library(MgServerCache${MG_VERSION_SUFFIX} SHARED ${MgServerCache_SRCS})
-add_sanitizers(MgServerCache${MG_VERSIO_SUFFIX})
install(TARGETS MgServerCache${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerCache${MG_VERSION_SUFFIX}.so libMgServerCache.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/Server/src/Common/Manager/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Common/Manager/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Common/Manager/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -28,7 +28,6 @@
)
add_library(MgServerManager${MG_VERSION_SUFFIX} SHARED ${MgServerManager_SRCS})
-add_sanitizers(MgServerManager${MG_VERSION_SUFFIX})
install(TARGETS MgServerManager${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerManager${MG_VERSION_SUFFIX}.so libMgServerManager.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/Server/src/Common/Thread/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Common/Thread/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Common/Thread/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -12,7 +12,6 @@
)
add_library(MgServerThread${MG_VERSION_SUFFIX} SHARED ${MgServerThread_SRCS})
-add_sanitizers(MgServerThread${MG_VERSION_SUFFIX})
install(TARGETS MgServerThread${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerThread${MG_VERSION_SUFFIX}.so libMgServerThread.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/Server/src/Gws/GwsCommon/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Gws/GwsCommon/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Gws/GwsCommon/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -24,6 +24,5 @@
)
add_library(MgGwsCommon${MG_VERSION_SUFFIX} SHARED ${GwsCommon_SRCS})
-add_sanitizers(MgGwsCommon${MG_VERSION_SUFFIX})
install(TARGETS MgGwsCommon${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGwsCommon${MG_VERSION_SUFFIX}.so libMgGwsCommon.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Gws/GwsQueryEngine/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Gws/GwsQueryEngine/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Gws/GwsQueryEngine/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -50,6 +50,5 @@
)
add_library(MgGwsQueryEngine${MG_VERSION_SUFFIX} SHARED ${GwsQueryEngine_SRCS})
-add_sanitizers(MgGwsQueryEngine${MG_VERSION_SUFFIX})
install(TARGETS MgGwsQueryEngine${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGwsQueryEngine${MG_VERSION_SUFFIX}.so libMgGwsQueryEngine.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Gws/GwsResource/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Gws/GwsResource/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Gws/GwsResource/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -5,6 +5,5 @@
)
add_library(MgGwsResource${MG_VERSION_SUFFIX} SHARED ${GwsResource_SRCS})
-add_sanitizers(MgGwsResource${MG_VERSION_SUFFIX})
install(TARGETS MgGwsResource${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgGwsResource${MG_VERSION_SUFFIX}.so libMgGwsResource.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Services/Drawing/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/Drawing/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/Drawing/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -20,6 +20,5 @@
)
add_library(MgServerDrawingService${MG_VERSION_SUFFIX} SHARED ${MgServerDrawingService_SRCS})
-add_sanitizers(MgServerDrawingService${MG_VERSION_SUFFIX})
install(TARGETS MgServerDrawingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerDrawingService${MG_VERSION_SUFFIX}.so libMgServerDrawingService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Services/Feature/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/Feature/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/Feature/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -25,7 +25,6 @@
)
add_library(MgServerFeatureService${MG_VERSION_SUFFIX} SHARED ${MgServerFeatureService_SRCS})
-add_sanitizers(MgServerFeatureService${MG_VERSION_SUFFIX})
install(TARGETS MgServerFeatureService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerFeatureService${MG_VERSION_SUFFIX}.so libMgServerFeatureService.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/Server/src/Services/Kml/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/Kml/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/Kml/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -27,6 +27,5 @@
)
add_library(MgServerKmlService${MG_VERSION_SUFFIX} SHARED ${MgServerKmlService_SRCS})
-add_sanitizers(MgServerKmlService${MG_VERSION_SUFFIX})
install(TARGETS MgServerKmlService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerKmlService${MG_VERSION_SUFFIX}.so libMgServerKmlService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Services/Mapping/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/Mapping/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/Mapping/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -26,6 +26,5 @@
)
add_library(MgServerMappingService${MG_VERSION_SUFFIX} SHARED ${MgServerMappingService_SRCS})
-add_sanitizers(MgServerMappingService${MG_VERSION_SUFFIX})
install(TARGETS MgServerMappingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerMappingService${MG_VERSION_SUFFIX}.so libMgServerMappingService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Services/Profiling/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/Profiling/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/Profiling/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -19,6 +19,5 @@
)
add_library(MgServerProfilingService${MG_VERSION_SUFFIX} SHARED ${MgServerProfilingService_SRCS})
-add_sanitizers(MgServerProfilingService${MG_VERSION_SUFFIX})
install(TARGETS MgServerProfilingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerProfilingService${MG_VERSION_SUFFIX}.so libMgServerProfilingService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Services/Rendering/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/Rendering/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/Rendering/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -22,6 +22,5 @@
)
add_library(MgServerRenderingService${MG_VERSION_SUFFIX} SHARED ${MgServerRenderingService_SRCS})
-add_sanitizers(MgServerRenderingService${MG_VERSION_SUFFIX})
install(TARGETS MgServerRenderingService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerRenderingService${MG_VERSION_SUFFIX}.so libMgServerRenderingService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Services/Resource/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/Resource/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/Resource/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -24,7 +24,6 @@
)
add_library(MgServerResourceService${MG_VERSION_SUFFIX} SHARED ${MgServerResourceService_SRCS})
-add_sanitizers(MgServerResourceService${MG_VERSION_SUFFIX})
target_link_libraries(MgServerResourceService${MG_VERSION_SUFFIX}
MgFoundation${MG_VERSION_SUFFIX}
MgGeometry${MG_VERSION_SUFFIX}
Modified: sandbox/jng/cmake_v2/Server/src/Services/ServerAdmin/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/ServerAdmin/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/ServerAdmin/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -14,6 +14,5 @@
)
add_library(MgServerAdminService${MG_VERSION_SUFFIX} SHARED ${MgServerAdminService_SRCS})
-add_sanitizers(MgServerAdminService${MG_VERSION_SUFFIX})
install(TARGETS MgServerAdminService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerAdminService${MG_VERSION_SUFFIX}.so libMgServerAdminService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Services/Site/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/Site/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/Site/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -17,6 +17,5 @@
)
add_library(MgServerSiteService${MG_VERSION_SUFFIX} SHARED ${MgServerSiteService_SRCS})
-add_sanitizers(MgServerSiteService${MG_VERSION_SUFFIX})
install(TARGETS MgServerSiteService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerSiteService${MG_VERSION_SUFFIX}.so libMgServerSiteService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/Services/Tile/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/Services/Tile/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/Services/Tile/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -16,6 +16,5 @@
)
add_library(MgServerTileService${MG_VERSION_SUFFIX} SHARED ${MgServerTileService_SRCS})
-add_sanitizers(MgServerTileService${MG_VERSION_SUFFIX})
install(TARGETS MgServerTileService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerTileService${MG_VERSION_SUFFIX}.so libMgServerTileService.so ${MG_COMPONENT})
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Server/src/UnitTesting/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Server/src/UnitTesting/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Server/src/UnitTesting/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -45,7 +45,6 @@
)
add_library(MgUnitTesting${MG_VERSION_SUFFIX} SHARED ${MgUnitTesting_SRCS})
-add_sanitizers(MgUnitTesting${MG_VERSION_SUFFIX})
install(TARGETS MgUnitTesting${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgUnitTesting${MG_VERSION_SUFFIX}.so libMgUnitTesting.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Web/src/ApacheAgent/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -31,7 +31,6 @@
)
add_library(mod_mgmapagent${MG_VERSION_SUFFIX} SHARED ${mod_mgmapagent_SRCS})
-add_sanitizers(mod_mgmapagent${MG_VERSION_SUFFIX})
add_dependencies(mod_mgmapagent${MG_VERSION_SUFFIX} httpd)
install(TARGETS mod_mgmapagent${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
# Not using install_symlink macro here as install requirements are unique
Modified: sandbox/jng/cmake_v2/Web/src/HttpHandler/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/HttpHandler/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Web/src/HttpHandler/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -15,7 +15,6 @@
)
add_library(MgHttpHandler${MG_VERSION_SUFFIX} SHARED ${MgHttpHandler_SRCS})
-add_sanitizers(MgHttpHandler${MG_VERSION_SUFFIX})
install(TARGETS MgHttpHandler${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgHttpHandler${MG_VERSION_SUFFIX}.so libMgHttpHandler.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Web/src/JavaApi/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -59,7 +59,6 @@
)
add_library(MapGuideJavaApi${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApi_SRCS})
-add_sanitizers(MapGuideJavaApi${MG_VERSION_SUFFIX})
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-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Web/src/JavaApiEx/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -60,7 +60,6 @@
)
add_library(MapGuideJavaApiEx${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApiEx_SRCS})
-add_sanitizers(MapGuideJavaApiEx${MG_VERSION_SUFFIX})
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-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Web/src/PhpApi/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -55,7 +55,6 @@
)
add_library(php_MapGuideApi${MG_VERSION_SUFFIX} SHARED ${php_MapGuideApi_SRCS})
-add_sanitizers(php_MapGuideApi${MG_VERSION_SUFFIX})
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})
Modified: sandbox/jng/cmake_v2/Web/src/WebApp/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/WebApp/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Web/src/WebApp/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -39,7 +39,6 @@
)
add_library(MgWebApp${MG_VERSION_SUFFIX} SHARED ${MgWebApp_SRCS})
-add_sanitizers(MgWebApp${MG_VERSION_SUFFIX})
install(TARGETS MgWebApp${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgWebApp${MG_VERSION_SUFFIX}.so libMgWebApp.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/Web/src/WebSupport/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Web/src/WebSupport/CMakeLists.txt 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/Web/src/WebSupport/CMakeLists.txt 2018-01-10 07:33:00 UTC (rev 9304)
@@ -11,7 +11,6 @@
)
add_library(MgWebSupport${MG_VERSION_SUFFIX} SHARED ${MgWebSupport_SRCS})
-add_sanitizers(MgWebSupport${MG_VERSION_SUFFIX})
install(TARGETS MgWebSupport${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgWebSupport${MG_VERSION_SUFFIX}.so libMgWebSupport.so ${MG_COMPONENT})
Modified: sandbox/jng/cmake_v2/cmake_build.sh
===================================================================
--- sandbox/jng/cmake_v2/cmake_build.sh 2018-01-09 16:14:47 UTC (rev 9303)
+++ sandbox/jng/cmake_v2/cmake_build.sh 2018-01-10 07:33:00 UTC (rev 9304)
@@ -8,6 +8,7 @@
BUILD_LINUXAPT=0
#HAVE_SYSTEM_XERCES=0
USE_NINJA=0
+USE_ASAN=OFF
while [ $# -gt 0 ]; do # Until you run out of parameters...
case "$1" in
--cmake_build_dir)
@@ -21,11 +22,15 @@
--ninja)
USE_NINJA=1
;;
+ --with-asan)
+ USE_ASAN=ON
+ ;;
--help)
echo "Usage: $0 (options)"
echo "Options:"
echo " --cmake_build_dir [CMake build directory]"
echo " --oem_working_dir [installation directory]"
+ echo " --with-asan [build with ASAN]"
echo " --ninja [Use ninja build system]"
echo " --help [Display usage]"
exit
@@ -80,12 +85,12 @@
echo "Setting up CMake in: $CMAKE_BUILD_DIR"
cd $CMAKE_BUILD_DIR
if test $USE_NINJA -eq 1; then
- cmake -G Ninja $SOURCE_DIR -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DPHP_VER=${PHP_VER} -DHTTPD_VER=${HTTPD_VER} -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR
+ cmake -G Ninja $SOURCE_DIR -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=${PHP_VER} -DHTTPD_VER=${HTTPD_VER} -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR
check_build
ninja
check_build
else
- cmake $SOURCE_DIR -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DPHP_VER=${PHP_VER} -DHTTPD_VER=${HTTPD_VER} -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR
+ cmake $SOURCE_DIR -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=${PHP_VER} -DHTTPD_VER=${HTTPD_VER} -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR
check_build
make
check_build
More information about the mapguide-commits
mailing list