mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake/MSVC: Fix shared library build, add to GitHub CI build

Browse Source 
Fault was a simple typo or copy-paste error
This commit is contained in:
Albrecht Schlosser 2024-04-20 01:44:26 +02:00
parent 7601eea772
commit d2bd3c6240
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -130,7 +130,7 @@ jobs:
- name: Configure CMake - name: Configure CMake
working-directory: ${{github.workspace}}/build 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 - name: Build
working-directory: ${{github.workspace}}/build working-directory: ${{github.workspace}}/build

2
src/CMakeLists.txt
View File

@ -930,7 +930,7 @@ if(FLTK_BUILD_SHARED_LIBS AND MSVC)
if(OPENGL_FOUND) if(OPENGL_FOUND)
target_link_libraries(fltk-shared PUBLIC ${OPENGL_LIBRARIES}) 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) if(OPENGL_GLU_INCLUDE_DIR)
target_include_directories(fltk-shared PUBLIC ${OPENGL_GLU_INCLUDE_DIR}) target_include_directories(fltk-shared PUBLIC ${OPENGL_GLU_INCLUDE_DIR})
endif() endif()