Link internal libraries statically on Mac OS X

This commit is contained in:
Cameron Cawley 2025-04-02 13:25:39 +01:00
parent 489557fd63
commit e361e653bc
7 changed files with 26 additions and 26 deletions

View File

@ -31,8 +31,8 @@ IF(USE_INTERNAL_LZ4)
SET(LZ4_FOUND 1)
SET(HAVE_LZ4 1)
# FIXME: When was it changed from LIBRARY to LIBRARIES?
IF(WIN32 OR APPLE)
# Using DLLs on Windows and Mac OS X.
IF(WIN32)
# Using DLLs on Windows.
SET(USE_INTERNAL_LZ4_DLL ON)
SET(LZ4_LIBRARY lz4_shared CACHE INTERNAL "LZ4 library" FORCE)
ELSE()

View File

@ -31,8 +31,8 @@ IF(USE_INTERNAL_LZO)
SET(LZO_FOUND 1)
SET(HAVE_LZO 1)
# FIXME: When was it changed from LIBRARY to LIBRARIES?
IF(WIN32 OR APPLE)
# Using DLLs on Windows and Mac OS X.
IF(WIN32)
# Using DLLs on Windows.
SET(USE_INTERNAL_LZO_DLL ON)
SET(LZO_LIBRARY minilzo CACHE INTERNAL "LZO library" FORCE)
ELSE()

View File

@ -43,8 +43,8 @@ IF(USE_INTERNAL_FMT)
SET(HAVE_Fmt 1)
SET(Fmt_VERSION 11.1.3 CACHE INTERNAL "libfmt version" FORCE)
# FIXME: When was it changed from LIBRARY to LIBRARIES?
IF(WIN32 OR APPLE)
# Using DLLs on Windows and Mac OS X.
IF(WIN32)
# Using DLLs on Windows.
SET(USE_INTERNAL_FMT_DLL ON)
SET(Fmt_LIBRARY fmt::fmt CACHE INTERNAL "libfmt library" FORCE)
ELSE()

View File

@ -38,8 +38,8 @@ IF(USE_INTERNAL_PNG)
SET(PNG_FOUND 1)
SET(HAVE_PNG 1)
SET(HAVE_PNG_APNG 1 CACHE INTERNAL "Have function png_get_acTL" FORCE)
IF(WIN32 OR APPLE)
# Using DLLs on Windows and Mac OS X.
IF(WIN32)
# Using DLLs on Windows.
SET(USE_INTERNAL_PNG_DLL ON)
SET(PNG_LIBRARY png_shared CACHE INTERNAL "PNG library" FORCE)
UNSET(PNG_DEFINITIONS)

View File

@ -32,8 +32,8 @@ IF(USE_INTERNAL_ZLIB)
SET(ZLIB_FOUND 1)
SET(HAVE_ZLIB 1)
# FIXME: When was it changed from LIBRARY to LIBRARIES?
IF(WIN32 OR APPLE)
# Using DLLs on Windows and Mac OS X.
IF(WIN32)
# Using DLLs on Windows.
SET(USE_INTERNAL_ZLIB_DLL ON)
SET(ZLIB_LIBRARY zlib CACHE INTERNAL "ZLIB library" FORCE)
ELSE()

View File

@ -34,8 +34,8 @@ IF(USE_INTERNAL_ZSTD)
SET(HAVE_ZSTD 1)
SET(ZSTD_VERSION 1.5.7 CACHE INTERNAL "ZSTD version" FORCE)
# FIXME: When was it changed from LIBRARY to LIBRARIES?
IF(WIN32 OR APPLE)
# Using DLLs on Windows and Mac OS X.
IF(WIN32)
# Using DLLs on Windows.
SET(USE_INTERNAL_ZSTD_DLL ON)
SET(ZSTD_LIBRARY zstd CACHE INTERNAL "ZSTD library" FORCE)
ELSE()

28
extlib/CMakeLists.txt vendored
View File

