]> granicus.if.org Git - graphviz/log
graphviz
3 years agoemit_xdot: remove unnecessary bracketing
Matthew Fernandez [Mon, 30 Aug 2021 00:08:35 +0000 (17:08 -0700)]
emit_xdot: remove unnecessary bracketing

3 years agoinit_job_pagination: use fmax instead of open coding
Matthew Fernandez [Mon, 30 Aug 2021 00:05:37 +0000 (17:05 -0700)]
init_job_pagination: use fmax instead of open coding

3 years agoinit_job_pagination: remove unnecessary bracketing
Matthew Fernandez [Mon, 30 Aug 2021 00:05:26 +0000 (17:05 -0700)]
init_job_pagination: remove unnecessary bracketing

3 years agofirstlayer: remove unnecessary bracketing
Matthew Fernandez [Mon, 30 Aug 2021 00:01:19 +0000 (17:01 -0700)]
firstlayer: remove unnecessary bracketing

3 years agoinit_layering: remove unnecessary bracketing
Matthew Fernandez [Mon, 30 Aug 2021 00:00:08 +0000 (17:00 -0700)]
init_layering: remove unnecessary bracketing

3 years agomap_output_bspline: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:58:58 +0000 (16:58 -0700)]
map_output_bspline: remove unnecessary bracketing

3 years agobisect: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:58:09 +0000 (16:58 -0700)]
bisect: remove unnecessary bracketing

3 years agoisFilled: return a C99 bool instead of int
Matthew Fernandez [Sun, 29 Aug 2021 23:55:52 +0000 (16:55 -0700)]
isFilled: return a C99 bool instead of int

3 years agorename 'ifFilled' to 'isFilled'
Matthew Fernandez [Sun, 29 Aug 2021 23:52:34 +0000 (16:52 -0700)]
rename 'ifFilled' to 'isFilled'

From the leading comment, this is what it was intended to be called.

3 years agostripedBox: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:51:37 +0000 (16:51 -0700)]
stripedBox: remove unnecessary bracketing

3 years agowedgedEllipse: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:50:58 +0000 (16:50 -0700)]
wedgedEllipse: remove unnecessary bracketing

3 years agocheckClusterStyle: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:49:08 +0000 (16:49 -0700)]
checkClusterStyle: remove unnecessary bracketing

3 years agogetObjId: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:47:46 +0000 (16:47 -0700)]
getObjId: remove unnecessary bracketing

3 years agolayerPagePrefix: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:47:08 +0000 (16:47 -0700)]
layerPagePrefix: remove unnecessary bracketing

3 years agocolorseg_t: use a C99 bool for 'hasFraction' field
Matthew Fernandez [Sun, 29 Aug 2021 23:45:55 +0000 (16:45 -0700)]
colorseg_t: use a C99 bool for 'hasFraction' field

3 years agoisRect: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:45:14 +0000 (16:45 -0700)]
isRect: remove unnecessary bracketing

3 years agoisRect: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:44:45 +0000 (16:44 -0700)]
isRect: use a C99 bool return type instead of boolean

3 years agointerpretCRNL: use a C99 bool for 'backslash_seen' local
Matthew Fernandez [Sun, 29 Aug 2021 23:43:51 +0000 (16:43 -0700)]
interpretCRNL: use a C99 bool for 'backslash_seen' local

3 years agoremove some open coded NULLs
Matthew Fernandez [Sun, 29 Aug 2021 23:43:10 +0000 (16:43 -0700)]
remove some open coded NULLs

3 years agoparse_style: use a C99 bool for 'in_parens' local
Matthew Fernandez [Sun, 29 Aug 2021 23:41:27 +0000 (16:41 -0700)]
parse_style: use a C99 bool for 'in_parens' local

3 years agoparse_style: use a C99 bool for 'is_first' local
Matthew Fernandez [Sun, 29 Aug 2021 23:40:31 +0000 (16:40 -0700)]
parse_style: use a C99 bool for 'is_first' local

3 years agois_style_delim: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:39:39 +0000 (16:39 -0700)]
is_style_delim: use a C99 bool return type instead of boolean

3 years agonodeIntersect: use a C99 bool for 'explicit' local
Matthew Fernandez [Sun, 29 Aug 2021 23:38:37 +0000 (16:38 -0700)]
nodeIntersect: use a C99 bool for 'explicit' local

