Skip to content

Commit

Permalink
Merge pull request #414 from robotology/fixgraphviz3
Browse files Browse the repository at this point in the history
FindGraphviz: Add Graphviz_DEFINITIONS to define GVDLL and release 0.14.2
  • Loading branch information
traversaro authored Jun 10, 2022
2 parents 2a97bc4 + c0798f1 commit 2583228
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
14 changes: 14 additions & 0 deletions 3rdparty/qgv/FindGraphviz.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Graphviz_FOUND - system has Graphviz installed
# Graphviz_LIBRARIES
# Graphviz_INCLUDE_DIRS
# Graphviz_DEFINITIONS

if(EXISTS "$ENV{Graphviz_ROOT}")
set(Graphviz_POSSIBLE_INCDIRS
Expand Down Expand Up @@ -94,6 +95,19 @@ mark_as_advanced(Graphviz_INCLUDE_DIR)

set(Graphviz_INCLUDE_DIRS ${Graphviz_INCLUDE_DIR})

set(Graphviz_DEFINITIONS "")
if(WIN32)
# If Graphviz >= 3.0.0 is used as shared library, the GVDLL preprocess definition
# should be defined. As at this point we can't know if graphviz is shared or static,
# we always defined GVDLL, leaving an option that users can use to explicitly
# specify that the linked graphviz is static
option(YCM_FINDGRAPHVIZ_USE_STATIC_GRAPHVIZ "Enable when linking a static graphviz" OFF)
mark_as_advanced(YCM_FINDGRAPHVIZ_USE_STATIC_GRAPHVIZ)
if(NOT YCM_FINDGRAPHVIZ_USE_STATIC_GRAPHVIZ)
set(Graphviz_DEFINITIONS "GVDLL")
endif()
endif()

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Graphviz
FOUND_VAR Graphviz_FOUND
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased Patch]

## [0.14.2] - 2022-06-10

### Added

* FindGraphviz: Add Graphviz_DEFINITIONS to define GVDLL to permit compilation against graphviz 3 (https://github.com/robotology/ycm/pull/414).

## [0.14.1] - 2022-05-24

### Added
Expand Down
2 changes: 1 addition & 1 deletion internal-modules/YCMVersion.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ include(GitInfo)

set(YCM_VERSION_MAJOR 0)
set(YCM_VERSION_MINOR 14)
set(YCM_VERSION_PATCH 1)
set(YCM_VERSION_PATCH 2)

set(YCM_VERSION_API "${YCM_VERSION_MAJOR}.${YCM_VERSION_MINOR}")
set(YCM_VERSION_SHORT "${YCM_VERSION_MAJOR}.${YCM_VERSION_MINOR}.${YCM_VERSION_PATCH}")
Expand Down

0 comments on commit 2583228

Please sign in to comment.