Fix implementation

- Ensure pkg-config files are installed.
- Install pkg-config files also with static builds.
- Remove redundant quotes in pkg-config files.
- s/-lnitfiio/-lniftiio/g

Author: kleisauke

cmake/nifti_macros.cmake

@@ -135,10 +135,11 @@ function(install_nifti_target target_name)
             COMPONENT Development
           INCLUDES
             DESTINATION ${NIFTI_INSTALL_INCLUDE_DIR}
-          PKG_CONFIG
-            DESTINATION ${NIFTI_INSTALL_PKGCONFIG_DIR}
-            COMPONENT Development
           )
+
+  install(FILES $<TARGET_PROPERTY:${target_name},PKG_CONFIG>
+          COMPONENT Development
+          DESTINATION ${NIFTI_INSTALL_PKGCONFIG_DIR})
 endfunction()
 
 function(get_lib_version_var ver_header_text ver_type version_out)

nifti2/CMakeLists.txt

@@ -2,22 +2,22 @@ set(NIFTI_NIFTILIB2_NAME ${NIFTI_PACKAGE_PREFIX}nifti2)
 
 add_nifti_library(${NIFTI_NIFTILIB2_NAME} nifti2_io.c )
 target_link_libraries( ${NIFTI_NIFTILIB2_NAME} PUBLIC ${NIFTI_PACKAGE_PREFIX}znz ${NIFTI_SYSTEM_MATH_LIB})
+configure_file(nifti2.pc.in nifti2.pc @ONLY)
 set_target_properties(
   ${NIFTI_NIFTILIB2_NAME}
   PROPERTIES
     PUBLIC_HEADER
     "${CMAKE_CURRENT_LIST_DIR}/nifti1.h;${CMAKE_CURRENT_LIST_DIR}/nifti2.h;${CMAKE_CURRENT_LIST_DIR}/nifti2_io.h"
+    PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/nifti2.pc
   )
 # Set library version when building shared libs.
 if(BUILD_SHARED_LIBS)
     get_lib_version_vars("nifti2_io_version.h" NIFTI2_VERSION NIFTI2_MAJOR_VERSION)
-    configure_file(nifti2.pc.in nifti2.pc @ONLY)
     set_target_properties(${NIFTI_NIFTILIB2_NAME}
       PROPERTIES
         ${NIFTI_LIBRARY_PROPERTIES}
         VERSION ${NIFTI2_VERSION}
         SOVERSION ${NIFTI2_MAJOR_VERSION}
-        PKG_CONFIG nifti2.pc
         )
 endif()
 install_nifti_target(${NIFTI_NIFTILIB2_NAME})

nifti2/nifti2.pc.in

@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix="${prefix}"
-libdir="${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@"
-includedir="${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@"
+exec_prefix=${prefix}
+libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@
+includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@
 
 Name: nifti2
 Description: Core i/o routines for reading and writing nifti-2 format files

nifticdf/CMakeLists.txt

@@ -1,23 +1,23 @@
 set(NIFTI_CDFLIB_NAME ${NIFTI_PACKAGE_PREFIX}nifticdf)
 
 add_nifti_library(${NIFTI_CDFLIB_NAME} nifticdf.c )
+configure_file(nifticdf.pc.in nifticdf.pc @ONLY)
 set_target_properties(
   ${NIFTI_CDFLIB_NAME}
   PROPERTIES
     PUBLIC_HEADER
     "${CMAKE_CURRENT_LIST_DIR}/nifticdf.h"
+    PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/nifticdf.pc
   )
 target_compile_options(${NIFTI_CDFLIB_NAME} PRIVATE "-D__COMPILE_UNUSED_FUNCTIONS__")
 target_link_libraries(${NIFTI_CDFLIB_NAME} PUBLIC ${NIFTI_PACKAGE_PREFIX}niftiio)
 get_lib_version_vars("nifticdf_version.h" NIFTICDF_VERSION NIFTICDF_MAJOR_VERSION)
 if(BUILD_SHARED_LIBS)
-    configure_file(nifticdf.pc.in nifticdf.pc @ONLY)
     set_target_properties(${NIFTI_CDFLIB_NAME}
       PROPERTIES
         ${NIFTI_LIBRARY_PROPERTIES}
         VERSION ${NIFTICDF_VERSION}
         SOVERSION ${NIFTICDF_MAJOR_VERSION}
-        PKG_CONFIG nifticdf.pc
         )
 endif()
 install_nifti_target(${NIFTI_CDFLIB_NAME})