3 years agoemit_edge_graphics: use a C99 bool for 'tapered' local
Matthew Fernandez [Sun, 29 Aug 2021 23:37:32 +0000 (16:37 -0700)]
emit_edge_graphics: use a C99 bool for 'tapered' local

3 years agonode_in_box: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:36:47 +0000 (16:36 -0700)]
node_in_box: use a C99 bool return type instead of boolean

3 years agoclust_in_layer: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:35:53 +0000 (16:35 -0700)]
clust_in_layer: use a C99 bool return type instead of boolean

3 years agoedge_in_layer: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:35:05 +0000 (16:35 -0700)]
edge_in_layer: remove unnecessary bracketing

3 years agoedge_in_layer: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:34:42 +0000 (16:34 -0700)]
edge_in_layer: use a C99 bool return type instead of boolean

3 years agonode_in_layer: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:34:01 +0000 (16:34 -0700)]
node_in_layer: remove unnecessary bracketing

3 years agonode_in_layer: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:33:38 +0000 (16:33 -0700)]
node_in_layer: use a C99 bool return type instead of boolean

3 years agowrite_node_test: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:32:45 +0000 (16:32 -0700)]
write_node_test: use a C99 bool return type instead of boolean

3 years agowrite_edge_test: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:32:10 +0000 (16:32 -0700)]
write_edge_test: use a C99 bool return type instead of boolean

3 years agovalidpage: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:31:34 +0000 (16:31 -0700)]
validpage: remove unnecessary bracketing

3 years agovalidpage: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:30:57 +0000 (16:30 -0700)]
validpage: use a C99 bool return type instead of boolean

3 years agovalidlayer: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:30:16 +0000 (16:30 -0700)]
validlayer: remove unnecessary bracketing

3 years agovalidlayer: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:29:57 +0000 (16:29 -0700)]
validlayer: use a C99 bool return type instead of boolean

3 years agoselectedLayer: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:29:28 +0000 (16:29 -0700)]
selectedLayer: remove unnecessary bracketing

3 years agoselectedLayer: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:28:37 +0000 (16:28 -0700)]
selectedLayer: use a C99 bool return type instead of boolean

3 years agois_natural_number: use more precise type for input parameter
Matthew Fernandez [Sun, 29 Aug 2021 23:26:16 +0000 (16:26 -0700)]
is_natural_number: use more precise type for input parameter

We can be more strict and rigorous with how we deal with strings here.

3 years agois_natural_number: use a C99 bool return type instead of boolean
Matthew Fernandez [Sun, 29 Aug 2021 23:25:38 +0000 (16:25 -0700)]
is_natural_number: use a C99 bool return type instead of boolean

3 years agomore standard usage of isdigit and friends
Matthew Fernandez [Sun, 29 Aug 2021 23:21:59 +0000 (16:21 -0700)]
more standard usage of isdigit and friends

3 years agoremove some commented out code
Matthew Fernandez [Sun, 29 Aug 2021 23:20:38 +0000 (16:20 -0700)]
remove some commented out code

3 years agocolorcmpf: remove strcmp micro-optimization
Matthew Fernandez [Sun, 29 Aug 2021 23:19:57 +0000 (16:19 -0700)]
colorcmpf: remove strcmp micro-optimization

This is unnecessary when using a modern compiler.

3 years agocolorcmpf: remove unnecessary casts
Matthew Fernandez [Sun, 29 Aug 2021 23:19:20 +0000 (16:19 -0700)]
colorcmpf: remove unnecessary casts

These pointers implicitly coerce.

3 years agocolorxlate: remove some unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 23:18:41 +0000 (16:18 -0700)]
colorxlate: remove some unnecessary bracketing

3 years agocolorxlate: remove strcmp micro-optimization
Matthew Fernandez [Sun, 29 Aug 2021 23:17:17 +0000 (16:17 -0700)]
colorxlate: remove strcmp micro-optimization

This is unnecessary when using a modern compiler.

3 years agoreplace header guards in lib/common with more modern #pragma once
Matthew Fernandez [Sun, 29 Aug 2021 22:38:10 +0000 (15:38 -0700)]
replace header guards in lib/common with more modern #pragma once

3 years agoremove cryptic globals.h comment
Matthew Fernandez [Sun, 29 Aug 2021 22:29:56 +0000 (15:29 -0700)]
remove cryptic globals.h comment

