Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
a28b8f95
Commit
a28b8f95
authored
Oct 10, 2016
by
Daniel Pfeifer
Browse files
Don't require libbz2 when using system libarchive
parent
66c6144c
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
a28b8f95
...
...
@@ -366,14 +366,19 @@ macro (CMAKE_BUILD_UTILITIES)
set
(
CMAKE_COMPRESS_LIBRARIES
"cmcompress"
)
add_subdirectory
(
Utilities/cmcompress
)
CMAKE_SET_TARGET_FOLDER
(
cmcompress
"Utilities/3rdParty"
)
if
(
CMAKE_USE_SYSTEM_BZIP2
)
find_package
(
BZip2
)
else
()
set
(
BZIP2_INCLUDE_DIR
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/Utilities/cmbzip2"
)
set
(
BZIP2_LIBRARIES cmbzip2
)
add_subdirectory
(
Utilities/cmbzip2
)
CMAKE_SET_TARGET_FOLDER
(
cmbzip2
"Utilities/3rdParty"
)
#---------------------------------------------------------------------
# Build or use system libbz2 for libarchive.
if
(
NOT CMAKE_USE_SYSTEM_LIBARCHIVE
)
if
(
CMAKE_USE_SYSTEM_BZIP2
)
find_package
(
BZip2
)
else
()
set
(
BZIP2_INCLUDE_DIR
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/Utilities/cmbzip2"
)
set
(
BZIP2_LIBRARIES cmbzip2
)
add_subdirectory
(
Utilities/cmbzip2
)
CMAKE_SET_TARGET_FOLDER
(
cmbzip2
"Utilities/3rdParty"
)
endif
()
endif
()
#---------------------------------------------------------------------
...
...
Brad King
@brad.king
Mentioned in commit
9c7fc00a
·
Oct 10, 2016
Mentioned in commit
9c7fc00a
Mentioned in commit 9c7fc00a45b6f0891c95fba707b0e2ce9d2e2dbf
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment