From b18c1d00ada5a3ae9428e095fad1486ecbac0a64 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Fri, 30 Apr 2021 12:46:58 +0200 Subject: [PATCH] Fix build with Cairo for CMake < 3.13 target_link_directories() was introduced in CMake 3.13 --- CMake/fl_create_example.cmake | 6 +++++- fluid/CMakeLists.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMake/fl_create_example.cmake b/CMake/fl_create_example.cmake index ad95a9e70..72819ebea 100644 --- a/CMake/fl_create_example.cmake +++ b/CMake/fl_create_example.cmake @@ -116,7 +116,11 @@ macro (CREATE_EXAMPLE NAME SOURCES LIBRARIES) target_link_libraries (${TARGET_NAME} ${LIBRARIES}) if (FLTK_HAVE_CAIRO) - target_link_directories (${TARGET_NAME} PUBLIC ${PKG_CAIRO_LIBRARY_DIRS}) + if (CMAKE_VERSION VERSION_LESS "3.13") + link_directories (${TARGET_NAME} PUBLIC ${PKG_CAIRO_LIBRARY_DIRS}) + else() + target_link_directories (${TARGET_NAME} PUBLIC ${PKG_CAIRO_LIBRARY_DIRS}) + endif() endif (FLTK_HAVE_CAIRO) if (ICON_PATH) diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt index 0c741485c..1ca8dd8ef 100644 --- a/fluid/CMakeLists.txt +++ b/fluid/CMakeLists.txt @@ -68,7 +68,11 @@ endif (APPLE AND (NOT OPTION_APPLE_X11)) target_link_libraries (fluid fltk fltk_images fltk_forms) if (FLTK_HAVE_CAIRO) - target_link_directories (fluid PUBLIC ${PKG_CAIRO_LIBRARY_DIRS}) + if (CMAKE_VERSION VERSION_LESS "3.13") + link_directories (fluid PUBLIC ${PKG_CAIRO_LIBRARY_DIRS}) + else() + target_link_directories (fluid PUBLIC ${PKG_CAIRO_LIBRARY_DIRS}) + endif() endif (FLTK_HAVE_CAIRO) # install fluid