The link in this comment is dead and it is unclear what it is referring to.

3 years agocolorxlate: squash some -Wswitch-default warnings
Matthew Fernandez [Sun, 29 Aug 2021 22:20:12 +0000 (15:20 -0700)]
colorxlate: squash some -Wswitch-default warnings

3 years agocolorxlate: squash some -Wconversion warnings
Matthew Fernandez [Sun, 29 Aug 2021 22:19:20 +0000 (15:19 -0700)]
colorxlate: squash some -Wconversion warnings

By design, these calculations cannot overflow.

3 years agocolorCvt: remove commented out code
Matthew Fernandez [Sun, 29 Aug 2021 22:19:02 +0000 (15:19 -0700)]
colorCvt: remove commented out code

3 years agorgb2cmyk: call fmin instead of open coding floating point comparison
Matthew Fernandez [Sun, 29 Aug 2021 22:07:48 +0000 (15:07 -0700)]
rgb2cmyk: call fmin instead of open coding floating point comparison

3 years agoreplace use of MIN, MAX macros in colxlate.c with standard fmin, fmax
Matthew Fernandez [Sun, 29 Aug 2021 22:02:37 +0000 (15:02 -0700)]
replace use of MIN, MAX macros in colxlate.c with standard fmin, fmax

3 years agocanontoken: use char pointers instead of unsigned char pointers
Matthew Fernandez [Sun, 29 Aug 2021 21:59:43 +0000 (14:59 -0700)]
canontoken: use char pointers instead of unsigned char pointers

It is not clear to me why this code was using unsigned char pointers.

3 years agocanontoken: remove commented out code
Matthew Fernandez [Sun, 29 Aug 2021 21:55:51 +0000 (14:55 -0700)]
canontoken: remove commented out code

3 years agohsv2rgb: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 21:54:50 +0000 (14:54 -0700)]
hsv2rgb: remove unnecessary bracketing

3 years agoremove unnecessary casts around usage of 'bsearch'
Matthew Fernandez [Sun, 29 Aug 2021 21:52:47 +0000 (14:52 -0700)]
remove unnecessary casts around usage of 'bsearch'

3 years agocolorxlate: remove unnecessary bracketing
Matthew Fernandez [Sun, 29 Aug 2021 21:45:56 +0000 (14:45 -0700)]
colorxlate: remove unnecessary bracketing

3 years agocolorxlate: remove a strcmp micro-optimization
Matthew Fernandez [Sun, 29 Aug 2021 21:43:04 +0000 (14:43 -0700)]
colorxlate: remove a strcmp micro-optimization

This is unnecessary when using modern compilers.

3 years agocolorxlate: use char pointers instead of unsigned char pointers
Matthew Fernandez [Sun, 29 Aug 2021 21:40:56 +0000 (14:40 -0700)]
colorxlate: use char pointers instead of unsigned char pointers

It is not clear to me why this code was using unsigned char pointers.

3 years agoMerge branch 'smattr/7e2248f2-8a26-4cfa-9908-b5d191b0070e' into 'main'
Matthew Fernandez [Sat, 4 Sep 2021 01:55:01 +0000 (01:55 +0000)]
Merge branch 'smattr/7e2248f2-8a26-4cfa-9908-b5d191b0070e' into 'main'

fix various -Wmissing-field-initializer warnings

See merge request graphviz/graphviz!2130

3 years agop_plain: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 04:00:58 +0000 (21:00 -0700)]
p_plain: squash -Wmissing-field-initializer warning

3 years agop_plaintext: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 04:00:28 +0000 (21:00 -0700)]
p_plaintext: squash -Wmissing-field-initializer warning

3 years agop_square: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 03:59:47 +0000 (20:59 -0700)]
p_square: squash -Wmissing-field-initializer warning

3 years agop_box: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 03:59:10 +0000 (20:59 -0700)]
p_box: squash -Wmissing-field-initializer warning

3 years agop_triangle: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 03:58:37 +0000 (20:58 -0700)]
p_triangle: squash -Wmissing-field-initializer warning

3 years agop_egg: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 03:57:51 +0000 (20:57 -0700)]
p_egg: squash -Wmissing-field-initializer warning

3 years agop_circle: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 03:56:57 +0000 (20:56 -0700)]
p_circle: squash -Wmissing-field-initializer warning

3 years agop_ellipse: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 03:56:03 +0000 (20:56 -0700)]
p_ellipse: squash -Wmissing-field-initializer warning

