Skip to content

Commit

Permalink
Update FLTK to latest master (#701)
Browse files Browse the repository at this point in the history
Also simplify FLTK inclusion in CMake.
  • Loading branch information
gvnnz committed Aug 24, 2024
1 parent 5161071 commit 4007447
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 33 deletions.
45 changes: 13 additions & 32 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -547,38 +547,19 @@ list(APPEND INCLUDE_DIRS ${LIBRARY_RTMIDI_INCLUDE_DIR})

# FLTK

include (ExternalProject)
ExternalProject_Add(
fltk
SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/deps/fltk
INSTALL_COMMAND "" # Don't install
CMAKE_ARGS
-DFLTK_BUILD_TEST=OFF
-DFLTK_BUILD_EXAMPLES=OFF
-DOPTION_BUILD_HTML_DOCUMENTATION=OFF
-DOPTION_BUILD_PDF_DOCUMENTATION=OFF
-DOPTION_USE_SYSTEM_ZLIB=OFF
-DOPTION_USE_WAYLAND=OFF
)
ExternalProject_Get_property(fltk BINARY_DIR)
ExternalProject_Get_property(fltk SOURCE_DIR)
list(APPEND INCLUDE_DIRS ${BINARY_DIR})
list(APPEND INCLUDE_DIRS ${SOURCE_DIR})
if(DEFINED OS_WINDOWS)
list(APPEND LIBRARIES "${BINARY_DIR}/lib/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>/fltk_images$<$<CONFIG:Debug>:d>.lib")
list(APPEND LIBRARIES "${BINARY_DIR}/lib/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>/fltk$<$<CONFIG:Debug>:d>.lib")
list(APPEND LIBRARIES "${BINARY_DIR}/lib/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>/fltk_z$<$<CONFIG:Debug>:d>.lib")
list(APPEND LIBRARIES "${BINARY_DIR}/lib/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>/fltk_gl$<$<CONFIG:Debug>:d>.lib")
list(APPEND LIBRARIES gdiplus)
elseif (DEFINED OS_MACOS)
list(APPEND LIBRARIES "${BINARY_DIR}/lib/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>/libfltk_images.a")
list(APPEND LIBRARIES "${BINARY_DIR}/lib/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>/libfltk.a")
list(APPEND LIBRARIES "${BINARY_DIR}/lib/$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>/libfltk_z.a")
else() # Linux and FreeBSD
list(APPEND LIBRARIES "${BINARY_DIR}/lib/libfltk_images.a")
list(APPEND LIBRARIES "${BINARY_DIR}/lib/libfltk.a")
list(APPEND LIBRARIES "${BINARY_DIR}/lib/libfltk_z.a")
endif()
include (FetchContent)
FetchContent_Declare(
FLTK
SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/deps/fltk)

set(FLTK_BUILD_GL ON CACHE BOOL "FLTK: enable OpenGL support")
set(FLTK_BUILD_TEST OFF CACHE BOOL "FLTK: don't build tests")
set(FLTK_BUILD_FLTK_OPTIONS OFF CACHE BOOL "FLTK: don't build 'options' editor")
set(FLTK_BUILD_FLUID OFF CACHE BOOL "FLTK: don't build FLUID")
set(FLTK_BUILD_FORMS OFF CACHE BOOL "FLTK: don't build (X)Forms compatibility library")

FetchContent_MakeAvailable(FLTK)
list(APPEND LIBRARIES fltk::fltk fltk::images)

# Libsndfile

Expand Down
2 changes: 1 addition & 1 deletion src/deps/fltk
Submodule fltk updated 552 files

0 comments on commit 4007447

Please sign in to comment.