[mapguide-commits] r9312 - in sandbox/jng/cmake_v2: Common/Renderers Oem/DWFTK/develop/global/src Oem/DWFTK/develop/global/src/dwf Oem/DWFTK/develop/global/src/dwf/w3dtk Oem/DWFTK/develop/global/src/dwf/whiptk Oem/DWFTK/develop/global/src/dwfcore
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jan 10 09:30:19 PST 2018
Author: jng
Date: 2018-01-10 09:30:19 -0800 (Wed, 10 Jan 2018)
New Revision: 9312
Removed:
sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/CMakeLists.txt
sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/whiptk/CMakeLists.txt
Modified:
sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt
sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt
sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt
sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/config.h.in
sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt
Log:
Turn dwfcore and dwftk artifacts into shared libraries with -BSymbolic (whiptk and w3dtk are folded into the dwftk so). Also ensure extra symbols that the existing configure script would define are also defined by us. Finally disable building internal JPEG support to avoid ld from having any ideas of using these functions instead of the ones from the system-installed libjpeg
Modified: sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt 2018-01-10 17:06:47 UTC (rev 9311)
+++ sandbox/jng/cmake_v2/Common/Renderers/CMakeLists.txt 2018-01-10 17:30:19 UTC (rev 9312)
@@ -62,10 +62,8 @@
${JPEG_LIBRARY}
${PNG_LIBRARY}
${AGG_LIBRARY}
- dwfcore
- dwftk
- dwfwhiptk
- dwfw3dtk
+ dwfcore-1.7.0
+ dwftk-7.7.0
MgStylization${MG_VERSION_SUFFIX}
)
Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt 2018-01-10 17:06:47 UTC (rev 9311)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/CMakeLists.txt 2018-01-10 17:30:19 UTC (rev 9312)
@@ -84,6 +84,14 @@
# Autotools does not define these in debug, and neither shall we
remove_definitions(-DDEBUG -D_DEBUG)
+# We don't use W3D, so we don't care about needing to build the internal libjpeg.
+# This will also help us avoid unexpected surprises if a system libjpeg is also loaded
+set (DISABLE_STREAM_JPEG 1)
+set (DWFTK_EXPORT_API 1)
+set (WHIP_USE_WCHAR_STRINGS 1)
+set (WHIPTOOL_CLIENT 1)
+set (DWFTK_USE_DWFCORE_ZLIB 1)
+
set (DWF_VERSION_MAJOR 7)
set (DWF_VERSION_MINOR 7)
set (DWF_VERSION_REV 0)
Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt 2018-01-10 17:06:47 UTC (rev 9311)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/CMakeLists.txt 2018-01-10 17:30:19 UTC (rev 9312)
@@ -1,8 +1,6 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/..)
-add_subdirectory(w3dtk)
-add_subdirectory(whiptk)
-
set (dwftk_SRCS
Toolkit.cpp
#dwfx
@@ -136,7 +134,193 @@
publisher/model/StyleSegment.cpp
publisher/plot/Plot.cpp
#w3dtk
+ w3dtk/BCompress.cpp
+ w3dtk/BCompressData.cpp
+ w3dtk/BEdgeBreakerCommon.cpp
+ w3dtk/BEdgeBreakerCompress.cpp
+ w3dtk/BEdgeBreakerDecompress.cpp
+ w3dtk/BOpcodeHandler.cpp
+ w3dtk/BOpcodeShell.cpp
+ w3dtk/BPointCloud.cpp
+ w3dtk/BPolyhedron.cpp
+ w3dtk/BPolyPoly.cpp
+ w3dtk/BStreamFileToolkit.cpp
+ w3dtk/W3DCamera.cpp
+ w3dtk/W3DStreamWriter.cpp
+ w3dtk/BPolyhedronAscii.cpp
+ w3dtk/BOpcodeShellAscii.cpp
+ w3dtk/BAscii.cpp
+ w3dtk/hoops/fastlod.c
+ w3dtk/hoops/mxmain.c
+ w3dtk/hoops/mxmath.c
+ w3dtk/hoops/mxmetric.c
+ w3dtk/hoops/mxmodel.c
+ w3dtk/hoops/mxqslim.c
+ w3dtk/hoops/mxtype.c
+ w3dtk/hoops/shellopt.cpp
+ w3dtk/hoops/trialate.c
+ # DISABLE_STREAM_JPEG
+ #w3dtk/jpeg/jcapimin.c
+ #w3dtk/jpeg/jcomapi.c
+ #w3dtk/jpeg/jdcoefct.c
+ #w3dtk/jpeg/jdpostct.c
+ #w3dtk/jpeg/jidctred.c
+ #w3dtk/jpeg/jcapistd.c
+ #w3dtk/jpeg/jcparam.c
+ #w3dtk/jpeg/jdcolor.c
+ #w3dtk/jpeg/jdsample.c
+ #w3dtk/jpeg/jccoefct.c
+ #w3dtk/jpeg/jcphuff.c
+ #w3dtk/jpeg/jddctmgr.c
+ #w3dtk/jpeg/jdtrans.c
+ #w3dtk/jpeg/jccolor.c
+ #w3dtk/jpeg/jcprepct.c
+ #w3dtk/jpeg/jdhuff.c
+ #w3dtk/jpeg/jerror.c
+ #w3dtk/jpeg/jcdctmgr.c
+ #w3dtk/jpeg/jcsample.c
+ #w3dtk/jpeg/jdinput.c
+ #w3dtk/jpeg/jfdctflt.c
+ #w3dtk/jpeg/jmemmgr.c
+ #w3dtk/jpeg/jchuff.c
+ #w3dtk/jpeg/jctrans.c
+ #w3dtk/jpeg/jdmainct.c
+ #w3dtk/jpeg/jfdctfst.c
+ #w3dtk/jpeg/jcinit.c
+ #w3dtk/jpeg/jdapimin.c
+ #w3dtk/jpeg/jdmarker.c
+ #w3dtk/jpeg/jfdctint.c
+ #w3dtk/jpeg/jmemnobs.c
+ #w3dtk/jpeg/jcmainct.c
+ #w3dtk/jpeg/jdapistd.c
+ #w3dtk/jpeg/jdmaster.c
+ #w3dtk/jpeg/jidctflt.c
+ #w3dtk/jpeg/jquant1.c
+ #w3dtk/jpeg/jcmarker.c
+ #w3dtk/jpeg/jdatadst.c
+ #w3dtk/jpeg/jdmerge.c
+ #w3dtk/jpeg/jidctfst.c
+ #w3dtk/jpeg/jquant2.c
+ #w3dtk/jpeg/jcmaster.c
+ #w3dtk/jpeg/jdatasrc.c
+ #w3dtk/jpeg/jdphuff.c
+ #w3dtk/jpeg/jidctint.c
+ #w3dtk/jpeg/jutils.c
+ w3dtk/utility/cache_memory_object.cpp
+ w3dtk/utility/huffman.cpp
+ w3dtk/utility/tempfile_utils.cpp
+ w3dtk/utility/utf_utils.cpp
+ w3dtk/utility/vconf.cpp
+ w3dtk/utility/vdlist.cpp
+ w3dtk/utility/vhash.cpp
+ w3dtk/utility/vlist.cpp
+ w3dtk/utility/vlogfile.cpp
#whiptk
+ whiptk/assert.cpp
+ whiptk/attribute.cpp
+ whiptk/attribute_url.cpp
+ whiptk/backgrnd.cpp
+ whiptk/blockref.cpp
+ whiptk/blockref_defs.cpp
+ whiptk/blockref_list.cpp
+ whiptk/code_page.cpp
+ whiptk/color.cpp
+ whiptk/colormap.cpp
+ whiptk/compdata.cpp
+ whiptk/contour_set.cpp
+ whiptk/contrastcolor.cpp
+ whiptk/convert_utf.cpp
+ whiptk/dashpat.cpp
+ whiptk/delineate.cpp
+ whiptk/directory.cpp
+ whiptk/dpat_list.cpp
+ whiptk/drawable.cpp
+ whiptk/dwfhead.cpp
+ whiptk/dwginfo.cpp
+ whiptk/ellipse.cpp
+ whiptk/embed.cpp
+ whiptk/embedded_font.cpp
+ whiptk/endofdwf.cpp
+ whiptk/file.cpp
+ whiptk/file_stats.cpp
+ whiptk/filetime.cpp
+ whiptk/fill.cpp
+ whiptk/fillpat.cpp
+ whiptk/font.cpp
+ whiptk/font_extension.cpp
+ whiptk/font_options.cpp
+ whiptk/gouraud_pointset.cpp
+ whiptk/gouraud_polyline.cpp
+ whiptk/gouraud_polytri.cpp
+ whiptk/group_begin.cpp
+ whiptk/group_end.cpp
+ whiptk/guid_list.cpp
+ whiptk/heuristics.cpp
+ whiptk/image.cpp
+ whiptk/informational.cpp
+ whiptk/inked_area.cpp
+ whiptk/layer.cpp
+ whiptk/layer_list.cpp
+ whiptk/linepat.cpp
+ whiptk/linestyle.cpp
+ whiptk/logical_point.cpp
+ whiptk/lweight.cpp
+ whiptk/lz77comp.cpp
+ whiptk/lz77decp.cpp
+ whiptk/macro_definition.cpp
+ whiptk/macro_draw.cpp
+ whiptk/macro_scale.cpp
+ whiptk/macro_index.cpp
+ whiptk/marksize.cpp
+ whiptk/marksymb.cpp
+ whiptk/matrix.cpp
+ whiptk/merge_control.cpp
+ whiptk/named_view.cpp
+ whiptk/named_view_list.cpp
+ whiptk/object.cpp
+ whiptk/object_node.cpp
+ whiptk/object_node_list.cpp
+ whiptk/object_stream.cpp
+ whiptk/opcode.cpp
+ whiptk/origin.cpp
+ whiptk/overpost.cpp
+ whiptk/pattern_scale.cpp
+ whiptk/pch.cpp
+ whiptk/penpat.cpp
+ whiptk/penpat_options.cpp
+ whiptk/plot_optimized.cpp
+ whiptk/plotinfo.cpp
+ whiptk/pnggroup4image.cpp
+ whiptk/pointset.cpp
+ whiptk/polygon.cpp
+ whiptk/polyline.cpp
+ whiptk/polymark.cpp
+ whiptk/polytri.cpp
+ whiptk/projection.cpp
+ whiptk/rendition.cpp
+ whiptk/rendopts.cpp
+ whiptk/signdata.cpp
+ whiptk/text.cpp
+ whiptk/text_background.cpp
+ whiptk/text_options.cpp
+ whiptk/text_halign.cpp
+ whiptk/text_valign.cpp
+ whiptk/timestamp.cpp
+ whiptk/trusted_font_list.cpp
+ whiptk/units.cpp
+ whiptk/unknown.cpp
+ whiptk/url.cpp
+ whiptk/url_list.cpp
+ whiptk/userdata.cpp
+ whiptk/usrfillpat.cpp
+ whiptk/usrhatchpat.cpp
+ whiptk/view.cpp
+ whiptk/viewport.cpp
+ whiptk/viewport_options.cpp
+ whiptk/visible.cpp
+ whiptk/wtstring.cpp
+ whiptk/class_factory.cpp
+ whiptk/w2d_class_factory.cpp
#XAML
#xps
xps/Constants.cpp
@@ -150,7 +334,9 @@
xps/XPSFontResourceExtractor.cpp
)
-add_library(dwftk STATIC ${dwftk_SRCS})
-target_link_libraries(dwftk dwfcore)
+add_library(dwftk-${DWF_VERSION} SHARED ${dwftk_SRCS})
+target_link_libraries(dwftk-${DWF_VERSION}
+ -Wl,-Bsymbolic
+ dwfcore-${DWFCORE_VERSION})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/config.h.in
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/config.h.in 2018-01-10 17:06:47 UTC (rev 9311)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/config.h.in 2018-01-10 17:30:19 UTC (rev 9312)
@@ -3,4 +3,10 @@
// This is a config.h template used by CMake
+#cmakedefine DISABLE_STREAM_JPEG @DISABLE_STREAM_JPEG@
+#cmakedefine DWFTK_EXPORT_API @DWFTK_EXPORT_API@
+#cmakedefine WHIP_USE_WCHAR_STRINGS @WHIP_USE_WCHAR_STRINGS@
+#cmakedefine WHIPTOOL_CLIENT @WHIPTOOL_CLIENT@
+#cmakedefine DWFTK_USE_DWFCORE_ZLIB @DWFTK_USE_DWFCORE_ZLIB@
+
#endif
\ No newline at end of file
Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/CMakeLists.txt 2018-01-10 17:06:47 UTC (rev 9311)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/w3dtk/CMakeLists.txt 2018-01-10 17:30:19 UTC (rev 9312)
@@ -1,89 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
-set (dwfw3dtk_SRCS
- BCompress.cpp
- BCompressData.cpp
- BEdgeBreakerCommon.cpp
- BEdgeBreakerCompress.cpp
- BEdgeBreakerDecompress.cpp
- BOpcodeHandler.cpp
- BOpcodeShell.cpp
- BPointCloud.cpp
- BPolyhedron.cpp
- BPolyPoly.cpp
- BStreamFileToolkit.cpp
- W3DCamera.cpp
- W3DStreamWriter.cpp
- BPolyhedronAscii.cpp
- BOpcodeShellAscii.cpp
- BAscii.cpp
- #hoops
- hoops/fastlod.c
- hoops/mxmain.c
- hoops/mxmath.c
- hoops/mxmetric.c
- hoops/mxmodel.c
- hoops/mxqslim.c
- hoops/mxtype.c
- hoops/shellopt.cpp
- hoops/trialate.c
- #jpeg
- jpeg/jcapimin.c
- jpeg/jcomapi.c
- jpeg/jdcoefct.c
- jpeg/jdpostct.c
- jpeg/jidctred.c
- jpeg/jcapistd.c
- jpeg/jcparam.c
- jpeg/jdcolor.c
- jpeg/jdsample.c
- jpeg/jccoefct.c
- jpeg/jcphuff.c
- jpeg/jddctmgr.c
- jpeg/jdtrans.c
- jpeg/jccolor.c
- jpeg/jcprepct.c
- jpeg/jdhuff.c
- jpeg/jerror.c
- jpeg/jcdctmgr.c
- jpeg/jcsample.c
- jpeg/jdinput.c
- jpeg/jfdctflt.c
- jpeg/jmemmgr.c
- jpeg/jchuff.c
- jpeg/jctrans.c
- jpeg/jdmainct.c
- jpeg/jfdctfst.c
- jpeg/jcinit.c
- jpeg/jdapimin.c
- jpeg/jdmarker.c
- jpeg/jfdctint.c
- jpeg/jmemnobs.c
- jpeg/jcmainct.c
- jpeg/jdapistd.c
- jpeg/jdmaster.c
- jpeg/jidctflt.c
- jpeg/jquant1.c
- jpeg/jcmarker.c
- jpeg/jdatadst.c
- jpeg/jdmerge.c
- jpeg/jidctfst.c
- jpeg/jquant2.c
- jpeg/jcmaster.c
- jpeg/jdatasrc.c
- jpeg/jdphuff.c
- jpeg/jidctint.c
- jpeg/jutils.c
- #utility
- utility/cache_memory_object.cpp
- utility/huffman.cpp
- utility/tempfile_utils.cpp
- utility/utf_utils.cpp
- utility/vconf.cpp
- utility/vdlist.cpp
- utility/vhash.cpp
- utility/vlist.cpp
- utility/vlogfile.cpp
-)
-
-add_library(dwfw3dtk STATIC ${dwfw3dtk_SRCS})
\ No newline at end of file
Deleted: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/whiptk/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/whiptk/CMakeLists.txt 2018-01-10 17:06:47 UTC (rev 9311)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwf/whiptk/CMakeLists.txt 2018-01-10 17:30:19 UTC (rev 9312)
@@ -1,113 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..
- ${CMAKE_CURRENT_SOURCE_DIR}/../../dwf)
-
-set (dwfwhiptk_SRCS
- assert.cpp
- attribute.cpp
- attribute_url.cpp
- backgrnd.cpp
- blockref.cpp
- blockref_defs.cpp
- blockref_list.cpp
- code_page.cpp
- color.cpp
- colormap.cpp
- compdata.cpp
- contour_set.cpp
- contrastcolor.cpp
- convert_utf.cpp
- dashpat.cpp
- delineate.cpp
- directory.cpp
- dpat_list.cpp
- drawable.cpp
- dwfhead.cpp
- dwginfo.cpp
- ellipse.cpp
- embed.cpp
- embedded_font.cpp
- endofdwf.cpp
- file.cpp
- file_stats.cpp
- filetime.cpp
- fill.cpp
- fillpat.cpp
- font.cpp
- font_extension.cpp
- font_options.cpp
- gouraud_pointset.cpp
- gouraud_polyline.cpp
- gouraud_polytri.cpp
- group_begin.cpp
- group_end.cpp
- guid_list.cpp
- heuristics.cpp
- image.cpp
- informational.cpp
- inked_area.cpp
- layer.cpp
- layer_list.cpp
- linepat.cpp
- linestyle.cpp
- logical_point.cpp
- lweight.cpp
- lz77comp.cpp
- lz77decp.cpp
- macro_definition.cpp
- macro_draw.cpp
- macro_scale.cpp
- macro_index.cpp
- marksize.cpp
- marksymb.cpp
- matrix.cpp
- merge_control.cpp
- named_view.cpp
- named_view_list.cpp
- object.cpp
- object_node.cpp
- object_node_list.cpp
- object_stream.cpp
- opcode.cpp
- origin.cpp
- overpost.cpp
- pattern_scale.cpp
- pch.cpp
- penpat.cpp
- penpat_options.cpp
- plot_optimized.cpp
- plotinfo.cpp
- pnggroup4image.cpp
- pointset.cpp
- polygon.cpp
- polyline.cpp
- polymark.cpp
- polytri.cpp
- projection.cpp
- rendition.cpp
- rendopts.cpp
- signdata.cpp
- text.cpp
- text_background.cpp
- text_options.cpp
- text_halign.cpp
- text_valign.cpp
- timestamp.cpp
- trusted_font_list.cpp
- units.cpp
- unknown.cpp
- url.cpp
- url_list.cpp
- userdata.cpp
- usrfillpat.cpp
- usrhatchpat.cpp
- view.cpp
- viewport.cpp
- viewport_options.cpp
- visible.cpp
- wtstring.cpp
- class_factory.cpp
- w2d_class_factory.cpp
-)
-
-add_library(dwfwhiptk STATIC ${dwfwhiptk_SRCS})
-target_link_libraries(dwfwhiptk dwfcore)
\ No newline at end of file
Modified: sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt
===================================================================
--- sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt 2018-01-10 17:06:47 UTC (rev 9311)
+++ sandbox/jng/cmake_v2/Oem/DWFTK/develop/global/src/dwfcore/CMakeLists.txt 2018-01-10 17:30:19 UTC (rev 9312)
@@ -104,16 +104,18 @@
zlib/zutil.c
)
-add_library(dwfcore STATIC ${dwfcore_SRCS})
+add_library(dwfcore-${DWFCORE_VERSION} SHARED ${dwfcore_SRCS})
if (NOT uuid-NOTFOUND)
- target_link_libraries(dwfcore
+ target_link_libraries(dwfcore-${DWFCORE_VERSION}
+ -Wl,-Bsymbolic
dl
pthread
uuid
)
else (NOT uuid-NOTFOUND)
- target_link_libraries(dwfcore
+ target_link_libraries(dwfcore-${DWFCORE_VERSION}
+ -Wl,-Bsymbolic
dl
pthread
)
More information about the mapguide-commits
mailing list