3 years agop_polygon: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 03:54:55 +0000 (20:54 -0700)]
p_polygon: squash -Wmissing-field-initializer warning

3 years agoCenter: squash -Wmissing-field-initializer warning
Matthew Fernandez [Tue, 31 Aug 2021 03:53:35 +0000 (20:53 -0700)]
Center: squash -Wmissing-field-initializer warning

3 years agoMerge branch 'smattr/9A8B94F0-FA1E-4200-A71D-03595C913ACF' into 'main'
Matthew Fernandez [Sat, 4 Sep 2021 01:00:01 +0000 (01:00 +0000)]
Merge branch 'smattr/9A8B94F0-FA1E-4200-A71D-03595C913ACF' into 'main'

remove Fedora 32 CI testing

See merge request graphviz/graphviz!2128

3 years agoremove Fedora ≤ 32 work around
Matthew Fernandez [Tue, 31 Aug 2021 00:02:12 +0000 (17:02 -0700)]
remove Fedora ≤ 32 work around

3 years agoremove Fedora 32 CI testing
Matthew Fernandez [Tue, 31 Aug 2021 00:01:23 +0000 (17:01 -0700)]
remove Fedora 32 CI testing

Fedora 32 was EOLed in May 2021.¹

¹ https://fedoraproject.org/wiki/End_of_life?rd=LifeCycle/EOL

3 years agoMerge branch 'smattr/C574183C-758B-4503-AFE2-3BEE5F2BBA87' into 'main'
Matthew Fernandez [Fri, 3 Sep 2021 15:27:07 +0000 (15:27 +0000)]
Merge branch 'smattr/C574183C-758B-4503-AFE2-3BEE5F2BBA87' into 'main'

some Pylint warning squashing

See merge request graphviz/graphviz!2118

3 years agofix some missing Python docstrings
Matthew Fernandez [Sat, 28 Aug 2021 15:24:28 +0000 (08:24 -0700)]
fix some missing Python docstrings

3 years agosquash Pylint warnings about shadowing 'root'
Matthew Fernandez [Sat, 28 Aug 2021 15:22:14 +0000 (08:22 -0700)]
squash Pylint warnings about shadowing 'root'

3 years agosquash Pylint warnings about shadowing 'p'
Matthew Fernandez [Sat, 28 Aug 2021 15:21:19 +0000 (08:21 -0700)]
squash Pylint warnings about shadowing 'p'

3 years agosquash Pylint wrong-import-position warnings
Matthew Fernandez [Sat, 28 Aug 2021 15:14:15 +0000 (08:14 -0700)]
squash Pylint wrong-import-position warnings

3 years agosquash a Pylint line-too-long warning
Matthew Fernandez [Sat, 28 Aug 2021 15:12:57 +0000 (08:12 -0700)]
squash a Pylint line-too-long warning

3 years agoMerge branch 'smattr/8D176743-758B-4021-8E02-E18155F7503A' into 'main'
Matthew Fernandez [Thu, 2 Sep 2021 03:40:04 +0000 (03:40 +0000)]
Merge branch 'smattr/8D176743-758B-4021-8E02-E18155F7503A' into 'main'

smyrna: remove expat installation when using MS Build

See merge request graphviz/graphviz!2115

3 years agosmyrna: remove expat installation when using MS Build
Matthew Fernandez [Fri, 27 Aug 2021 03:33:26 +0000 (20:33 -0700)]
smyrna: remove expat installation when using MS Build

AFAICT Smyrna does not directly depend on expat. It depends on it indirectly,
but should then pick up expat installation steps from dependent MS Build files.

3 years agoMerge branch 'add-mingw-cmake-builds-to-ci' into 'main'
Magnus Jacobsson [Wed, 1 Sep 2021 16:11:52 +0000 (16:11 +0000)]
Merge branch 'add-mingw-cmake-builds-to-ci' into 'main'

Add MinGW CMake build jobs to CI

See merge request graphviz/graphviz!2107

3 years agoCI: add windows-mingw64-cmake-build job
Magnus Jacobsson [Sun, 15 Aug 2021 10:04:09 +0000 (12:04 +0200)]
CI: add windows-mingw64-cmake-build job

3 years agoCI: add windows-mingw32-cmake-build job
Magnus Jacobsson [Sun, 15 Aug 2021 10:03:57 +0000 (12:03 +0200)]
CI: add windows-mingw32-cmake-build job

