mirror of https://github.com/fltk/fltk
Suppress Visual Studio warnings in bundled libs
We don't have control over the code of these bundled libs, hence we suppress some special warnings: - C4267: conversion from ... to ..., possible loss of data - C4996: The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name ...
This commit is contained in:
parent
e387dbd30c
commit
07dfcd0fb7
|
@ -27,18 +27,39 @@ set(decompression_SRCS
|
|||
|
||||
list(APPEND BUILD_SRCS "${systemdependent_SRCS};${common_SRCS}")
|
||||
list(APPEND BUILD_SRCS "${compression_SRCS};${decompression_SRCS}")
|
||||
|
||||
#######################################################################
|
||||
FL_ADD_LIBRARY(fltk_jpeg STATIC "${BUILD_SRCS}")
|
||||
# install the jpeg headers
|
||||
install(FILES jconfig.h;jerror.h;jmorecfg.h;jpeglib.h
|
||||
DESTINATION ${FLTK_INCLUDEDIR}/FL/images
|
||||
|
||||
# Suppress some Visual Studio compiler warnings
|
||||
set (msvc_warnings /wd4267)
|
||||
|
||||
#######################################################################
|
||||
# Build the static library
|
||||
#######################################################################
|
||||
|
||||
FL_ADD_LIBRARY (fltk_jpeg STATIC "${BUILD_SRCS}")
|
||||
|
||||
if (MSVC)
|
||||
target_compile_options (fltk_jpeg PRIVATE ${msvc_warnings})
|
||||
endif (MSVC)
|
||||
|
||||
#######################################################################
|
||||
# Build the shared library (optional)
|
||||
#######################################################################
|
||||
|
||||
if (OPTION_BUILD_SHARED_LIBS)
|
||||
FL_ADD_LIBRARY (fltk_jpeg SHARED "${BUILD_SRCS}")
|
||||
|
||||
if (MSVC)
|
||||
target_compile_options (fltk_jpeg_SHARED PRIVATE ${msvc_warnings})
|
||||
endif (MSVC)
|
||||
|
||||
endif (OPTION_BUILD_SHARED_LIBS)
|
||||
|
||||
#######################################################################
|
||||
# Install the library headers
|
||||
#######################################################################
|
||||
|
||||
install (FILES jconfig.h jerror.h jmorecfg.h jpeglib.h
|
||||
DESTINATION ${FLTK_INCLUDEDIR}/FL/images
|
||||
)
|
||||
|
||||
#######################################################################
|
||||
if(OPTION_BUILD_SHARED_LIBS)
|
||||
#######################################################################
|
||||
FL_ADD_LIBRARY(fltk_jpeg SHARED "${BUILD_SRCS}")
|
||||
|
||||
#######################################################################
|
||||
endif(OPTION_BUILD_SHARED_LIBS)
|
||||
#######################################################################
|
||||
|
|
|
@ -1,35 +1,55 @@
|
|||
|
||||
# source files for zlib
|
||||
set(ZLIB_SRCS
|
||||
adler32.c
|
||||
compress.c
|
||||
crc32.c
|
||||
deflate.c
|
||||
gzclose.c
|
||||
gzlib.c
|
||||
gzread.c
|
||||
gzwrite.c
|
||||
inflate.c
|
||||
infback.c
|
||||
inftrees.c
|
||||
inffast.c
|
||||
trees.c
|
||||
uncompr.c
|
||||
zutil.c
|
||||
set (ZLIB_SRCS
|
||||
adler32.c
|
||||
compress.c
|
||||
crc32.c
|
||||
deflate.c
|
||||
gzclose.c
|
||||
gzlib.c
|
||||
gzread.c
|
||||
gzwrite.c
|
||||
inflate.c
|
||||
infback.c
|
||||
inftrees.c
|
||||
inffast.c
|
||||
trees.c
|
||||
uncompr.c
|
||||
zutil.c
|
||||
)
|
||||
|
||||
#######################################################################
|
||||
FL_ADD_LIBRARY(fltk_z STATIC "${ZLIB_SRCS}")
|
||||
# install the zlib headers
|
||||
install(FILES zconf.h;zlib.h;zutil.h
|
||||
DESTINATION ${FLTK_INCLUDEDIR}/FL/images
|
||||
|
||||
# Suppress some Visual Studio compiler warnings
|
||||
set (msvc_warnings /wd4267 /wd4996)
|
||||
|
||||
#######################################################################
|
||||
# Build the static library
|
||||
#######################################################################
|
||||
|
||||
FL_ADD_LIBRARY (fltk_z STATIC "${ZLIB_SRCS}")
|
||||
|
||||
if (MSVC)
|
||||
target_compile_options (fltk_z PRIVATE ${msvc_warnings})
|
||||
endif (MSVC)
|
||||
|
||||
#######################################################################
|
||||
# Build the shared library (optional)
|
||||
#######################################################################
|
||||
|
||||
if (OPTION_BUILD_SHARED_LIBS)
|
||||
FL_ADD_LIBRARY (fltk_z SHARED "${ZLIB_SRCS}")
|
||||
|
||||
if (MSVC)
|
||||
target_compile_options (fltk_z_SHARED PRIVATE ${msvc_warnings})
|
||||
endif (MSVC)
|
||||
|
||||
endif (OPTION_BUILD_SHARED_LIBS)
|
||||
|
||||
#######################################################################
|
||||
# Install the library headers
|
||||
#######################################################################
|
||||
|
||||
install (FILES zconf.h zlib.h zutil.h
|
||||
DESTINATION ${FLTK_INCLUDEDIR}/FL/images
|
||||
)
|
||||
|
||||
#######################################################################
|
||||
if(OPTION_BUILD_SHARED_LIBS)
|
||||
#######################################################################
|
||||
FL_ADD_LIBRARY(fltk_z SHARED "${ZLIB_SRCS}")
|
||||
|
||||
#######################################################################
|
||||
endif(OPTION_BUILD_SHARED_LIBS)
|
||||
#######################################################################
|
||||
|
|
Loading…
Reference in New Issue