From d2bd3c62408945227bb13133ad6ce270851b4872 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 20 Apr 2024 01:44:26 +0200 Subject: [PATCH] CMake/MSVC: Fix shared library build, add to GitHub CI build Fault was a simple typo or copy-paste error --- .github/workflows/build.yml | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5bad59d49..561ce07a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -130,7 +130,7 @@ jobs: - name: Configure CMake working-directory: ${{github.workspace}}/build - run: cmake -D FLTK_USE_SYSTEM_LIBJPEG:BOOL=OFF -D FLTK_USE_SYSTEM_LIBPNG:BOOL=OFF -D FLTK_USE_SYSTEM_ZLIB:BOOL=OFF .. + run: cmake -D FLTK_USE_SYSTEM_LIBJPEG:BOOL=OFF -D FLTK_USE_SYSTEM_LIBPNG:BOOL=OFF -D FLTK_USE_SYSTEM_ZLIB:BOOL=OFF -DFLTK_BUILD_SHARED_LIBS:BOOL=ON .. - name: Build working-directory: ${{github.workspace}}/build diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e4f2306cd..dfbdfa235 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -930,7 +930,7 @@ if(FLTK_BUILD_SHARED_LIBS AND MSVC) if(OPENGL_FOUND) target_link_libraries(fltk-shared PUBLIC ${OPENGL_LIBRARIES}) - target_include_directories(fltk_gl-shared PUBLIC ${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS}) + target_include_directories(fltk-shared PUBLIC ${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS}) if(OPENGL_GLU_INCLUDE_DIR) target_include_directories(fltk-shared PUBLIC ${OPENGL_GLU_INCLUDE_DIR}) endif()