3 years agoadd ci/mingw-build.sh script
Magnus Jacobsson [Tue, 31 Aug 2021 05:19:31 +0000 (07:19 +0200)]
add ci/mingw-build.sh script

3 years agoci/build.sh: CMake: move the MinGW zip and exe build artifacts to the release directory
Magnus Jacobsson [Sun, 15 Aug 2021 09:33:42 +0000 (11:33 +0200)]
ci/build.sh: CMake: move the MinGW zip and exe build artifacts to the release directory

3 years agoremove import/export declaration of lt_preloaded_sybols in gvcext.h
Magnus Jacobsson [Wed, 21 Jul 2021 10:04:18 +0000 (12:04 +0200)]
remove import/export declaration of lt_preloaded_sybols in gvcext.h

lt_preloaded_symbols is always defined in the executable that links to
the gvc lib, so it should only have a standard extern declaration.

Fixes this error with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: cmd/dot/CMakeFiles/dot.dir/dot.c.obj:dot.c:(.text+0x1e9): undefined reference to `__imp_lt_preloaded_symbols'

Also removes this warning with MinGw:

C:/Users/magja/graphviz/cmd/dot/no_builtins.c:13:14: warning: 'lt_preloaded_symbols' redeclared without dllimport attribute: previous dllimport ignored [-Wattributes]
   13 | lt_symlist_t lt_preloaded_symbols[] = { { 0, 0 } };
      |              ^~~~~~~~~~~~~~~~~~~~

Also removes these three warnings in standard Windows MSVC builds:

C:\Users\magja\graphviz\cmd\dot\no_builtins.c(13,37): warning C4273: 'lt_preloaded_symbols': inconsistent dll linkage [C:\Users\magja\graphviz\build\cmd\dot\dot.vcxproj]
C:\Users\magja\graphviz\cmd\tools\gvpack.c(34,37): warning C4273: 'lt_preloaded_symbols': inconsistent dll linkage [C:\Users\magja\graphviz\build\cmd\tools\gvpack.vcxproj]
LINK : warning LNK4217: symbol 'lt_preloaded_symbols' defined in 'no_builtins.obj' is imported by 'dot.obj' in function 'main' [C:\Users\magja\graphviz\build\cmd\dot\dot.vcxproj]

3 years agolabel: CMake: ensure label symbols are exported from the gvc lib
Magnus Jacobsson [Thu, 29 Jul 2021 05:58:37 +0000 (07:58 +0200)]
label: CMake: ensure label symbols are exported from the gvc lib

The object modules from the static label lib are statically linked
into the gvc shared lib through the common object library which means
that their symbols should be exported from gvc instead of
imported. Defining GVC_EXPORTS achieves this.

This is what the autotools build already does.

Fixes this error with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../label/liblabel.a(xlabels.c.obj):xlabels.c:(.text+0x98): undefined reference to `__imp_zmalloc'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../label/liblabel.a(xlabels.c.obj):xlabels.c:(.text+0x1f40): undefined reference to `__imp_zmalloc'

3 years agoortho: CMake: ensure ortho symbols are exported from gvc
Magnus Jacobsson [Sat, 24 Jul 2021 06:04:53 +0000 (08:04 +0200)]
ortho: CMake: ensure ortho symbols are exported from gvc

The object modules from the static ortho lib are statically linked
into the gvc shared lib which means that its symbols should be
exported from gvc instead of imported. Defining GVC_EXPORTS achieves
this.

Fixes errors like this with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../ortho/CMakeFiles/ortho_obj.dir/fPQ.c.obj:fPQ.c:(.text+0x6d): undefined reference to `__imp_gcalloc'

3 years agocommon: ensure correct import/export declarations of expat with MinGW
Magnus Jacobsson [Thu, 29 Jul 2021 16:31:12 +0000 (18:31 +0200)]
common: ensure correct import/export declarations of expat with MinGW

The expat library does not seem to recognize MinGW and therefore does
not apply the Microsoft storage class attributes to its function
declarations when using MinGW. Defining XML_USE_MSC_EXTENSIONS forces
it to use those.

Fixes errors like this with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../common/CMakeFiles/common_obj.dir/htmllex.c.obj:htmllex.c:(.text+0x1cec): undefined reference to `XML_ParserCreate'

