Skip to content

Commit d2133fd

Browse files
kleisauketintou
kleisauke
authored and
tintou
committed
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
1 parent 02ed319 commit d2133fd

File tree

9 files changed

+25
-23
lines changed

9 files changed

+25
-23
lines changed

‎cmake/nifti_macros.cmake‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,11 @@ function(install_nifti_target target_name)
134134
PUBLIC_HEADER DESTINATION ${NIFTI_INSTALL_INCLUDE_DIR}
135135
COMPONENT Development
136136
INCLUDES DESTINATION ${NIFTI_INSTALL_INCLUDE_DIR}
137-
COMPONENT Development
138-
PKG_CONFIG DESTINATION ${NIFTI_INSTALL_PKGCONFIG_DIR}
139137
)
138+
139+
install(FILES $<TARGET_PROPERTY:${target_name},PKG_CONFIG>
140+
COMPONENT Development
141+
DESTINATION ${NIFTI_INSTALL_PKGCONFIG_DIR})
140142
endfunction()
141143

142144
function(get_lib_version_var ver_header_text ver_type version_out)

‎nifti2/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ set(NIFTI_NIFTILIB2_NAME ${NIFTI_PACKAGE_PREFIX}nifti2)
22

33
add_nifti_library(${NIFTI_NIFTILIB2_NAME} nifti2_io.c )
44
target_link_libraries( ${NIFTI_NIFTILIB2_NAME} PUBLIC ${NIFTI_PACKAGE_PREFIX}znz ${NIFTI_SYSTEM_MATH_LIB})
5+
configure_file(nifti2.pc.in nifti2.pc @ONLY)
56
set_target_properties(
67
${NIFTI_NIFTILIB2_NAME}
78
PROPERTIES
89
PUBLIC_HEADER
910
"${CMAKE_CURRENT_LIST_DIR}/nifti1.h;${CMAKE_CURRENT_LIST_DIR}/nifti2.h;${CMAKE_CURRENT_LIST_DIR}/nifti2_io.h"
11+
PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/nifti2.pc
1012
)
1113
# Set library version when building shared libs.
1214
if(BUILD_SHARED_LIBS)
1315
get_lib_version_vars("nifti2_io_version.h" NIFTI2_VERSION NIFTI2_MAJOR_VERSION)
14-
configure_file(nifti2.pc.in nifti2.pc @ONLY)
1516
set_target_properties(${NIFTI_NIFTILIB2_NAME}
1617
PROPERTIES
1718
${NIFTI_LIBRARY_PROPERTIES}
1819
VERSION ${NIFTI2_VERSION}
1920
SOVERSION ${NIFTI2_MAJOR_VERSION}
20-
PKG_CONFIG nifti2.pc
2121
)
2222
endif()
2323
install_nifti_target(${NIFTI_NIFTILIB2_NAME})

‎nifti2/nifti2.pc.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
prefix=@CMAKE_INSTALL_PREFIX@
2-
exec_prefix="${prefix}"
3-
libdir="${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@"
4-
includedir="${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@"
2+
exec_prefix=${prefix}
3+
libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@
4+
includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@
55

66
Name: nifti2
77
Description: Core i/o routines for reading and writing nifti-2 format files

‎nifticdf/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
set(NIFTI_CDFLIB_NAME ${NIFTI_PACKAGE_PREFIX}nifticdf)
22

33
add_nifti_library(${NIFTI_CDFLIB_NAME} nifticdf.c )
4+
configure_file(nifticdf.pc.in nifticdf.pc @ONLY)
45
set_target_properties(
56
${NIFTI_CDFLIB_NAME}
67
PROPERTIES
78
PUBLIC_HEADER
89
"${CMAKE_CURRENT_LIST_DIR}/nifticdf.h"
10+
PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/nifticdf.pc
911
)
1012
target_compile_options(${NIFTI_CDFLIB_NAME} PRIVATE "-D__COMPILE_UNUSED_FUNCTIONS__")
1113
target_link_libraries(${NIFTI_CDFLIB_NAME} PUBLIC ${NIFTI_PACKAGE_PREFIX}niftiio)
1214
get_lib_version_vars("nifticdf_version.h" NIFTICDF_VERSION NIFTICDF_MAJOR_VERSION)
1315
if(BUILD_SHARED_LIBS)
14-
configure_file(nifticdf.pc.in nifticdf.pc @ONLY)
1516
set_target_properties(${NIFTI_CDFLIB_NAME}
1617
PROPERTIES
1718
${NIFTI_LIBRARY_PROPERTIES}
1819
VERSION ${NIFTICDF_VERSION}
1920
SOVERSION ${NIFTICDF_MAJOR_VERSION}
20-
PKG_CONFIG nifticdf.pc
2121
)
2222
endif()
2323
install_nifti_target(${NIFTI_CDFLIB_NAME})

