1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
|
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Build both static and dynamic libraries for Debian;
Add SONAME support for the dynamic libraries
Last-Updated: 2016-06-26
Forwarded: no
Index: eccodes-2.45.0/fortran/CMakeLists.txt
===================================================================
--- eccodes-2.45.0.orig/fortran/CMakeLists.txt
+++ eccodes-2.45.0/fortran/CMakeLists.txt
@@ -72,6 +72,17 @@ if( HAVE_FORTRAN )
ecbuild_add_library( TARGET eccodes_f90
SOURCES grib_fortran.cc grib_f90.f90 eccodes_f90.f90 grib_kinds.h
GENERATED grib_f90.f90 eccodes_f90.f90
+ CFLAGS ${CFLAGS}
+ VERSION 0
+ PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
+ $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>
+ PRIVATE_LIBS eccodes )
+ ecbuild_add_library( TARGET eccodes_f90_static
+ TYPE STATIC
+ SOURCES grib_fortran.cc grib_f90.f90 eccodes_f90.f90 grib_kinds.h
+ GENERATED grib_f90.f90 eccodes_f90.f90
+ CFLAGS ${CFLAGS}
+ VERSION 0
PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>
PRIVATE_LIBS eccodes ${ECCODES_PTHREADS_LIBRARIES} )
Index: eccodes-2.45.0/src/eccodes/CMakeLists.txt
===================================================================
--- eccodes-2.45.0.orig/src/eccodes/CMakeLists.txt
+++ eccodes-2.45.0/src/eccodes/CMakeLists.txt
@@ -440,12 +440,43 @@ endif()
ecbuild_add_library(
TARGET eccodes
+ VERSION 0
SOURCES
${CMAKE_CURRENT_BINARY_DIR}/grib_api_version.cc
${eccodes_src_files}
PRIVATE_INCLUDES "${PNG_INCLUDE_DIRS}"
PRIVATE_LIBS
${ECCODES_EXTRA_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${PNG_LIBRARIES}
+ $<$<BOOL:${libaec_FOUND}>:libaec::aec>
+ PUBLIC_LIBS
+ ${CMATH_LIBRARIES}
+ ${THREADS_LIBRARIES}
+ TEMPLATES ${eccodes_extra_src_files}
+ INSTALL_HEADERS_LIST
+ grib_api.h
+ eccodes.h
+ eccodes_windef.h
+ ${CMAKE_CURRENT_BINARY_DIR}/eccodes_version.h
+ ${PROJECT_BINARY_DIR}/eccodes_config.h
+ PUBLIC_INCLUDES
+ $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src/eccodes>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/eccodes>
+ $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
+)
+
+ecbuild_add_library( TARGET eccodes_static
+ TYPE STATIC
+ VERSION 0
+ SOURCES ${CMAKE_CURRENT_BINARY_DIR}/grib_api_version.cc
+ # griby.cc gribl.cc
+ ${eccodes_src_files}
+
+ PRIVATE_INCLUDES "${PNG_INCLUDE_DIRS}"
+ PRIVATE_LIBS
+ ${ECCODES_EXTRA_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${PNG_LIBRARIES}
$<$<BOOL:${libaec_FOUND}>:libaec::aec>
|