LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2018-11-27 14:32:03 +01:00
commit 813bad88ab
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/external/libBNMR/libLineProfile/CMakeLists.txt vendored
View File

@ -4,18 +4,18 @@
set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
root_generate_dictionary( root_generate_dictionary(
libLineProfileDict LineProfileDict
-I${FFTW3_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR}
-I${MUSRFIT_INC} -I${MUSRFIT_INC}
libLineProfile.h LineProfile.h
LINKDEF libLineProfileLinkDef.h LINKDEF LineProfileLinkDef.h
MODULE libLineProfile MODULE LineProfile
) )
#--- lib creation ------------------------------------------------------------- #--- lib creation -------------------------------------------------------------
add_library(LineProfile SHARED add_library(LineProfile SHARED
libLineProfile.cpp LineProfile.cpp
libLineProfileDict.cxx LineProfileDict.cxx
) )
#--- make sure that the include directory is found ---------------------------- #--- make sure that the include directory is found ----------------------------
@ -48,7 +48,7 @@ install(
#--- install libLineProfile header --------------------------------------------------- #--- install libLineProfile header ---------------------------------------------------
install( install(
FILES FILES
libLineProfile.h LineProfile.h
DESTINATION DESTINATION
include include
) )

2
src/external/libBNMR/libLineProfile/libLineProfile.cpp → src/external/libBNMR/libLineProfile/LineProfile.cpp vendored
View File

@ -20,7 +20,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "libLineProfile.h" #include "LineProfile.h"
#include <iostream> //for testing purposes #include <iostream> //for testing purposes
//Implement helperfunctions //Implement helperfunctions

0
src/external/libBNMR/libLineProfile/libLineProfile.h → src/external/libBNMR/libLineProfile/LineProfile.h vendored
View File

0
src/external/libBNMR/libLineProfile/libLineProfileLinkDef.h → src/external/libBNMR/libLineProfile/LineProfileLinkDef.h vendored
View File

10
src/external/libBNMR/libLineProfile/Makefile.am vendored
View File

@ -1,19 +1,19 @@
## Process this file with automake to create Makefile.in ## Process this file with automake to create Makefile.in
h_sources = \ h_sources = \
libLineProfile.h LineProfile.h
h_linkdef = \ h_linkdef = \
libLineProfile.h LineProfile.h
dict_h_sources = \ dict_h_sources = \
libLineProfileDict.h LineProfileDict.h
cpp_sources = \ cpp_sources = \
libLineProfile.cpp LineProfile.cpp
dict_cpp_sources = \ dict_cpp_sources = \
libLineProfileDict.cpp LineProfileDict.cpp
include_HEADERS = $(h_sources) include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources)