From 2f19aa11673c7290b4115e4c6b7d3f613394dca4 Mon Sep 17 00:00:00 2001 From: Ivan Tsybulin <tsybulinhome@gmail.com> Date: Tue, 20 Sep 2022 00:34:04 +0300 Subject: [PATCH] fixed build of shared libs --- ParLib.src/CMakeLists.txt | 3 +-- ParLib.src/parlibf.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ParLib.src/CMakeLists.txt b/ParLib.src/CMakeLists.txt index 5f9fe6b..bc239e3 100644 --- a/ParLib.src/CMakeLists.txt +++ b/ParLib.src/CMakeLists.txt @@ -85,13 +85,12 @@ if(BUILD_STATIC_LIBS) add_definitions(-DFORTRANUNDERSCORE) elseif(FORTRANDOUBLEUNDERSCORE) add_definitions(-DFORTRANDOUBLEUNDERSCORE) - else() + endif() include(FortranCInterface) FortranCInterface_VERIFY() FortranCInterface_HEADER(${CMAKE_CURRENT_SOURCE_DIR}/FC.h MACRO_NAMESPACE "FC_") message(STATUS "FORTRAN_C_INTEFACE TEST: ${FortranCInterface_VERIFIED_C}") add_definitions(-DFC_MANGLE=1) - endif() add_library(parlibf-static STATIC "") target_sources( parlibf-static PRIVATE diff --git a/ParLib.src/parlibf.c b/ParLib.src/parlibf.c index ee54da8..e2be420 100644 --- a/ParLib.src/parlibf.c +++ b/ParLib.src/parlibf.c @@ -1,8 +1,6 @@ #include <stdlib.h> #include "parlib.h" -#ifdef FC_MANGLE -# include "FC.h" -#endif +#include "FC.h" // ParLib v1.8 initialization // -------------------------------------------------------------------------- // #ifdef FORTRANUNDERSCORE -- GitLab