From c5c5b16c462b1ecfe7206ddc8c6c2e9ba390cc67 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 27 Nov 2018 12:25:18 +0100 Subject: [PATCH] BNMR lib installation problems Adopted the build system for the BNMR libs such that the generated files are found and can be installed. The BNMR lib mantainers (ZS, JK) are responsible for the functionality though. --- src/external/libBNMR/libLineProfile/CMakeLists.txt | 14 +++++++------- .../{libLineProfile.cpp => LineProfile.cpp} | 2 +- .../{libLineProfile.h => LineProfile.h} | 0 ...ibLineProfileLinkDef.h => LineProfileLinkDef.h} | 0 src/external/libBNMR/libLineProfile/Makefile.am | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) rename src/external/libBNMR/libLineProfile/{libLineProfile.cpp => LineProfile.cpp} (99%) rename src/external/libBNMR/libLineProfile/{libLineProfile.h => LineProfile.h} (100%) rename src/external/libBNMR/libLineProfile/{libLineProfileLinkDef.h => LineProfileLinkDef.h} (100%) diff --git a/src/external/libBNMR/libLineProfile/CMakeLists.txt b/src/external/libBNMR/libLineProfile/CMakeLists.txt index 3663db0e..5ba98448 100644 --- a/src/external/libBNMR/libLineProfile/CMakeLists.txt +++ b/src/external/libBNMR/libLineProfile/CMakeLists.txt @@ -4,18 +4,18 @@ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) root_generate_dictionary( - libLineProfileDict + LineProfileDict -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} - libLineProfile.h - LINKDEF libLineProfileLinkDef.h - MODULE libLineProfile + LineProfile.h + LINKDEF LineProfileLinkDef.h + MODULE LineProfile ) #--- lib creation ------------------------------------------------------------- add_library(LineProfile SHARED - libLineProfile.cpp - libLineProfileDict.cxx + LineProfile.cpp + LineProfileDict.cxx ) #--- make sure that the include directory is found ---------------------------- @@ -48,7 +48,7 @@ install( #--- install libLineProfile header --------------------------------------------------- install( FILES - libLineProfile.h + LineProfile.h DESTINATION include ) diff --git a/src/external/libBNMR/libLineProfile/libLineProfile.cpp b/src/external/libBNMR/libLineProfile/LineProfile.cpp similarity index 99% rename from src/external/libBNMR/libLineProfile/libLineProfile.cpp rename to src/external/libBNMR/libLineProfile/LineProfile.cpp index 48269abb..58790068 100644 --- a/src/external/libBNMR/libLineProfile/libLineProfile.cpp +++ b/src/external/libBNMR/libLineProfile/LineProfile.cpp @@ -20,7 +20,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "libLineProfile.h" +#include "LineProfile.h" #include //for testing purposes //Implement helperfunctions diff --git a/src/external/libBNMR/libLineProfile/libLineProfile.h b/src/external/libBNMR/libLineProfile/LineProfile.h similarity index 100% rename from src/external/libBNMR/libLineProfile/libLineProfile.h rename to src/external/libBNMR/libLineProfile/LineProfile.h diff --git a/src/external/libBNMR/libLineProfile/libLineProfileLinkDef.h b/src/external/libBNMR/libLineProfile/LineProfileLinkDef.h similarity index 100% rename from src/external/libBNMR/libLineProfile/libLineProfileLinkDef.h rename to src/external/libBNMR/libLineProfile/LineProfileLinkDef.h diff --git a/src/external/libBNMR/libLineProfile/Makefile.am b/src/external/libBNMR/libLineProfile/Makefile.am index e1e89feb..03874921 100644 --- a/src/external/libBNMR/libLineProfile/Makefile.am +++ b/src/external/libBNMR/libLineProfile/Makefile.am @@ -1,19 +1,19 @@ ## Process this file with automake to create Makefile.in h_sources = \ - libLineProfile.h + LineProfile.h h_linkdef = \ - libLineProfile.h + LineProfile.h dict_h_sources = \ - libLineProfileDict.h + LineProfileDict.h cpp_sources = \ - libLineProfile.cpp + LineProfile.cpp dict_cpp_sources = \ - libLineProfileDict.cpp + LineProfileDict.cpp include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources)