mirror of https://github.com/microsoft/vcpkg.git
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 2917839..6cf7cec 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -411,6 +411,7 @@ IF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN)
|
|
SET(__GNUWIN32PATH "C:/Program Files/GnuWin32")
|
|
ENDIF(WIN32 AND NOT CMAKE_CL_64 AND NOT CYGWIN)
|
|
IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
|
|
+ELSEIF(0)
|
|
# You have to add a path available DLL file into PATH environment variable.
|
|
# Maybe DLL path is "C:/Program Files/GnuWin32/bin".
|
|
# The zlib and the bzip2 Setup program have installed programs and DLLs into
|
|
diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
|
|
index fd997db..415bd89 100644
|
|
--- a/libarchive/CMakeLists.txt
|
|
+++ b/libarchive/CMakeLists.txt
|
|
@@ -273,11 +273,12 @@ IF(ENABLE_INSTALL)
|
|
RUNTIME DESTINATION bin
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
- ENDIF(BUILD_SHARED_LIBS)
|
|
+ ELSE()
|
|
INSTALL(TARGETS archive_static
|
|
RUNTIME DESTINATION bin
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+ ENDIF(BUILD_SHARED_LIBS)
|
|
INSTALL_MAN(${libarchive_MANS})
|
|
INSTALL(FILES ${include_HEADERS} DESTINATION include)
|
|
ENDIF()
|