mirror of
https://github.com/fltk/fltk.git
synced 2026-05-31 22:04:26 +08:00
Fix Cairo related build issues (missing Cairo lib)
... particularly for shared libs
This commit is contained in:
@@ -161,6 +161,7 @@ function(fl_add_library LIBNAME LIBTYPE SOURCES)
|
|||||||
if(FLTK_HAVE_CAIRO OR FLTK_USE_CAIRO)
|
if(FLTK_HAVE_CAIRO OR FLTK_USE_CAIRO)
|
||||||
target_include_directories(${TARGET_NAME} PUBLIC ${PKG_CAIRO_INCLUDE_DIRS})
|
target_include_directories(${TARGET_NAME} PUBLIC ${PKG_CAIRO_INCLUDE_DIRS})
|
||||||
target_link_directories(${TARGET_NAME} PUBLIC ${PKG_CAIRO_LIBRARY_DIRS})
|
target_link_directories(${TARGET_NAME} PUBLIC ${PKG_CAIRO_LIBRARY_DIRS})
|
||||||
|
target_link_libraries(${TARGET_NAME} PUBLIC ${PKG_CAIRO_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif(LIBNAME STREQUAL "fltk")
|
endif(LIBNAME STREQUAL "fltk")
|
||||||
|
|||||||
+5
-1
@@ -275,7 +275,11 @@ if(FLTK_BUILD_SHARED_LIBS)
|
|||||||
fl_create_example(shape-shared shape.cxx "${GLDEMO_SHARED}")
|
fl_create_example(shape-shared shape.cxx "${GLDEMO_SHARED}")
|
||||||
endif(OPENGL_FOUND)
|
endif(OPENGL_FOUND)
|
||||||
|
|
||||||
fl_create_example(cairo_test-shared cairo_test.cxx "fltk::fltk-shared;cairo")
|
if(FLTK_HAVE_CAIRO)
|
||||||
|
fl_create_example(cairo_test-shared cairo_test.cxx "fltk::fltk-shared;cairo")
|
||||||
|
else()
|
||||||
|
fl_create_example(cairo_test-shared cairo_test.cxx "fltk::fltk-shared")
|
||||||
|
endif()
|
||||||
|
|
||||||
endif(MSVC) # (not MSVC)
|
endif(MSVC) # (not MSVC)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user