rpms
/
Field3D
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary patch.

This commit is contained in:
Richard M. Shaw 2014-09-05 08:54:52 -05:00
parent fdb79ac0bb
commit c67d2018dd
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Field3D-1.4.0-cmake_set_soversion.patch
View File

@ -1,27 +0,0 @@
diff -Naur Field3D-1.4.0.orig/CMakeLists.txt Field3D-1.4.0/CMakeLists.txt
--- Field3D-1.4.0.orig/CMakeLists.txt 2013-02-04 14:21:23.000000000 -0600
+++ Field3D-1.4.0/CMakeLists.txt 2013-02-07 13:45:14.751769946 -0600
@@ -129,8 +129,21 @@
TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} )
-SET_TARGET_PROPERTIES ( Field3D PROPERTIES VERSION 1.3.2)
-SET_TARGET_PROPERTIES ( Field3D PROPERTIES SOVERSION 1.3)
+# Parase version and soversion from export/ns.h
+
+file(STRINGS export/ns.h FIELD3D_MAJOR_VER REGEX "^#define FIELD3D_MAJOR_VER")
+file(STRINGS export/ns.h FIELD3D_MINOR_VER REGEX "^#define FIELD3D_MINOR_VER")
+file(STRINGS export/ns.h FIELD3D_MICRO_VER REGEX "^#define FIELD3D_MICRO_VER")
+string(REPLACE "#define FIELD3D_MAJOR_VER " "" FIELD3D_MAJOR_VER ${FIELD3D_MAJOR_VER})
+string(REPLACE "#define FIELD3D_MINOR_VER " "" FIELD3D_MINOR_VER ${FIELD3D_MINOR_VER})
+string(REPLACE "#define FIELD3D_MICRO_VER " "" FIELD3D_MICRO_VER ${FIELD3D_MICRO_VER})
+SET ( FIELD3D_VERSION ${FIELD3D_MAJOR_VER}.${FIELD3D_MINOR_VER}.${FIELD3D_MICRO_VER} )
+SET ( FIELD3D_SOVERSION ${FIELD3D_MAJOR_VER}.${FIELD3D_MINOR_VER} )
+
+message(STATUS "Library soversion will be: ${FIELD3D_SOVERSION}")
+
+SET_TARGET_PROPERTIES ( Field3D PROPERTIES VERSION ${FIELD3D_VERSION})
+SET_TARGET_PROPERTIES ( Field3D PROPERTIES SOVERSION ${FIELD3D_SOVERSION})
IF ( CMAKE_HOST_WIN32 )
SET_TARGET_PROPERTIES( Field3D PROPERTIES ENABLE_EXPORTS ON )

4
Field3D.spec
View File

@ -10,9 +10,6 @@ URL: https://sites.google.com/site/field3d/
# https://github.com/imageworks/Field3D/archive/v1.4.0.tar.gz
Source0: %{name}-%{version}.tar.gz
# Parse soversion from export/ns.h
Patch0: Field3D-1.4.0-cmake_set_soversion.patch
BuildRequires: cmake doxygen
BuildRequires: hdf5-devel
BuildRequires: boost-devel
@ -38,7 +35,6 @@ Development headers and documentation for %{name}.
%prep
%setup -q
#patch0 -p1 -b .cmake_sover
%build