3 years agoCMake: fix expat runtime library not found by cpack on msys2
Magnus Jacobsson [Thu, 5 Aug 2021 07:36:20 +0000 (09:36 +0200)]
CMake: fix expat runtime library not found by cpack on msys2

Fixes these errors with MinGW:

CMake Error at C:/Users/magja/graphviz/build/lib/gvc/cmake_install.cmake:75 (file):
  file INSTALL cannot find
  "C:/Users/magja/graphviz/lib/gvc/EXPAT_RUNTIME_LIBRARIES-NOTFOUND": No
  error.
Call Stack (most recent call first):
  C:/Users/magja/graphviz/build/lib/cmake_install.cmake:70 (include)
  C:/Users/magja/graphviz/build/cmake_install.cmake:58 (include)

CMake Error at C:/Users/magja/graphviz/build/cmd/tools/cmake_install.cmake:269 (file):
  file INSTALL cannot find
  "C:/Users/magja/graphviz/cmd/tools/EXPAT_RUNTIME_LIBRARIES-NOTFOUND": No
  error.
Call Stack (most recent call first):
  C:/Users/magja/graphviz/build/cmd/cmake_install.cmake:44 (include)
  C:/Users/magja/graphviz/build/cmake_install.cmake:60 (include)

CPack Error: Error when generating package: Graphviz

3 years agogvc: WIN32: install expat runtime library only if we have it
Magnus Jacobsson [Tue, 31 Aug 2021 13:52:57 +0000 (15:52 +0200)]
gvc: WIN32: install expat runtime library only if we have it

3 years agogvc: CMake: link to ltdl even on Windows with MinGW
Magnus Jacobsson [Wed, 18 Aug 2021 11:00:27 +0000 (13:00 +0200)]
gvc: CMake: link to ltdl even on Windows with MinGW

Fixes these errors with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x4f7): undefined reference to `lt_dlinit'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x529): undefined reference to `lt_dlopen'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x578): undefined reference to `lt_dlerror'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x69e): undefined reference to `lt_dlsym'
collect2.exe: error: ld returned 1 exit status

3 years agoCMake: FindLTDL: ensure ltdl is found with MinGW
Magnus Jacobsson [Mon, 16 Aug 2021 18:28:23 +0000 (20:28 +0200)]
CMake: FindLTDL: ensure ltdl is found with MinGW

CMake defines both WIN32 and MINGW when the compiler is some version
of MinGW. With MinGW we do want to use the ltdl library athough on
native Windows we only use the ltdl compatibility header introduced in
d70cdba7937724c19393d97bd280320cdf8c3c8f, not the library itself.

Fixes the following errors with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x4f7): undefined reference to `lt_dlinit'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x529): undefined reference to `lt_dlopen'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x578): undefined reference to `lt_dlerror'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x69e): undefined reference to `lt_dlsym'

Towards https://gitlab.com/graphviz/graphviz/-/issues/2102.

3 years agoCMake: add use_win_pre_inst_libs option
Magnus Jacobsson [Tue, 3 Aug 2021 15:39:31 +0000 (17:39 +0200)]
CMake: add use_win_pre_inst_libs option

This option will be used in an upcoming commit that adds MinGW jobs to
CI.

3 years agoMerge branch 'more-linking-clean-up' into 'main'
Magnus Jacobsson [Mon, 30 Aug 2021 16:41:19 +0000 (16:41 +0000)]
Merge branch 'more-linking-clean-up' into 'main'

More linking cleanup

See merge request graphviz/graphviz!2127

3 years agocommon: link to expat privately instead of publicly
Magnus Jacobsson [Mon, 30 Aug 2021 06:29:29 +0000 (08:29 +0200)]
common: link to expat privately instead of publicly

Downstream libraries that explicitly use expat now all link to expat
themselves and no longer rely on a transitive dependency to expat
through gvc via common.

3 years agoplugin/neato_layout: remove linking to cdt
Magnus Jacobsson [Mon, 30 Aug 2021 06:19:09 +0000 (08:19 +0200)]
plugin/neato_layout: remove linking to cdt

The neato_layout plugin source files do not refer to cdt.

3 years agoplugin/gd: remove linking to cdt
Magnus Jacobsson [Mon, 30 Aug 2021 06:19:09 +0000 (08:19 +0200)]
plugin/gd: remove linking to cdt

The gd plugin source files do not refer to cdt.