mirror of
https://github.com/fltk/fltk.git
synced 2026-05-30 04:55:29 +08:00
CMake/MSVC: Fix shared library build, add to GitHub CI build
Fault was a simple typo or copy-paste error
This commit is contained in:
@@ -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
|
||||||
|
|||||||
+1
-1
@@ -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()
|
||||||
|
|||||||
Reference in New Issue
Block a user