Merge pull request #1507 from kmilos/patch-1

Always install pkgconfig files

2 files changed, 19 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c54a0a7a..7e64aee1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,38 +312,30 @@ include (cmake/OpenJPEGCPack.cmake)
 
 #-----------------------------------------------------------------------------
 # pkgconfig support
-# enabled by default on Unix or if using GCC, disabled by default on other platforms
-if(UNIX OR CMAKE_COMPILER_IS_GNUCC)
-  option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" ON)
-else()
-  option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
-endif()
-if(BUILD_PKGCONFIG_FILES)
-  macro(set_variable_from_rel_or_absolute_path var root rel_or_abs_path)
-    if(IS_ABSOLUTE "${rel_or_abs_path}")
-      set(${var} "${rel_or_abs_path}")
-    else()
-      set(${var} "${root}/${rel_or_abs_path}")
-    endif()
-  endmacro()
-  set_variable_from_rel_or_absolute_path("bindir" "\\\${prefix}" "${CMAKE_INSTALL_BINDIR}")
-  set_variable_from_rel_or_absolute_path("mandir" "\\\${prefix}" "${CMAKE_INSTALL_MANDIR}")
-  set_variable_from_rel_or_absolute_path("docdir" "\\\${prefix}" "${CMAKE_INSTALL_DOCDIR}")
-  set_variable_from_rel_or_absolute_path("libdir" "\\\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
-  set_variable_from_rel_or_absolute_path("includedir" "\\\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}")
-
-  # install in lib and not share (CMAKE_INSTALL_LIBDIR takes care of it for multi-arch)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
-  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
-    ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+macro(set_variable_from_rel_or_absolute_path var root rel_or_abs_path)
+  if(IS_ABSOLUTE "${rel_or_abs_path}")
+    set(${var} "${rel_or_abs_path}")
+  else()
+    set(${var} "${root}/${rel_or_abs_path}")
+  endif()
+endmacro()
+set_variable_from_rel_or_absolute_path("bindir" "\\\${prefix}" "${CMAKE_INSTALL_BINDIR}")
+set_variable_from_rel_or_absolute_path("mandir" "\\\${prefix}" "${CMAKE_INSTALL_MANDIR}")
+set_variable_from_rel_or_absolute_path("docdir" "\\\${prefix}" "${CMAKE_INSTALL_DOCDIR}")
+set_variable_from_rel_or_absolute_path("libdir" "\\\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+set_variable_from_rel_or_absolute_path("includedir" "\\\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}")
+
+# install in lib and not share (CMAKE_INSTALL_LIBDIR takes care of it for multi-arch)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
+install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
+  ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
 #
-  if(BUILD_JPIP)
+if(BUILD_JPIP)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
     ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-  endif()
 endif()
 
 #-----------------------------------------------------------------------------
diff --git a/INSTALL.md b/INSTALL.md
index 1c0f1e4e..a9314040 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -30,7 +30,6 @@ Main available cmake flags:
   * To specify the install path: '-DCMAKE\_INSTALL\_PREFIX=/path'
   * To build the shared libraries and links the executables against it: '-DBUILD\_SHARED\_LIBS:bool=on' (default: 'ON')
 > Note: when using this option, static libraries are not built and executables are dynamically linked.
-  * PKG_CONFIG files are by default built for Unix compile, you can force to build on other platforms by adding: '-DBUILD_PKGCONFIG_FILES=on'
   * To build the CODEC executables: '-DBUILD\_CODEC:bool=on' (default: 'ON')
   * To build opjstyle (internal version of astyle) for OpenJPEG development: '-DWITH_ASTYLE=ON'
   * [OBSOLETE] To build the MJ2 executables: '-DBUILD\_MJ2:bool=on' (default: 'OFF')