Added installation of pkg-config files

Removed files no longer required from the scripts subdirectory. Fixes #384
nexusformat · Dec 9, 2015 · 618cd0a · 618cd0a
1 parent 4367ea4
commit 618cd0a
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 359 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,7 +59,7 @@ endif()
 #-----------------------------------------------------------------------------
 set (API_VERSION_MAJOR 4)
 set (API_VERSION_MINOR 4)
-set (API_VERSION_PATCH 0)
+set (API_VERSION_PATCH 1)
 set (API_VERSION "${API_VERSION_MAJOR}.${API_VERSION_MINOR}.${API_VERSION_PATCH}")
 set (ABI_CURRENT 1)
 set (ABI_REVISION 0)
@@ -68,7 +68,7 @@ set (ABI_VERSION "${ABI_CURRENT}.${ABI_REVISION}.${ABI_AGE}")
 
 set (NEXUS_VERSION_MAJOR 4)
 set (NEXUS_VERSION_MINOR 4)
-set (NEXUS_VERSION_PATCH 0)
+set (NEXUS_VERSION_PATCH 1)
 set (NEXUS_SONAME 4)
 set (NAPI_VERSION "${NEXUS_VERSION_MAJOR}.${NEXUS_VERSION_MINOR}.${NEXUS_VERSION_PATCH}")
 set (NXLTVERSINFO "${NEXUS_VERSION_MAJOR}:${NEXUS_VERSION_MINOR}:${NEXUS_VERSION_PATCH}")
@@ -220,6 +220,7 @@ add_subdirectory (include)
 add_subdirectory (src)
 add_subdirectory (test)
 add_subdirectory (bindings)
+add_subdirectory (scripts)
 
 #on user request utility applications will be built
 if(ENABLE_APPS)

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+configure_file(nexus.pc.in nexus.pc @ONLY)
+configure_file(nexus-cpp.pc.in nexus-cpp.pc @ONLY)
+configure_file(nexus-f77.pc.in nexus-f77.pc @ONLY)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nexus.pc  
+              ${CMAKE_CURRENT_BINARY_DIR}/nexus-cpp.pc
+              ${CMAKE_CURRENT_BINARY_DIR}/nexus-f77.pc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
diff --git a/scripts/configure_cmake_build.bat b/scripts/configure_cmake_build.bat
diff --git a/scripts/configure_mingw_kit b/scripts/configure_mingw_kit
diff --git a/scripts/file.MinGW b/scripts/file.MinGW
diff --git a/scripts/make_mingw_links b/scripts/make_mingw_links
diff --git a/scripts/make_vms.com b/scripts/make_vms.com
diff --git a/scripts/nexus-config.in b/scripts/nexus-config.in
diff --git a/scripts/nexus-cpp.pc.in b/scripts/nexus-cpp.pc.in
@@ -1,14 +1,12 @@
 #
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
-Name:@PACKAGE_NAME@ CPP bindings
+Name: nexus CPP bindings
 Description:Libraries and utilities for using NeXus format data files from C++
-Version:@PACKAGE_VERSION@-@PACKAGE_RELEASE@
-Requires:
-Conflicts:
-Libs:	-L${libdir} -lNeXusCPP -lNeXus
-Libs.private:	@HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ @LIBS@
+Version:@API_VERSION@
+Requires: nexus
+Libs:	-L${libdir} -lNeXusCPP 
 Cflags:	-I${includedir}/nexus -I${includedir}
diff --git a/scripts/nexus-f77.pc.in b/scripts/nexus-f77.pc.in
@@ -0,0 +1,12 @@
+#
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+Name: nexus Fortran 77 bindings
+Description:Libraries and utilities for using NeXus format data files from Fortran 77
+Version:@API_VERSION@
+Requires: nexus
+Libs:	-L${libdir} -lNeXus77 
+Cflags:	-I${includedir}/nexus -I${includedir}
diff --git a/scripts/nexus.pc.in b/scripts/nexus.pc.in
@@ -1,14 +1,11 @@
 #
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
-Name:@PACKAGE_NAME@
+Name: nexus
 Description:Libraries and utilities for using NeXus format data files
-Version:@PACKAGE_VERSION@-@PACKAGE_RELEASE@
-Requires:
-Conflicts:
+Version:@API_VERSION@
 Libs:	-L${libdir} -lNeXus
-Libs.private:	@HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ @LIBS@
 Cflags:	-I${includedir}/nexus -I${includedir}