Skip to content

Commit 618cd0a

Browse files
Added installation of pkg-config files
Removed files no longer required from the scripts subdirectory. Fixes #384
1 parent 4367ea4 commit 618cd0a

13 files changed

Lines changed: 39 additions & 359 deletions

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ endif()
5959
#-----------------------------------------------------------------------------
6060
set (API_VERSION_MAJOR 4)
6161
set (API_VERSION_MINOR 4)
62-
set (API_VERSION_PATCH 0)
62+
set (API_VERSION_PATCH 1)
6363
set (API_VERSION "${API_VERSION_MAJOR}.${API_VERSION_MINOR}.${API_VERSION_PATCH}")
6464
set (ABI_CURRENT 1)
6565
set (ABI_REVISION 0)
@@ -68,7 +68,7 @@ set (ABI_VERSION "${ABI_CURRENT}.${ABI_REVISION}.${ABI_AGE}")
6868

6969
set (NEXUS_VERSION_MAJOR 4)
7070
set (NEXUS_VERSION_MINOR 4)
71-
set (NEXUS_VERSION_PATCH 0)
71+
set (NEXUS_VERSION_PATCH 1)
7272
set (NEXUS_SONAME 4)
7373
set (NAPI_VERSION "${NEXUS_VERSION_MAJOR}.${NEXUS_VERSION_MINOR}.${NEXUS_VERSION_PATCH}")
7474
set (NXLTVERSINFO "${NEXUS_VERSION_MAJOR}:${NEXUS_VERSION_MINOR}:${NEXUS_VERSION_PATCH}")
@@ -220,6 +220,7 @@ add_subdirectory (include)
220220
add_subdirectory (src)
221221
add_subdirectory (test)
222222
add_subdirectory (bindings)
223+
add_subdirectory (scripts)
223224

224225
#on user request utility applications will be built
225226
if(ENABLE_APPS)

scripts/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
configure_file(nexus.pc.in nexus.pc @ONLY)
3+
configure_file(nexus-cpp.pc.in nexus-cpp.pc @ONLY)
4+
configure_file(nexus-f77.pc.in nexus-f77.pc @ONLY)
5+
6+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nexus.pc
7+
${CMAKE_CURRENT_BINARY_DIR}/nexus-cpp.pc
8+
${CMAKE_CURRENT_BINARY_DIR}/nexus-f77.pc
9+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
10+

scripts/Makefile.am

Lines changed: 0 additions & 10 deletions
This file was deleted.

scripts/configure_cmake_build.bat

Lines changed: 0 additions & 55 deletions
This file was deleted.

scripts/configure_mingw_kit

Lines changed: 0 additions & 5 deletions
This file was deleted.

scripts/file.MinGW

Lines changed: 0 additions & 22 deletions
This file was deleted.

scripts/make_mingw_links

Lines changed: 0 additions & 58 deletions
This file was deleted.

scripts/make_vms.com

Lines changed: 0 additions & 44 deletions
This file was deleted.

scripts/nexus-config.in

Lines changed: 0 additions & 35 deletions
This file was deleted.

scripts/nexus-cpp.pc.in

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
#
2-
prefix=@prefix@
3-
exec_prefix=@exec_prefix@
4-
libdir=@libdir@
5-
includedir=@includedir@
2+
prefix=@CMAKE_INSTALL_PREFIX@
3+
exec_prefix=${prefix}
4+
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
5+
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
66

7-
Name:@PACKAGE_NAME@ CPP bindings
7+
Name: nexus CPP bindings
88
Description:Libraries and utilities for using NeXus format data files from C++
9-
Version:@PACKAGE_VERSION@-@PACKAGE_RELEASE@
10-
Requires:
11-
Conflicts:
12-
Libs: -L${libdir} -lNeXusCPP -lNeXus
13-
Libs.private: @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ @LIBS@
9+
Version:@API_VERSION@
10+
Requires: nexus
11+
Libs: -L${libdir} -lNeXusCPP
1412
Cflags: -I${includedir}/nexus -I${includedir}

0 commit comments

Comments
 (0)