nifticdf/nifticdf.pc.in

@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix="${prefix}"
-libdir="${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@"
-includedir="${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@"
+exec_prefix=${prefix}
+libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@
+includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@
 
 Name: nifticdf
 Description: Functions to compute cumulative distributions and their inverses

niftilib/CMakeLists.txt

@@ -2,22 +2,22 @@ set(NIFTI_NIFTILIB_NAME ${NIFTI_PACKAGE_PREFIX}niftiio)
 
 add_nifti_library(${NIFTI_NIFTILIB_NAME} nifti1_io.c )
 target_link_libraries( ${NIFTI_NIFTILIB_NAME} PUBLIC ${NIFTI_PACKAGE_PREFIX}znz ${NIFTI_SYSTEM_MATH_LIB})
+configure_file(niftiio.pc.in niftiio.pc @ONLY)
 set_target_properties(
   ${NIFTI_NIFTILIB_NAME}
   PROPERTIES
     PUBLIC_HEADER
       "${CMAKE_CURRENT_LIST_DIR}/nifti1_io.h;${CMAKE_CURRENT_LIST_DIR}/nifti1.h"
+    PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/niftiio.pc
   )
 # Set library version when building shared libs.
 if(BUILD_SHARED_LIBS)
     get_lib_version_vars("nifti1_io_version.h" NIFTI_VERSION NIFTI_MAJOR_VERSION)
-    configure_file(niftiio.pc.in niftiio.pc @ONLY)
     set_target_properties(${NIFTI_NIFTILIB_NAME}
       PROPERTIES
         ${NIFTI_LIBRARY_PROPERTIES}
         VERSION ${NIFTI_VERSION}
         SOVERSION ${NIFTI_MAJOR_VERSION}
-        PKG_CONFIG niftiio.pc
         )
 endif()
 install_nifti_target(${NIFTI_NIFTILIB_NAME})

niftilib/niftiio.pc.in

@@ -1,11 +1,11 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix="${prefix}"
-libdir="${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@"
-includedir="${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@"
+exec_prefix=${prefix}
+libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@
+includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@
 
 Name: niftiio
 Description: Core i/o routines for reading and writing nifti-1 format files
 Version: @PROJECT_VERSION@
 Requires: znzlib
-Libs: -L${libdir} -lnitfiio
+Libs: -L${libdir} -lniftiio
 Cflags: -I${includedir}

znzlib/CMakeLists.txt

@@ -2,22 +2,22 @@ set(NIFTI_ZNZLIB_NAME ${NIFTI_PACKAGE_PREFIX}znz)
 
 add_nifti_library(${NIFTI_ZNZLIB_NAME} znzlib.c )
 target_link_libraries( ${NIFTI_ZNZLIB_NAME} PUBLIC ${NIFTI_ZLIB_LIBRARIES} )
+configure_file(znzlib.pc.in znzlib.pc @ONLY)
 set_target_properties(
   ${NIFTI_ZNZLIB_NAME}
   PROPERTIES
     PUBLIC_HEADER ${CMAKE_CURRENT_LIST_DIR}/znzlib.h
+    PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/znzlib.pc
     )
 target_compile_definitions(${NIFTI_ZNZLIB_NAME} PUBLIC  ${ZNZ_COMPILE_DEF})
 # Set library version if building shared libs.
 if(BUILD_SHARED_LIBS)
     get_lib_version_vars("znzlib_version.h" ZNZLIB_VERSION ZNZLIB_MAJOR_VERSION)
-    configure_file(znzlib.pc.in znzlib.pc @ONLY)
     set_target_properties(${NIFTI_ZNZLIB_NAME}
       PROPERTIES
         ${NIFTI_LIBRARY_PROPERTIES}
         VERSION ${ZNZLIB_VERSION}
         SOVERSION ${ZNZLIB_MAJOR_VERSION}
-        PKG_CONFIG znzlib.pc
         )
 endif()
 install_nifti_target(${NIFTI_ZNZLIB_NAME})

znzlib/znzlib.pc.in

@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix="${prefix}"
-libdir="${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@"
-includedir="${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@"
+exec_prefix=${prefix}
+libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@
+includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@
 zlib_support=true
 
 Name: znzlib