mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-19 11:18:40 +08:00
libarchive: Hard-code try_compile results for bundled dependencies
This commit is contained in:
@@ -438,6 +438,13 @@ macro (CMAKE_BUILD_UTILITIES)
|
|||||||
else()
|
else()
|
||||||
set(CMAKE_ZLIB_INCLUDES ${CMake_SOURCE_DIR}/Utilities)
|
set(CMAKE_ZLIB_INCLUDES ${CMake_SOURCE_DIR}/Utilities)
|
||||||
set(CMAKE_ZLIB_LIBRARIES cmzlib)
|
set(CMAKE_ZLIB_LIBRARIES cmzlib)
|
||||||
|
set(WITHOUT_ZLIB_DLL "")
|
||||||
|
set(WITHOUT_ZLIB_DLL_WITH_LIB cmzlib)
|
||||||
|
set(ZLIB_DLL "")
|
||||||
|
set(ZLIB_DLL_WITH_LIB cmzlib)
|
||||||
|
set(ZLIB_WINAPI "")
|
||||||
|
set(ZLIB_WINAPI_COMPILED 0)
|
||||||
|
set(ZLIB_WINAPI_WITH_LIB cmzlib)
|
||||||
add_subdirectory(Utilities/cmzlib)
|
add_subdirectory(Utilities/cmzlib)
|
||||||
CMAKE_SET_TARGET_FOLDER(cmzlib "Utilities/3rdParty")
|
CMAKE_SET_TARGET_FOLDER(cmzlib "Utilities/3rdParty")
|
||||||
endif()
|
endif()
|
||||||
@@ -514,6 +521,11 @@ macro (CMAKE_BUILD_UTILITIES)
|
|||||||
set(BZIP2_INCLUDE_DIR
|
set(BZIP2_INCLUDE_DIR
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2")
|
"${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2")
|
||||||
set(BZIP2_LIBRARIES cmbzip2)
|
set(BZIP2_LIBRARIES cmbzip2)
|
||||||
|
set(BZIP2_NEED_PREFIX "")
|
||||||
|
set(USE_BZIP2_DLL "")
|
||||||
|
set(USE_BZIP2_DLL_WITH_LIB cmbzip2)
|
||||||
|
set(USE_BZIP2_STATIC "")
|
||||||
|
set(USE_BZIP2_STATIC_WITH_LIB cmbzip2)
|
||||||
add_subdirectory(Utilities/cmbzip2)
|
add_subdirectory(Utilities/cmbzip2)
|
||||||
CMAKE_SET_TARGET_FOLDER(cmbzip2 "Utilities/3rdParty")
|
CMAKE_SET_TARGET_FOLDER(cmbzip2 "Utilities/3rdParty")
|
||||||
endif()
|
endif()
|
||||||
|
Reference in New Issue
Block a user