‎nifticdf/nifticdf.pc.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
prefix=@CMAKE_INSTALL_PREFIX@
2-
exec_prefix="${prefix}"
3-
libdir="${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@"
4-
includedir="${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@"
2+
exec_prefix=${prefix}
3+
libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@
4+
includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@
55

66
Name: nifticdf
77
Description: Functions to compute cumulative distributions and their inverses

‎niftilib/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ set(NIFTI_NIFTILIB_NAME ${NIFTI_PACKAGE_PREFIX}niftiio)
22

33
add_nifti_library(${NIFTI_NIFTILIB_NAME} nifti1_io.c )
44
target_link_libraries( ${NIFTI_NIFTILIB_NAME} PUBLIC ${NIFTI_PACKAGE_PREFIX}znz ${NIFTI_SYSTEM_MATH_LIB})
5+
configure_file(niftiio.pc.in niftiio.pc @ONLY)
56
set_target_properties(
67
${NIFTI_NIFTILIB_NAME}
78
PROPERTIES
89
PUBLIC_HEADER
910
"${CMAKE_CURRENT_LIST_DIR}/nifti1_io.h;${CMAKE_CURRENT_LIST_DIR}/nifti1.h"
11+
PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/niftiio.pc
1012
)
1113
# Set library version when building shared libs.
1214
if(BUILD_SHARED_LIBS)
1315
get_lib_version_vars("nifti1_io_version.h" NIFTI_VERSION NIFTI_MAJOR_VERSION)
14-
configure_file(niftiio.pc.in niftiio.pc @ONLY)
1516
set_target_properties(${NIFTI_NIFTILIB_NAME}
1617
PROPERTIES
1718
${NIFTI_LIBRARY_PROPERTIES}
1819
VERSION ${NIFTI_VERSION}
1920
SOVERSION ${NIFTI_MAJOR_VERSION}
20-
PKG_CONFIG niftiio.pc
2121
)
2222
endif()
2323
install_nifti_target(${NIFTI_NIFTILIB_NAME})

‎niftilib/niftiio.pc.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
prefix=@CMAKE_INSTALL_PREFIX@
2-
exec_prefix="${prefix}"
3-
libdir="${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@"
4-
includedir="${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@"
2+
exec_prefix=${prefix}
3+
libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@
4+
includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@
55

66
Name: niftiio
77
Description: Core i/o routines for reading and writing nifti-1 format files
88
Version: @PROJECT_VERSION@
99
Requires: znzlib
10-
Libs: -L${libdir} -lnitfiio
10+
Libs: -L${libdir} -lniftiio
1111
Cflags: -I${includedir}

‎znzlib/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ set(NIFTI_ZNZLIB_NAME ${NIFTI_PACKAGE_PREFIX}znz)
22

33
add_nifti_library(${NIFTI_ZNZLIB_NAME} znzlib.c )
44
target_link_libraries( ${NIFTI_ZNZLIB_NAME} PUBLIC ${NIFTI_ZLIB_LIBRARIES} )
5+
configure_file(znzlib.pc.in znzlib.pc @ONLY)
56
set_target_properties(
67
${NIFTI_ZNZLIB_NAME}
78
PROPERTIES
89
PUBLIC_HEADER ${CMAKE_CURRENT_LIST_DIR}/znzlib.h
10+
PKG_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/znzlib.pc
911
)
1012
target_compile_definitions(${NIFTI_ZNZLIB_NAME} PUBLIC ${ZNZ_COMPILE_DEF})
1113
# Set library version if building shared libs.
1214
if(BUILD_SHARED_LIBS)
1315
get_lib_version_vars("znzlib_version.h" ZNZLIB_VERSION ZNZLIB_MAJOR_VERSION)
14-
configure_file(znzlib.pc.in znzlib.pc @ONLY)
1516
set_target_properties(${NIFTI_ZNZLIB_NAME}
1617
PROPERTIES
1718
${NIFTI_LIBRARY_PROPERTIES}
1819
VERSION ${ZNZLIB_VERSION}
1920
SOVERSION ${ZNZLIB_MAJOR_VERSION}
20-
PKG_CONFIG znzlib.pc
2121
)
2222
endif()
2323
install_nifti_target(${NIFTI_ZNZLIB_NAME})

‎znzlib/znzlib.pc.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
prefix=@CMAKE_INSTALL_PREFIX@
2-
exec_prefix="${prefix}"
3-
libdir="${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@"
4-
includedir="${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@"
2+
exec_prefix=${prefix}
3+
libdir=${prefix}/@NIFTI_INSTALL_LIBRARY_DIR@
4+
includedir=${prefix}/@NIFTI_INSTALL_INCLUDE_DIR@
55
zlib_support=true
66

77
Name: znzlib

0 commit comments

Comments
 (0)