From e15a6b4e08693953a1c8fd89684f6f85821243e0 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 23 Mar 2018 11:14:50 -0500 Subject: [PATCH] Include .pc and man files in MinGW install[er]s These files are potentially useful to MinGW users, since MSYS2 MinGW environments have a man command by default and provide an easy way to install pkg-config. Closes #223 --- CMakeLists.txt | 2 +- release/installer.nsi.in | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4530154..5dfd5d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1354,7 +1354,7 @@ if(WITH_JAVA) DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() -if(UNIX) +if(UNIX OR MINGW) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1 ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1 diff --git a/release/installer.nsi.in b/release/installer.nsi.in index b804f57..00cd5f8 100755 --- a/release/installer.nsi.in +++ b/release/installer.nsi.in @@ -62,6 +62,9 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)" File "@CMAKE_CURRENT_BINARY_DIR@\libturbojpeg.a" File "@CMAKE_CURRENT_BINARY_DIR@\libjpeg.dll.a" File "@CMAKE_CURRENT_BINARY_DIR@\libjpeg.a" + SetOutPath $INSTDIR\lib\pkgconfig + File "@CMAKE_CURRENT_BINARY_DIR@\pkgscripts\libjpeg.pc" + File "@CMAKE_CURRENT_BINARY_DIR@\pkgscripts\libturbojpeg.pc" !else File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}turbojpeg.lib" File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}turbojpeg-static.lib" @@ -89,6 +92,14 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)" File "@CMAKE_CURRENT_SOURCE_DIR@\wizard.txt" File "@CMAKE_CURRENT_SOURCE_DIR@\tjexample.c" File "@CMAKE_CURRENT_SOURCE_DIR@\java\TJExample.java" +!ifdef GCC + SetOutPath $INSTDIR\man\man1 + File "@CMAKE_CURRENT_SOURCE_DIR@\cjpeg.1" + File "@CMAKE_CURRENT_SOURCE_DIR@\djpeg.1" + File "@CMAKE_CURRENT_SOURCE_DIR@\jpegtran.1" + File "@CMAKE_CURRENT_SOURCE_DIR@\rdjpgcom.1" + File "@CMAKE_CURRENT_SOURCE_DIR@\wrjpgcom.1" +!endif WriteRegStr HKLM "SOFTWARE\@INST_REG_NAME@ @VERSION@" "Install_Dir" "$INSTDIR" @@ -119,6 +130,8 @@ Section "Uninstall" Delete $INSTDIR\lib\libturbojpeg.a Delete $INSTDIR\lib\libjpeg.dll.a Delete $INSTDIR\lib\libjpeg.a + Delete $INSTDIR\lib\pkgconfig\libjpeg.pc + Delete $INSTDIR\lib\pkgconfig\libturbojpeg.pc !else Delete $INSTDIR\bin\jpeg@SO_MAJOR_VERSION@.dll Delete $INSTDIR\bin\turbojpeg.dll @@ -153,10 +166,24 @@ Section "Uninstall" Delete $INSTDIR\doc\wizard.txt Delete $INSTDIR\doc\tjexample.c Delete $INSTDIR\doc\TJExample.java +!ifdef GCC + Delete $INSTDIR\man\man1\cjpeg.1 + Delete $INSTDIR\man\man1\djpeg.1 + Delete $INSTDIR\man\man1\jpegtran.1 + Delete $INSTDIR\man\man1\rdjpgcom.1 + Delete $INSTDIR\man\man1\wrjpgcom.1 +!endif RMDir "$INSTDIR\include" +!ifdef GCC + RMDir "$INSTDIR\lib\pkgconfig" +!endif RMDir "$INSTDIR\lib" RMDir "$INSTDIR\doc" +!ifdef GCC + RMDir "$INSTDIR\man\man1" + RMDir "$INSTDIR\man" +!endif !ifdef JAVA RMDir "$INSTDIR\classes" !endif -- 2.40.0