etlegacy/Update-Installer
0
0
Fork 0
mirror of https://github.com/etlegacy/Update-Installer.git synced 2024-11-24 21:01:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed bz2 static link on Linux

Browse source
This commit is contained in:
Remy Marquis 2014-12-15 16:02:50 +01:00
parent 1c4e9d87a7
commit bb76b067ec
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
external/bzip2/libbz2.a vendored Normal file
View file

Binary file not shown.

12
external/minizip/CMakeLists.txt vendored
View file

@ -37,17 +37,17 @@ if (UNIX)
# we link statically to libbz2 so that an updater binary # we link statically to libbz2 so that an updater binary
# build on Debian (where the packaged libbz2 has a SONAME of "libbz2.so.1.0" # build on Debian (where the packaged libbz2 has a SONAME of "libbz2.so.1.0"
# works on Fedora/openSUSE (where no libbz2.so.1.0 symlink exists) # works on Fedora/openSUSE (where no libbz2.so.1.0 symlink exists)
# #
# see http://stackoverflow.com/questions/1835489/linking-an-application-to-libbz2-so-1-rather-than-libbz2-so-1-0 # see http://stackoverflow.com/questions/1835489/linking-an-application-to-libbz2-so-1-rather-than-libbz2-so-1-0
# #
find_package(BZip2) find_package(BZip2)
set(BZ2_LIB_NAME bz2) if(APPLE)
if (NOT APPLE) set(BZ2_LIB_NAME bz2)
set(BZ2_LIB_NAME bz2.a) target_link_libraries(minizip z ${BZ2_LIB_NAME})
else()
target_link_libraries(minizip z "${CMAKE_CURRENT_SOURCE_DIR}/../bzip2/libbz2.a")
endif() endif()
target_link_libraries(minizip z ${BZ2_LIB_NAME})
else() else()
target_link_libraries(minizip target_link_libraries(minizip
"${CMAKE_CURRENT_SOURCE_DIR}/../zlib/prebuilt/zlib_static.lib" "${CMAKE_CURRENT_SOURCE_DIR}/../zlib/prebuilt/zlib_static.lib"