Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: declare third-party libraries in options

Browse Source 
So the wxUSE_[lib] variables can be used in init.cmake.
This commit is contained in:
Maarten Bent
2018-01-29 00:12:27 +01:00
parent e6b9b571ab
commit 04b79788fc
7 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/lib/expat.cmake
View File

@@ -7,8 +7,6 @@
# Licence: wxWindows licence # Licence: wxWindows licence
############################################################################# #############################################################################
wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_APPLE sys)
if(wxUSE_EXPAT STREQUAL "builtin") if(wxUSE_EXPAT STREQUAL "builtin")
wx_add_builtin_library(wxexpat wx_add_builtin_library(wxexpat
src/expat/expat/lib/xmlparse.c src/expat/expat/lib/xmlparse.c

2
build/cmake/lib/jpeg.cmake
View File

@@ -7,8 +7,6 @@
# Licence: wxWindows licence # Licence: wxWindows licence
############################################################################# #############################################################################
wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)")
if(wxUSE_LIBJPEG STREQUAL "builtin") if(wxUSE_LIBJPEG STREQUAL "builtin")
wx_add_builtin_library(wxjpeg wx_add_builtin_library(wxjpeg
src/jpeg/jaricom.c src/jpeg/jaricom.c

2
build/cmake/lib/png.cmake
View File

@@ -7,8 +7,6 @@
# Licence: wxWindows licence # Licence: wxWindows licence
############################################################################# #############################################################################
wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)")
if(wxUSE_LIBPNG STREQUAL "builtin") if(wxUSE_LIBPNG STREQUAL "builtin")
wx_add_builtin_library(wxpng wx_add_builtin_library(wxpng
src/png/png.c src/png/png.c

2
build/cmake/lib/regex.cmake
View File

@@ -7,8 +7,6 @@
# Licence: wxWindows licence # Licence: wxWindows licence
############################################################################# #############################################################################
wx_add_thirdparty_library(wxUSE_REGEX REGEX "enable support for wxRegEx class" DEFAULT builtin)
if(wxUSE_REGEX) if(wxUSE_REGEX)
# TODO: Forcing builtin until sys is implemented # TODO: Forcing builtin until sys is implemented
set(wxUSE_REGEX builtin) set(wxUSE_REGEX builtin)

2
build/cmake/lib/tiff.cmake
View File

@@ -7,8 +7,6 @@
# Licence: wxWindows licence # Licence: wxWindows licence
############################################################################# #############################################################################
wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)")
if(wxUSE_LIBTIFF STREQUAL "builtin") if(wxUSE_LIBTIFF STREQUAL "builtin")
# TODO: implement building libtiff via ExternalProject_Add() # TODO: implement building libtiff via ExternalProject_Add()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)

3
build/cmake/lib/zlib.cmake
View File

@@ -7,9 +7,6 @@
# Licence: wxWindows licence # Licence: wxWindows licence
############################################################################# #############################################################################
wx_add_thirdparty_library(wxUSE_ZLIB ZLIB "use zlib for LZW compression"
DEFAULT_APPLE sys)
if(wxUSE_ZLIB STREQUAL "builtin") if(wxUSE_ZLIB STREQUAL "builtin")
wx_add_builtin_library(wxzlib wx_add_builtin_library(wxzlib
src/zlib/adler32.c src/zlib/adler32.c

7
build/cmake/options.cmake
View File

@@ -59,6 +59,13 @@ wx_option(wxUSE_REPRODUCIBLE_BUILD "enable reproducable build" OFF)
# external libraries # external libraries
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
wx_add_thirdparty_library(wxUSE_REGEX REGEX "enable support for wxRegEx class" DEFAULT builtin)
wx_add_thirdparty_library(wxUSE_ZLIB ZLIB "use zlib for LZW compression" DEFAULT_APPLE sys)
wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_APPLE sys)
wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)")
wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)")
wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)")
wx_option(wxUSE_OPENGL "use OpenGL (or Mesa)") wx_option(wxUSE_OPENGL "use OpenGL (or Mesa)")
if(NOT WIN32) if(NOT WIN32)