|
|
commit e39c96f419b598c2469efa1bd38c7e644f562df8
Author: Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sun Apr 21 19:12:59 2024 +0200
Commit: Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sun Apr 21 19:12:59 2024 +0200
Fix build of test programs using shared FLTK libs
src/CMakeLists.txt | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git src/CMakeLists.txt src/CMakeLists.txt
index 329358b..74f4011 100644
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -848,6 +848,11 @@ if(FLTK_USE_GL)
fl_add_library(fltk_gl STATIC "${GLCPPFILES};${GL_HEADER_FILES};${GL_DRIVER_HEADER_FILES}")
target_link_libraries(fltk_gl PUBLIC ${OPENGL_LIBRARIES} fltk::fltk)
target_include_directories(fltk_gl PUBLIC ${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS})
+
+ # Add "optional libs" (FIXME: this can be optimized, we don't need *all* these libs here)
+ target_link_libraries(fltk_gl PRIVATE ${OPTIONAL_LIBS})
+ target_include_directories(fltk_gl PRIVATE ${OPTIONAL_INCLUDES})
+
if(OPENGL_GLU_INCLUDE_DIR)
target_include_directories(fltk_gl PUBLIC ${OPENGL_GLU_INCLUDE_DIR})
endif()
@@ -906,6 +911,11 @@ if(FLTK_BUILD_SHARED_LIBS AND NOT MSVC)
fl_add_library(fltk_gl SHARED "${GLCPPFILES};${GL_HEADER_FILES};${GL_DRIVER_HEADER_FILES}")
target_link_libraries(fltk_gl-shared PUBLIC ${OPENGL_LIBRARIES} fltk::fltk-shared)
target_include_directories(fltk_gl-shared PUBLIC ${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS})
+
+ # Add "optional libs" (FIXME: this can be optimized, we don't need *all* these libs here)
+ target_link_libraries(fltk_gl-shared PRIVATE ${OPTIONAL_LIBS})
+ target_include_directories(fltk_gl-shared PRIVATE ${OPTIONAL_INCLUDES})
+
if(OPENGL_GLU_INCLUDE_DIR)
target_include_directories(fltk_gl-shared PUBLIC ${OPENGL_GLU_INCLUDE_DIR})
endif()
[ Direct Link to Message ] | |
|
| |