Include .pc files in LJT SDKs for Visual C++

These are apparently useful in certain esoteric build environments.

Closes #296

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc871d7388dac091e0dec53af0e80563c2c34e7f..f481a57e8bef6ed6b565c8fcf4643aa9a0d86d0b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1373,10 +1373,10 @@ if(UNIX OR MINGW)
     ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
     ${CMAKE_CURRENT_SOURCE_DIR}/wrjpgcom.1
     DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
-    ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
+  ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
   ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h

diff --git a/release/installer.nsi.in b/release/installer.nsi.in
index 00cd5f8796d37563a8113269d14738aef60a00c5..44419fa82c879befd8d753ac4710a677e71e594f 100755 (executable)
--- a/release/installer.nsi.in
+++ b/release/installer.nsi.in
@@ -62,15 +62,15 @@ 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"
        File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}jpeg.lib"
        File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}jpeg-static.lib"
 !endif
+       SetOutPath $INSTDIR\lib\pkgconfig
+       File "@CMAKE_CURRENT_BINARY_DIR@\pkgscripts\libjpeg.pc"
+       File "@CMAKE_CURRENT_BINARY_DIR@\pkgscripts\libturbojpeg.pc"
 !ifdef JAVA
        SetOutPath $INSTDIR\classes
        File "@CMAKE_CURRENT_BINARY_DIR@\java\turbojpeg.jar"
@@ -130,8 +130,6 @@ 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
@@ -141,6 +139,8 @@ Section "Uninstall"
        Delete $INSTDIR\lib\turbojpeg.lib
        Delete $INSTDIR\lib\turbojpeg-static.lib
 !endif
+       Delete $INSTDIR\lib\pkgconfig\libjpeg.pc
+       Delete $INSTDIR\lib\pkgconfig\libturbojpeg.pc
 !ifdef JAVA
        Delete $INSTDIR\classes\turbojpeg.jar
 !endif
@@ -175,9 +175,7 @@ Section "Uninstall"
 !endif
 
        RMDir "$INSTDIR\include"
-!ifdef GCC
        RMDir "$INSTDIR\lib\pkgconfig"
-!endif
        RMDir "$INSTDIR\lib"
        RMDir "$INSTDIR\doc"
 !ifdef GCC