Description: Add versioing to the shared libraries Author: Alastair McKinstry Last-Updated: 2018-12-22 Forwarded: no Index: odb-api-0.18.1/odb_api/src/ecml/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb_api/src/ecml/CMakeLists.txt +++ odb-api-0.18.1/odb_api/src/ecml/CMakeLists.txt @@ -135,6 +135,7 @@ ecbuild_add_library( TARGET INSTALL_HEADERS LISTED HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/ecml SOURCES ${ecml_srcs} + VERSION 0d LIBS eckit eckit_cmd # for UserInput metkit Index: odb-api-0.18.1/eckit/src/eckit/cmd/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/eckit/src/eckit/cmd/CMakeLists.txt +++ odb-api-0.18.1/eckit/src/eckit/cmd/CMakeLists.txt @@ -74,5 +74,6 @@ ecbuild_add_library( TARGET INSTALL_HEADERS LISTED SOURCES ${eckit_cmd_srcs} HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/cmd + VERSION 0d INCLUDES ${CURSES_INCLUDE_DIR} LIBS eckit ${CURSES_LIBRARIES} ) Index: odb-api-0.18.1/eckit/src/eckit/geometry/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/eckit/src/eckit/geometry/CMakeLists.txt +++ odb-api-0.18.1/eckit/src/eckit/geometry/CMakeLists.txt @@ -19,7 +19,8 @@ ecbuild_add_library(TARGET eckit_geometr HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/geometry SOURCES - ${eckit_geometry_srcs} + ${eckit_geometry_srcs} + VERSION 0d LIBS eckit ) Index: odb-api-0.18.1/eckit/src/eckit/linalg/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/eckit/src/eckit/linalg/CMakeLists.txt +++ odb-api-0.18.1/eckit/src/eckit/linalg/CMakeLists.txt @@ -30,6 +30,7 @@ ecbuild_add_library( TARGET INSTALL_HEADERS ALL HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/linalg SOURCES ${eckit_la_srcs} + VERSION 0d INCLUDES "${ARMADILLO_INCLUDE_DIRS}" "${CUDA_INCLUDE_DIRS}" "${MKL_INCLUDE_DIRS}" Index: odb-api-0.18.1/eckit/src/eckit/maths/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/eckit/src/eckit/maths/CMakeLists.txt +++ odb-api-0.18.1/eckit/src/eckit/maths/CMakeLists.txt @@ -11,5 +11,6 @@ ecbuild_add_library( TARGET INSTALL_HEADERS ALL HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/maths SOURCES ${eckit_maths_lib_srcs} + VERSION 0d INCLUDES "${EIGEN3_INCLUDE_DIR}" LIBS eckit "${LAPACK_LIBRARIES}" "${BLAS_LIBRARIES}" ) Index: odb-api-0.18.1/eckit/src/eckit/mpi/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/eckit/src/eckit/mpi/CMakeLists.txt +++ odb-api-0.18.1/eckit/src/eckit/mpi/CMakeLists.txt @@ -40,7 +40,8 @@ ecbuild_add_library(TARGET eckit_mpi HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/mpi SOURCES - ${eckit_mpi_srcs} + ${eckit_mpi_srcs} + VERSION 0d DEFINITIONS "${eckit_mpi_defs}" INCLUDES Index: odb-api-0.18.1/eckit/src/eckit/option/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/eckit/src/eckit/option/CMakeLists.txt +++ odb-api-0.18.1/eckit/src/eckit/option/CMakeLists.txt @@ -20,6 +20,8 @@ ecbuild_add_library( CmdArgs.cc CmdArgs.h + VERSION + 0d TEMPLATES FactoryOption.cc VectorOption.cc Index: odb-api-0.18.1/eckit/src/eckit/web/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/eckit/src/eckit/web/CMakeLists.txt +++ odb-api-0.18.1/eckit/src/eckit/web/CMakeLists.txt @@ -45,7 +45,8 @@ Url.h) ecbuild_add_library( TARGET eckit_web INSTALL_HEADERS LISTED SOURCES - ${eckit_web_srcs} + ${eckit_web_srcs} + VERSION 0d PERSISTENT HtmlObject.h HEADER_DESTINATION Index: odb-api-0.18.1/metkit/src/metkit/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/metkit/src/metkit/CMakeLists.txt +++ odb-api-0.18.1/metkit/src/metkit/CMakeLists.txt @@ -118,6 +118,8 @@ ecbuild_add_library( SOURCES ${metkit_srcs} + VERSION + 0d PRIVATE_INCLUDES ${ECKIT_INCLUDE_DIRS} ${ECCODES_INCLUDE_DIRS} Index: odb-api-0.18.1/odb_api/src/fortran/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb_api/src/fortran/CMakeLists.txt +++ odb-api-0.18.1/odb_api/src/fortran/CMakeLists.txt @@ -12,7 +12,7 @@ ecbuild_add_library(TARGET Odb_fortran # Legacy: odb_c_binding.f90 - + VERSION 0d LIBS Odb ) set( test_environment_fortran Index: odb-api-0.18.1/odb_api/src/odb_api/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb_api/src/odb_api/CMakeLists.txt +++ odb-api-0.18.1/odb_api/src/odb_api/CMakeLists.txt @@ -465,6 +465,7 @@ ecbuild_add_library( TARGET HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api COMPONENT server SOURCES ${odblib_src_files} + VERSION 0d GENERATED ODBAPIVersionSHA1.cc TEMPLATES ${odblib_templates} LINKER_LANGUAGE CXX Index: odb-api-0.18.1/odb_api/src/odb_api/tools/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb_api/src/odb_api/tools/CMakeLists.txt +++ odb-api-0.18.1/odb_api/src/odb_api/tools/CMakeLists.txt @@ -113,6 +113,7 @@ ecbuild_add_library( TARGET odbtools INSTALL_HEADERS LISTED HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api/tools SOURCES ${odbtools_src_files} + VERSION 0d TEMPLATES ${odbtools_templates} LIBS Odb ) @@ -120,6 +121,7 @@ ecbuild_add_library( TARGET odbtest #INSTALL_HEADERS LISTED #HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api/tools SOURCES ${odbtest_src_files} + VERSION 0d TEMPLATES ${odbtest_templates} LIBS Odb odbtools ) Index: odb-api-0.18.1/eckit/src/eckit/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/eckit/src/eckit/CMakeLists.txt +++ odb-api-0.18.1/eckit/src/eckit/CMakeLists.txt @@ -774,7 +774,9 @@ ecbuild_add_library(TARGET eckit HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit SOURCES - ${eckit_srcs} + ${eckit_srcs} + VERSION + 0d GENERATED eckit_version.cc TEMPLATES Index: odb-api-0.18.1/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt +++ odb-api-0.18.1/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt @@ -29,6 +29,7 @@ ecbuild_add_library( TARGET Odb2Netc #HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api #COMPONENT server SOURCES ${odb2netcdf_src_files} + VERSION 0d PRIVATE_INCLUDES ${NETCDF_INCLUDE_DIRS} LIBS Odb odbtools ${NETCDF_LIBRARIES} CONDITION HAVE_NETCDF) Index: odb-api-0.18.1/odb/src/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb/src/CMakeLists.txt +++ odb-api-0.18.1/odb/src/CMakeLists.txt @@ -28,6 +28,7 @@ set_property(SOURCE aux/codb_netcdf.c au ecbuild_add_library(TARGET odb_lib OUTPUT_NAME odb SOURCES ${odb_aux_files} ${odb_lib_files} ${odb_module_files} + VERSION 0d PRIVATE_INCLUDES ${ODB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/interface ${CMAKE_CURRENT_SOURCE_DIR}/extras/ifsaux/include Index: odb-api-0.18.1/odb/src/compiler/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb/src/compiler/CMakeLists.txt +++ odb-api-0.18.1/odb/src/compiler/CMakeLists.txt @@ -15,8 +15,9 @@ include_directories(${ODB_INCLUDE_DIRS}) ecbuild_generate_yy(YYPREFIX yy YACC yacc LEX lex DEPENDANT cmd.c odb98.c YACC_TARGET y.tab) ecbuild_add_library(TARGET odbsqlcompiler - SOURCES ${source_files} lex.c y.tab.c - LIBS odb_lib) + SOURCES ${source_files} lex.c y.tab.c + VERSION 0d + LIBS odb_lib) ecbuild_add_executable(TARGET odb98.x SOURCES odb98.c LIBS odbsqlcompiler) Index: odb-api-0.18.1/odb/cmake/odb_add_schema.cmake =================================================================== --- odb-api-0.18.1.orig/odb/cmake/odb_add_schema.cmake +++ odb-api-0.18.1/odb/cmake/odb_add_schema.cmake @@ -133,6 +133,7 @@ macro(odb_add_schema) ecbuild_add_library(TARGET ${TARGET} DEFINITIONS ${_PAR_DEFINITIONS} SOURCES ${TARGET}.c ${TARGET}.h ${TARGET}_Sstatic.c ${table_sources} ${view_sources} + VERSION 0d PRIVATE_INCLUDES ${CMAKE_CURRENT_BINARY_DIR} ${ODB_INCLUDE_DIRS} LIBS ${ODB_LIBRARIES} CFLAGS -O0 Index: odb-api-0.18.1/odb/src/extras/ec/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb/src/extras/ec/CMakeLists.txt +++ odb-api-0.18.1/odb/src/extras/ec/CMakeLists.txt @@ -12,4 +12,4 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8) add_definitions(-D_ABI64) endif() -ecbuild_add_library(TARGET odbec SOURCES ${_odb_ec_sources}) +ecbuild_add_library(TARGET odbec VERSION 0d SOURCES ${_odb_ec_sources}) Index: odb-api-0.18.1/odb/src/extras/ifsaux/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb/src/extras/ifsaux/CMakeLists.txt +++ odb-api-0.18.1/odb/src/extras/ifsaux/CMakeLists.txt @@ -121,7 +121,8 @@ list(APPEND _odb_ifsaux_sources include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) ecbuild_add_library(TARGET odbifsaux - SOURCES ${_odb_ifsaux_sources} + SOURCES ${_odb_ifsaux_sources} + VERSION 0d PRIVATE_INCLUDES ${_ODB_MPI_INCLUDE_DIRS} LIBS ${_ODB_MPI_LIBS} ${_ODB_EMOS_LIBS}) Index: odb-api-0.18.1/odb/src/lib/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb/src/lib/CMakeLists.txt +++ odb-api-0.18.1/odb/src/lib/CMakeLists.txt @@ -77,6 +77,7 @@ list(APPEND _odb_dummy_sources ) ecbuild_add_library(TARGET odbdummy - PRIVATE_INCLUDES ${ODB_INCLUDE_DIRS} + PRIVATE_INCLUDES ${ODB_INCLUDE_DIRS} + VERSION 0d SOURCES ${_odb_dummy_sources} LIBS odbifsaux) Index: odb-api-0.18.1/odb/src/extras/emos/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb/src/extras/emos/CMakeLists.txt +++ odb-api-0.18.1/odb/src/extras/emos/CMakeLists.txt @@ -12,6 +12,7 @@ ecbuild_add_library(TARGET odbemos DEFINITIONS INTEGER_IS_INT PRIVATE_INCLUDES ${ODB_INCLUDE_DIRS} SOURCES ${_odb_emos_sources} + VERSION 0d CONDITION NOT HAVE_ODB_EMOS) if(NOT HAVE_ODB_EMOS) Index: odb-api-0.18.1/odb-tools/src/migrator/CMakeLists.txt =================================================================== --- odb-api-0.18.1.orig/odb-tools/src/migrator/CMakeLists.txt +++ odb-api-0.18.1/odb-tools/src/migrator/CMakeLists.txt @@ -29,6 +29,7 @@ ecbuild_add_library( TARGET Odbmigrator SOURCES ${migrator_srcs} + VERSION 0d TEMPLATES ImportODBTool.cc