@ -49,9 +49,9 @@ SET(INSTALL_LIB_DIR "${DIR_INSTALL_LIB}")
IF(USE_INTERNAL_ZLIB)
# Use the internal copy of zlib-ng.
# On Windows and Mac OS X, this will build DLLs.
# On Windows, this will build DLLs.
# On other systems, this will be statically-linked.
IF(WIN32 OR APPLE)
IF(WIN32)
SET(SKIP_INSTALL_LIBRARIES OFF)
SET(SKIP_INSTALL_ALL OFF)
SET(BUILD_SHARED_LIBS ON)
@ -118,9 +118,9 @@ IF(USE_INTERNAL_PNG)
ENDIF(USE_INTERNAL_ZLIB)
# Use the internal copy of libpng.
# On Windows and Mac OS X, this will build DLLs.
# On Windows, this will build DLLs.
# On other systems, this will be statically-linked.
IF(WIN32 OR APPLE)
IF(WIN32)
SET(PNG_SHARED ON)
SET(PNG_STATIC OFF)
SET(SKIP_INSTALL_LIBRARIES OFF)
@ -151,9 +151,9 @@ ENDIF(USE_INTERNAL_PNG)
IF(USE_INTERNAL_ZSTD)
# Use the internal copy of zstd.
# On Windows and Mac OS X, this will build DLLs.
# On Windows, this will build DLLs.
# On other systems, this will be statically-linked.
IF(WIN32 OR APPLE)
IF(WIN32)
SET(SKIP_INSTALL_LIBRARIES ON)
SET(SKIP_INSTALL_ALL OFF)
SET(BUILD_SHARED_LIBS ON)
@ -179,12 +179,12 @@ ELSE(USE_INTERNAL_ZSTD)
ENDIF(USE_INTERNAL_ZSTD)
# minizip-ng
# On Windows and Mac OS X, this will build DLLs.
# On Windows, this will build DLLs.
# On other systems, this will be statically-linked.
# NOTE: We're always using the internal copy of MiniZip-NG.
# TODO: Support a system-wide version on Linux?
SET(USE_INTERNAL_MINIZIP TRUE PARENT_SCOPE)
IF(WIN32 OR APPLE)
IF(WIN32)
SET(USE_INTERNAL_MINIZIP_DLL TRUE PARENT_SCOPE)
SET(SKIP_INSTALL_LIBRARIES OFF)
SET(SKIP_INSTALL_ALL OFF)
@ -302,9 +302,9 @@ ENDIF(ENABLE_PVRTC)
IF(USE_INTERNAL_LZ4)
# Use the internal copy of LZ4.
# On Windows and Mac OS X, this will build DLLs.
# On Windows, this will build DLLs.
# On other systems, this will be statically-linked.
IF(WIN32 OR APPLE)
IF(WIN32)
SET(SKIP_INSTALL_LIBRARIES OFF)
SET(SKIP_INSTALL_ALL ON)
SET(BUILD_SHARED_LIBS ON)
@ -325,9 +325,9 @@ ENDIF(USE_INTERNAL_LZ4)
IF(USE_INTERNAL_LZO)
# Use the internal copy of LZO. (actually MiniLZO)
# On Windows and Mac OS X, this will build DLLs.
# On Windows, this will build DLLs.
# On other systems, this will be statically-linked.
IF(WIN32 OR APPLE)
IF(WIN32)
SET(SKIP_INSTALL_LIBRARIES OFF)
SET(SKIP_INSTALL_ALL ON)
SET(BUILD_SHARED_LIBS ON)
@ -409,9 +409,9 @@ SET_EXTLIB_PROPERTIES(microtar)
IF(USE_INTERNAL_FMT)
# Use the internal copy of fmt.
# On Windows and Mac OS X, this will build DLLs.
# On Windows, this will build DLLs.
# On other systems, this will be statically-linked.
IF(WIN32 OR APPLE)
IF(WIN32)
SET(SKIP_INSTALL_LIBRARIES OFF)
SET(SKIP_INSTALL_ALL ON)
SET(BUILD_SHARED_LIBS ON)