From 60db1265f779ce2f4b424c877814a9c3cd226ccd Mon Sep 17 00:00:00 2001 From: Volker Jacht Date: Sun, 7 Feb 2021 15:28:08 +0100 Subject: [PATCH] Correct SOVERSION. Remove protocol version from CMake --- CMakeLists.txt | 5 ++++- src/CMakeLists.txt | 2 +- src/mma.c | 2 +- src/mma_config.h.in | 2 -- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e3c58b..7ac2346 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.8) + set(MMA_VERSION 1.0.0) -set(MMA_PROTOCOL_VERSION 1) +set(MMA_SO_VERSION 1) +# don't use lowercase "mma_VERSION", as it is generated by CMake + project(mma VERSION ${MMA_VERSION} LANGUAGES C) set(CMI_DOWNLOAD_TAG 88db46577abfbf624de26c300eb04b741d036493) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b1f8a3..a33ecb7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(mma SHARED target_include_directories(mma PUBLIC "../include") target_include_directories(mma PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") target_link_libraries(mma PUBLIC CMI::MPI_C) -set_target_properties(mma PROPERTIES VERSION ${MMA_VER} SOVERSION ${MMA_SO_VER}) +set_target_properties(mma PROPERTIES VERSION ${MMA_VERSION} SOVERSION ${MMA_SO_VERSION}) # Generate platform header include(CheckIncludeFiles) diff --git a/src/mma.c b/src/mma.c index a3f69d8..a3c5513 100644 --- a/src/mma.c +++ b/src/mma.c @@ -244,7 +244,7 @@ int mma_initialize() { int min_rank; int exe_id; int already_initialized_mpi; - int mma_local_version = MMA_PROTOCOL_VERSION; + int mma_local_version = 1; /* protocol version */ int mma_global_version = 0; MPI_Initialized(&already_initialized_mpi); diff --git a/src/mma_config.h.in b/src/mma_config.h.in index 5d79dd4..55d310a 100644 --- a/src/mma_config.h.in +++ b/src/mma_config.h.in @@ -1,3 +1 @@ #cmakedefine HAVE_WINDOWS_H 1 - -#define MMA_PROTOCOL_VERSION @MMA_PROTOCOL_VERSION@