diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
| commit | 1908903508bf057ad05d8a344e5bc55477944cb6 (patch) | |
| tree | 2a23595f1e7d8cc9a6358bfd44a00eb7368d8a1b /ports/bzip2 | |
| parent | b0a2ff18c9f2c9131aed131f5bf0d97c0e23da8e (diff) | |
| parent | 8564602d06d7c4ce236f96a4f0f3ba7c2d769cb0 (diff) | |
| download | vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.tar.gz vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/4802
Diffstat (limited to 'ports/bzip2')
| -rw-r--r-- | ports/bzip2/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | ports/bzip2/CONTROL | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/ports/bzip2/CMakeLists.txt b/ports/bzip2/CMakeLists.txt index 2f70c5404..e2da221d7 100644 --- a/ports/bzip2/CMakeLists.txt +++ b/ports/bzip2/CMakeLists.txt @@ -5,7 +5,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug) add_definitions(-DBZ_DEBUG) # enable extra assertions endif() -set(LIBBZ2_SOURCES +set(BZ2_SOURCES blocksort.c huffman.c crctable.c @@ -14,12 +14,13 @@ set(LIBBZ2_SOURCES decompress.c bzlib.c) -add_library(libbz2 ${LIBBZ2_SOURCES}) -set_target_properties(libbz2 PROPERTIES - ARCHIVE_OUTPUT_NAME bz2 # required for FindBzip2 to work - DEBUG_POSTFIX d) +add_library(bz2 ${BZ2_SOURCES}) +set_target_properties(bz2 PROPERTIES + DEBUG_POSTFIX d + VERSION 1.0.6 + SOVERSION 1.0) if(BUILD_SHARED_LIBS) - target_compile_definitions(libbz2 PRIVATE -DBZ_BUILD_DLL) + target_compile_definitions(bz2 PRIVATE -DBZ_BUILD_DLL) endif() if(MSVC) @@ -28,14 +29,14 @@ if(MSVC) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) endif() -install(TARGETS libbz2 +install(TARGETS bz2 RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) if(NOT BZIP2_SKIP_TOOLS) - add_executable(bzip2 bzip2.c ${LIBBZ2_SOURCES}) - add_executable(bzip2recover bzip2recover.c ${LIBBZ2_SOURCES}) + add_executable(bzip2 bzip2.c ${BZ2_SOURCES}) + add_executable(bzip2recover bzip2recover.c ${BZ2_SOURCES}) install(TARGETS bzip2 bzip2recover DESTINATION tools/bzip2) endif() diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL index fad303399..00995aed9 100644 --- a/ports/bzip2/CONTROL +++ b/ports/bzip2/CONTROL @@ -1,3 +1,3 @@ Source: bzip2
-Version: 1.0.6-3
+Version: 1.0.6-4
Description: High-quality data compressor.
|