Skip to content

Commit 94fe6e0

Browse files
Fixed library versin for Fortran 77 bindings
Update #389
1 parent b7209cc commit 94fe6e0

5 files changed

Lines changed: 5 additions & 102 deletions

File tree

applications/NXsummary/Makefile.am

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

applications/nxingest/Makefile.am

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

bindings/f77/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
#Make NeXus F77 Bindings Static Library
3030

31+
configure_file(napif.inc.in napif.inc @ONLY)
32+
3133
set (HEADERS napif.inc)
3234
set (SOURCES napif.f)
3335

@@ -45,8 +47,8 @@ add_library (NeXus_F77_Shared_Library SHARED ${HEADERS} ${SOURCES})
4547
#Note - library version needs to be got from somewhere?
4648
set_target_properties(NeXus_F77_Shared_Library PROPERTIES
4749
OUTPUT_NAME NeXus77
48-
VERSION 1.0
49-
SOVERSION 4)
50+
VERSION ${NAPI_VERSION}
51+
SOVERSION ${NEXUS_SONAME})
5052

5153
target_link_libraries(NeXus_F77_Shared_Library NeXus_Shared_Library)
5254

bindings/f77/Makefile.am

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ C------------------------------------------------------------------------------
2626

2727
C *** Version of NeXus interface - should be consistent with napi.h!
2828
CHARACTER*5 NEXUS_VERSION
29-
PARAMETER(NEXUS_VERSION='3.9.0')
29+
PARAMETER(NEXUS_VERSION='@NAPI_VERSION@')
3030
C *** NXaccess enum - access modes for NXopen
3131
INTEGER NXACC_READ,NXACC_RDWR,NXACC_CREATE, NXACC_CREATE5,
3232
+ NXACC_CREATE4, NXACC_CREATEXML

0 commit comments

Comments
 (0)