diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-02-28 14:47:33 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-02-28 14:47:33 +0100 |
| commit | fc5f0c13f2f08aaeb80c6c123ed55467183ecf9f (patch) | |
| tree | 7232005cecbf43b2d74dc1b046b6bf600a01099e /CMake/variables.cmake | |
| parent | a3d89f7e287dd52e525538ac2962c12e3a6e2bea (diff) | |
Fix fltk-config --use-images with local image libs (#689)
CMake only: replace wrong variable names with correct ones. Affected
were all image libraries (jpeg, png) and zlib.
These variables had been renamed in an earlier commit when lots of
CMake code had been rewritten.
Diffstat (limited to 'CMake/variables.cmake')
| -rw-r--r-- | CMake/variables.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMake/variables.cmake b/CMake/variables.cmake index 8908bd513..25bbefaeb 100644 --- a/CMake/variables.cmake +++ b/CMake/variables.cmake @@ -82,7 +82,7 @@ endif () set (IMAGELIBS) set (STATICIMAGELIBS) -if (FLTK_BUILTIN_JPEG_FOUND) +if (FLTK_USE_BUILTIN_JPEG) list (APPEND IMAGELIBS -lfltk_jpeg) list (APPEND STATICIMAGELIBS \$libdir/libfltk_jpeg.a) else () @@ -90,9 +90,9 @@ else () list (APPEND IMAGELIBS -ljpeg) list (APPEND STATICIMAGELIBS -ljpeg) endif (LIB_jpeg) -endif (FLTK_BUILTIN_JPEG_FOUND) +endif (FLTK_USE_BUILTIN_JPEG) -if (FLTK_BUILTIN_PNG_FOUND) +if (FLTK_USE_BUILTIN_PNG) list (APPEND IMAGELIBS -lfltk_png) list (APPEND STATICIMAGELIBS \$libdir/libfltk_png.a) else () @@ -100,9 +100,9 @@ else () list (APPEND IMAGELIBS -lpng) list (APPEND STATICIMAGELIBS -lpng) endif (LIB_png) -endif (FLTK_BUILTIN_PNG_FOUND) +endif (FLTK_USE_BUILTIN_PNG) -if (FLTK_BUILTIN_ZLIB_FOUND) +if (FLTK_USE_BUILTIN_ZLIB) list (APPEND IMAGELIBS -lfltk_z) list (APPEND STATICIMAGELIBS \$libdir/libfltk_z.a) else () @@ -110,7 +110,7 @@ else () list (APPEND IMAGELIBS -lz) list (APPEND STATICIMAGELIBS -lz) endif (LIB_zlib) -endif (FLTK_BUILTIN_ZLIB_FOUND) +endif (FLTK_USE_BUILTIN_ZLIB) string (REPLACE ";" " " IMAGELIBS "${IMAGELIBS}") string (REPLACE ";" " " STATICIMAGELIBS "${STATICIMAGELIBS}") |