[med-svn] [libbpp-core] 01/04: New upstream version 2.3.1
Andreas Tille
tille at debian.org
Tue Jun 13 10:56:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository libbpp-core.
commit 2c87ed6eb0d7c8b7b2ceceefe78bf37c176fb467
Author: Andreas Tille <tille at debian.org>
Date: Tue Jun 13 11:16:44 2017 +0200
New upstream version 2.3.1
---
CMakeLists.txt | 12 +++++++-----
bpp-core.spec | 25 ++++++++++++-------------
cmake/doc-cmake-for-developpers.cmake | 24 ++++++++++++++----------
src/Bpp/Version.h | 3 ++-
src/CMakeLists.txt | 11 ++++++-----
5 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 986cebf..585323a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,8 +25,8 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
# library implements.
# In other words, the library implements all the interface numbers in the
# range from number current - age to current.
-SET(${PROJECT_NAME}_VERSION_CURRENT "2")
-SET(${PROJECT_NAME}_VERSION_REVISION "4")
+SET(${PROJECT_NAME}_VERSION_CURRENT "3")
+SET(${PROJECT_NAME}_VERSION_REVISION "0")
SET(${PROJECT_NAME}_VERSION_AGE "0")
# Effective version number computation
@@ -37,8 +37,10 @@ SET(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_
set (PROJECT_VERSION ${${PROJECT_NAME}_VERSION})
+include (GNUInstallDirs)
+
# CMake package
-set (cmake-package-location lib/cmake/${PROJECT_NAME})
+set (cmake-package-location ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
include (CMakePackageConfigHelpers)
configure_package_config_file (
package.cmake.in
@@ -75,10 +77,10 @@ ENDIF (DOXYGEN_FOUND)
# Packager
SET(CPACK_PACKAGE_NAME "libbpp-core")
SET(CPACK_PACKAGE_VENDOR "Bio++ Development Team")
-SET(CPACK_PACKAGE_VERSION "2.3.0")
+SET(CPACK_PACKAGE_VERSION "2.3.1")
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Bio++ Core library")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt")
SET(CPACK_RESOURCE_FILE_AUTHORS "${CMAKE_SOURCE_DIR}/AUTHORS.txt")
diff --git a/bpp-core.spec b/bpp-core.spec
index 68fdcb6..8bf43bc 100644
--- a/bpp-core.spec
+++ b/bpp-core.spec
@@ -1,5 +1,5 @@
%define _basename bpp-core
-%define _version 2.3.0
+%define _version 2.3.1
%define _release 1
%define _prefix /usr
@@ -23,17 +23,17 @@ AutoProv: yes
%description
This library contains the core classes and utilitary functions of the Bio++ project.
-%package -n libbpp-core2
+%package -n libbpp-core3
Summary: Bio++ Core library
Group: Development/Libraries/C and C++
-%description -n libbpp-core2
+%description -n libbpp-core3
This library contains the core classes and utilitary functions of the Bio++ project.
%package -n libbpp-core-devel
Summary: Libraries, includes to develop applications with %{_basename}
Group: Development/Libraries/C and C++
-Requires: libbpp-core2 = %{_version}
+Requires: libbpp-core3 = %{_version}
%description -n libbpp-core-devel
The libbpp-core-devel package contains the header files and static libraries for
@@ -45,9 +45,6 @@ building applications which use %{_basename}.
%build
CFLAGS="$RPM_OPT_FLAGS"
CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTING=OFF"
-if [ %{_lib} == 'lib64' ] ; then
- CMAKE_FLAGS="$CMAKE_FLAGS -DLIB_SUFFIX=64"
-fi
cmake $CMAKE_FLAGS .
make
@@ -57,11 +54,11 @@ make DESTDIR=$RPM_BUILD_ROOT install
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n libbpp-core2 -p /sbin/ldconfig
+%post -n libbpp-core3 -p /sbin/ldconfig
-%postun -n libbpp-core2 -p /sbin/ldconfig
+%postun -n libbpp-core3 -p /sbin/ldconfig
-%files -n libbpp-core2
+%files -n libbpp-core3
%defattr(-,root,root)
%doc AUTHORS.txt COPYING.txt INSTALL.txt ChangeLog
%{_prefix}/%{_lib}/lib*.so.*
@@ -69,14 +66,16 @@ rm -rf $RPM_BUILD_ROOT
%files -n libbpp-core-devel
%defattr(-,root,root)
%doc AUTHORS.txt COPYING.txt INSTALL.txt ChangeLog
-%dir %{_prefix}/lib/cmake/
-%dir %{_prefix}/lib/cmake/bpp-core
+%dir %{_prefix}/%{_lib}/cmake/
+%dir %{_prefix}/%{_lib}/cmake/bpp-core
%{_prefix}/%{_lib}/lib*.so
%{_prefix}/%{_lib}/lib*.a
-%{_prefix}/lib/cmake/bpp-core/bpp-core*.cmake
+%{_prefix}/%{_lib}/cmake/bpp-core/bpp-core*.cmake
%{_prefix}/include/*
%changelog
+* Tue Jun 06 2017 Julien Dutheil <julien.dutheil at univ-montp2.fr> 2.3.1-1
+- Increased interface number
* Wed May 10 2017 Julien Dutheil <julien.dutheil at univ-montp2.fr> 2.3.0-1
- New graph structures
- Upgrade to C++11
diff --git a/cmake/doc-cmake-for-developpers.cmake b/cmake/doc-cmake-for-developpers.cmake
index bbae8d1..12db7b3 100644
--- a/cmake/doc-cmake-for-developpers.cmake
+++ b/cmake/doc-cmake-for-developpers.cmake
@@ -54,6 +54,7 @@ set (PROJECT_VERSION ${${PROJECT_NAME}_VERSION})
if (CMAKE_INSTALL_PREFIX)
set (CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}" ${CMAKE_PREFIX_PATH})
endif (CMAKE_INSTALL_PREFIX)
+include (GNUInstallDirs)
find_package (bpp-neededcomponent x.y.z REQUIRED)
# Includes other needed bpp components.
# They must be installed to standard paths, or to the target install path (hence the search path addition).
@@ -65,8 +66,14 @@ find_package (bpp-neededcomponent x.y.z REQUIRED)
# using target_link_libraries (current_target bpp-neededcomponent-static) will add link, include, and compile option flags to the whole compilation.
# For convenience package files also define the BPP_LIBS_SHARED and BPP_LIBS_STATIC variables.
# These variables hold a list of all imported shared or static library targets of bpp.
-
-set (cmake-package-location lib/cmake/${PROJECT_NAME})
+#
+# GNUInstallDirs is a standard CMake module that defines distribution-specific install paths.
+# We use:
+# - CMAKE_INSTALL_LIBDIR : system specific <prefix>/lib.
+# It automatically adds a '64' suffix if 64 bits, and an arch subdir on debian.
+# - CMAKE_INSTALL_INCLUDEDIR : for homogeneity, in practice it is always <prefix>/include.
+
+set (cmake-package-location ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
# Place where cmake package and target files will be placed at install.
# This is one of the paths that find_package will check, others are possible, see find_package().
@@ -121,7 +128,7 @@ add_library (${PROJECT_NAME}-static STATIC ${CPP_FILES})
target_include_directories (${PROJECT_NAME}-static PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
+ $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
)
# Annotates the static lib target with include paths.
# These paths will be added as -I options:
@@ -140,7 +147,7 @@ target_link_libraries (${PROJECT_NAME}-static ${BPP_LIBS_STATIC})
add_library (${PROJECT_NAME}-shared SHARED ${CPP_FILES})
target_include_directories (${PROJECT_NAME}-shared PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:include>
+ $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
)
set_target_properties (${PROJECT_NAME}-shared
PROPERTIES OUTPUT_NAME ${PROJECT_NAME}
@@ -149,17 +156,14 @@ set_target_properties (${PROJECT_NAME}-shared
SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}
)
target_link_libraries (${PROJECT_NAME}-shared ${BPP_LIBS_SHARED})
-target_compile_options (${PROJECT_NAME}-shared
- PUBLIC ${public-compile-options}
- PRIVATE ${private-compile-options}
- )
# Build the shared lib, using the same system
install (
TARGETS ${PROJECT_NAME}-static ${PROJECT_NAME}-shared
EXPORT ${PROJECT_NAME}-targets
- LIBRARY DESTINATION lib${LIB_SUFFIX}
- ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
# Install libraries, while recording them under "${PROJECT_NAME}-targets"
diff --git a/src/Bpp/Version.h b/src/Bpp/Version.h
index a1f5415..29fff91 100644
--- a/src/Bpp/Version.h
+++ b/src/Bpp/Version.h
@@ -40,7 +40,8 @@ knowledge of the CeCILL license and that you accept its terms.
#ifndef _VERSION_H_
#define _VERSION_H_
-#define BPP_VERSION 2.3.0
+#define BPP_VERSION "2.3.1"
+#define BPP_REL_DATE "06/06/17"
#endif //_VERSION_H_
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 33aa38c..8acf767 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -100,7 +100,7 @@ set (CPP_FILES
add_library (${PROJECT_NAME}-static STATIC ${CPP_FILES})
target_include_directories (${PROJECT_NAME}-static PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
+ $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
)
set_target_properties (${PROJECT_NAME}-static PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
target_link_libraries (${PROJECT_NAME}-static ${BPP_LIBS_STATIC})
@@ -109,7 +109,7 @@ target_link_libraries (${PROJECT_NAME}-static ${BPP_LIBS_STATIC})
add_library (${PROJECT_NAME}-shared SHARED ${CPP_FILES})
target_include_directories (${PROJECT_NAME}-shared PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
+ $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
)
set_target_properties (${PROJECT_NAME}-shared
PROPERTIES OUTPUT_NAME ${PROJECT_NAME}
@@ -123,12 +123,13 @@ target_link_libraries (${PROJECT_NAME}-shared ${BPP_LIBS_SHARED})
install (
TARGETS ${PROJECT_NAME}-static ${PROJECT_NAME}-shared
EXPORT ${PROJECT_NAME}-targets
- LIBRARY DESTINATION lib${LIB_SUFFIX}
- ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
install (
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bpp
- DESTINATION include
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING PATTERN "*.h"
)
# Install cmake file representing targets
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-core.git
More information about the debian-med-commit
mailing list