diff --git a/build/cmake/lib/expat.cmake b/build/cmake/lib/expat.cmake index 630ce175d3..1d2b79b1fa 100644 --- a/build/cmake/lib/expat.cmake +++ b/build/cmake/lib/expat.cmake @@ -7,8 +7,6 @@ # Licence: wxWindows licence ############################################################################# -wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_APPLE sys) - if(wxUSE_EXPAT STREQUAL "builtin") wx_add_builtin_library(wxexpat src/expat/expat/lib/xmlparse.c diff --git a/build/cmake/lib/jpeg.cmake b/build/cmake/lib/jpeg.cmake index d46c7fb6e9..77014944a7 100644 --- a/build/cmake/lib/jpeg.cmake +++ b/build/cmake/lib/jpeg.cmake @@ -7,8 +7,6 @@ # Licence: wxWindows licence ############################################################################# -wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)") - if(wxUSE_LIBJPEG STREQUAL "builtin") wx_add_builtin_library(wxjpeg src/jpeg/jaricom.c diff --git a/build/cmake/lib/png.cmake b/build/cmake/lib/png.cmake index d0fe5b854a..9dd9fdcf3b 100644 --- a/build/cmake/lib/png.cmake +++ b/build/cmake/lib/png.cmake @@ -7,8 +7,6 @@ # Licence: wxWindows licence ############################################################################# -wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)") - if(wxUSE_LIBPNG STREQUAL "builtin") wx_add_builtin_library(wxpng src/png/png.c diff --git a/build/cmake/lib/regex.cmake b/build/cmake/lib/regex.cmake index e2bc97c546..0478f5d42e 100644 --- a/build/cmake/lib/regex.cmake +++ b/build/cmake/lib/regex.cmake @@ -7,8 +7,6 @@ # Licence: wxWindows licence ############################################################################# -wx_add_thirdparty_library(wxUSE_REGEX REGEX "enable support for wxRegEx class" DEFAULT builtin) - if(wxUSE_REGEX) # TODO: Forcing builtin until sys is implemented set(wxUSE_REGEX builtin) diff --git a/build/cmake/lib/tiff.cmake b/build/cmake/lib/tiff.cmake index 3cd5a664ac..d1ef8d51f6 100644 --- a/build/cmake/lib/tiff.cmake +++ b/build/cmake/lib/tiff.cmake @@ -7,8 +7,6 @@ # Licence: wxWindows licence ############################################################################# -wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)") - if(wxUSE_LIBTIFF STREQUAL "builtin") # TODO: implement building libtiff via ExternalProject_Add() if(UNIX AND NOT APPLE) diff --git a/build/cmake/lib/zlib.cmake b/build/cmake/lib/zlib.cmake index c5687f2deb..0666e010ec 100644 --- a/build/cmake/lib/zlib.cmake +++ b/build/cmake/lib/zlib.cmake @@ -7,9 +7,6 @@ # Licence: wxWindows licence ############################################################################# -wx_add_thirdparty_library(wxUSE_ZLIB ZLIB "use zlib for LZW compression" - DEFAULT_APPLE sys) - if(wxUSE_ZLIB STREQUAL "builtin") wx_add_builtin_library(wxzlib src/zlib/adler32.c diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index 59dd8b4692..5d1d9a606e 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -59,6 +59,13 @@ wx_option(wxUSE_REPRODUCIBLE_BUILD "enable reproducable build" OFF) # 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)") if(NOT WIN32)