mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 14:59:03 +08:00
ff6a725392
* [lipng/libpng-apng]Remove port libpng-apng and add apng as a feature with libpng. * [libpng]Move feature apng operations before download libpng source. * [libpng]Fix unset patch path. * [libpng]Re-fix unset patch path.
23 lines
940 B
Diff
23 lines
940 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 48c6fa2..589e5f9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -853,7 +853,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
|
|
- if(PNG_SHARED)
|
|
+ if(PNG_SHARED AND NOT SKIP_INSTALL_SYMLINK)
|
|
# Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
|
|
if(CYGWIN OR MINGW)
|
|
create_symlink(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
|
|
@@ -868,7 +868,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
|
|
endif()
|
|
endif()
|
|
|
|
- if(PNG_STATIC)
|
|
+ if(PNG_STATIC AND NOT SKIP_INSTALL_SYMLINK)
|
|
if(NOT WIN32 OR CYGWIN OR MINGW)
|
|
create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
|
|
install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
|