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

Merge branch 'root6' of ssh://git.psi.ch/nemu/musrfit into root6

Browse Source
This commit is contained in:
suter_a 2022-12-21 15:09:25 +01:00
commit a3276dd352
2 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/external/libFitPofB/classes/CMakeLists.txt vendored
View File

@ -5,15 +5,15 @@ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
set(BMW_TOOLS_INC ${CMAKE_SOURCE_DIR}/src/external/BMWtools) set(BMW_TOOLS_INC ${CMAKE_SOURCE_DIR}/src/external/BMWtools)
set(FIT_P_OF_B_INC ${CMAKE_CURRENT_SOURCE_DIR}/../include) set(FIT_P_OF_B_INC ${CMAKE_CURRENT_SOURCE_DIR}/../include)
# ROOT requires that the dictonary header files are found at configuration time. # ROOT requires that the dictonary header files are found at configuration time.
# Hence, target_include_directories cannot be used here because, targets are # Hence, target_include_directories cannot be used here because, targets are
# setup only afterwards. # setup only afterwards.
include_directories(${FIT_P_OF_B_INC}) include_directories(${FIT_P_OF_B_INC})
root_generate_dictionary( root_generate_dictionary(
TLondon1DDict TLondon1DDict
TLondon1D.h TLondon1D.h
OPTIONS OPTIONS
-I${FFTW3_INCLUDE} -I${FFTW3_INCLUDE}
-I${MUSRFIT_INC} -I${MUSRFIT_INC}
-I${BMW_TOOLS_INC} -I${BMW_TOOLS_INC}
-I${FIT_P_OF_B_INC} -I${FIT_P_OF_B_INC}
@ -22,10 +22,10 @@ root_generate_dictionary(
MODULE TLondon1D MODULE TLondon1D
) )
root_generate_dictionary( root_generate_dictionary(
TVortexDict TVortexDict
TVortex.h TVortex.h
OPTIONS OPTIONS
-I${FFTW3_INCLUDE} -I${FFTW3_INCLUDE}
-I${MUSRFIT_INC} -I${MUSRFIT_INC}
-I${BMW_TOOLS_INC} -I${BMW_TOOLS_INC}
-I${FIT_P_OF_B_INC} -I${FIT_P_OF_B_INC}
@ -34,10 +34,10 @@ root_generate_dictionary(
MODULE TVortex MODULE TVortex
) )
root_generate_dictionary( root_generate_dictionary(
TSkewedGssDict TSkewedGssDict
TSkewedGss.h TSkewedGss.h
OPTIONS OPTIONS
-I${FFTW3_INCLUDE} -I${FFTW3_INCLUDE}
-I${MUSRFIT_INC} -I${MUSRFIT_INC}
-I${BMW_TOOLS_INC} -I${BMW_TOOLS_INC}
-I${POFB_INC} -I${POFB_INC}
@ -49,10 +49,10 @@ root_generate_dictionary(
#--- create pkg-config info --------------------------------------------------- #--- create pkg-config info ---------------------------------------------------
#[==[ //as35 for now do not create a pkgconfig file #[==[ //as35 for now do not create a pkgconfig file
set(prefix "${CMAKE_INSTALL_PREFIX}") set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "\$\{prefix\}") set(exec_prefix "\$\{prefix\}")
set(libdir "\$\{exec_prefix\}/lib") set(libdir "\$\{exec_prefix\}/lib")
set(includedir "\$\{prefix\}/include") set(includedir "\$\{prefix\}/include")
set(FIT_P_OF_B_VERSION "1.0.0") set(FIT_P_OF_B_VERSION "1.0.0")
set(FIT_P_OF_B_LIBRARY_NAME "FitPofB") set(FIT_P_OF_B_LIBRARY_NAME "FitPofB")
configure_file("FitPofB.pc.in" "FitPofB.pc" @ONLY) configure_file("FitPofB.pc.in" "FitPofB.pc" @ONLY)
@ -62,7 +62,7 @@ configure_file("FitPofB.pc.in" "FitPofB.pc" @ONLY)
add_library(FitPofB SHARED add_library(FitPofB SHARED
TBofZCalc.cpp TBofZCalc.cpp
TBulkTriVortexFieldCalc.cpp TBulkTriVortexFieldCalc.cpp
TFilmTriVortexFieldCalc.cpp TFilmTriVortexFieldCalc.cpp
TLondon1D.cpp TLondon1D.cpp
TLondon1DDict.cxx TLondon1DDict.cxx
TPofBCalc.cpp TPofBCalc.cpp
@ -81,8 +81,8 @@ set_target_properties(FitPofB
#--- make sure that the include directory is found ---------------------------- #--- make sure that the include directory is found ----------------------------
target_include_directories( target_include_directories(
FitPofB BEFORE PRIVATE FitPofB BEFORE PRIVATE
$<BUILD_INTERFACE:${FFTW3_INCLUDE}> $<BUILD_INTERFACE:${FFTW3_INCLUDE}>
$<BUILD_INTERFACE:${MUSRFIT_INC}> $<BUILD_INTERFACE:${MUSRFIT_INC}>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/TLemRunHeader> $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/TLemRunHeader>
$<BUILD_INTERFACE:${BMW_TOOLS_INC}> $<BUILD_INTERFACE:${BMW_TOOLS_INC}>
@ -96,12 +96,16 @@ if (OpenMP_FOUND)
endif (OpenMP_FOUND) endif (OpenMP_FOUND)
set(gomp "") set(gomp "")
if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) if (OpenMP_FOUND)
set(gomp gomp) if (OpenMP_CXX_LIBRARIES)
endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) set(gomp ${OpenMP_CXX_LIBRARIES})
else (OpenMP_CXX_LIBRARIES)
set(gomp ${OpenMP_CXX_FLAGS}) # for older cmake OpenMP_CXX_LIBRARIES is not defined
endif (OpenMP_CXX_LIBRARIES)
endif (OpenMP_FOUND)
target_link_libraries(FitPofB target_link_libraries(FitPofB
${gomp} ${gomp}
FFTW3::FFTW3 FFTW3::FFTW3F ${ROOT_LIBRARIES} FFTW3::FFTW3 FFTW3::FFTW3F ${ROOT_LIBRARIES}
TLemRunHeader PUserFcnBase BMWtools TLemRunHeader PUserFcnBase BMWtools
) )
@ -121,7 +125,7 @@ install(
#--- install FitPofB header --------------------------------------------------- #--- install FitPofB header ---------------------------------------------------
install( install(
FILES FILES
${CMAKE_CURRENT_SOURCE_DIR}/../include/TBofZCalc.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/TBofZCalc.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/TBulkTriVortexFieldCalc.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/TBulkTriVortexFieldCalc.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/TFilmTriVortexFieldCalc.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/TFilmTriVortexFieldCalc.h
@ -130,7 +134,7 @@ install(
${CMAKE_CURRENT_SOURCE_DIR}/../include/TPofTCalc.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/TPofTCalc.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/TSkewedGss.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/TSkewedGss.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/TVortex.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/TVortex.h
DESTINATION DESTINATION
include include
) )
@ -141,4 +145,3 @@ install(
DESTINATION lib/pkgconfig DESTINATION lib/pkgconfig
) )
#]==] #]==]

31
src/external/libLFRelaxation/CMakeLists.txt vendored
View File

@ -4,15 +4,15 @@
set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
set(BMW_TOOLS_INC ${CMAKE_SOURCE_DIR}/src/external/BMWtools) set(BMW_TOOLS_INC ${CMAKE_SOURCE_DIR}/src/external/BMWtools)
# ROOT requires that the dictonary header files are found at configuration time. # ROOT requires that the dictonary header files are found at configuration time.
# Hence, target_include_directories cannot be used here because, targets are # Hence, target_include_directories cannot be used here because, targets are
# setup only afterwards. # setup only afterwards.
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
root_generate_dictionary( root_generate_dictionary(
TLFRelaxationDict TLFRelaxationDict
TLFRelaxation.h TLFRelaxation.h
OPTIONS OPTIONS
-I${FFTW3_INCLUDE} -I${FFTW3_INCLUDE}
-I${MUSRFIT_INC} -I${MUSRFIT_INC}
-I${BMW_TOOLS_INC} -I${BMW_TOOLS_INC}
-inlineInputHeader -inlineInputHeader
@ -22,10 +22,10 @@ root_generate_dictionary(
#--- create pkg-config info --------------------------------------------------- #--- create pkg-config info ---------------------------------------------------
#[==[ //as35 for now do not create a pkgconfig file #[==[ //as35 for now do not create a pkgconfig file
set(prefix "${CMAKE_INSTALL_PREFIX}") set(prefix "${CMAKE_INSTALL_PREFIX}")
set(exec_prefix "\$\{prefix\}") set(exec_prefix "\$\{prefix\}")
set(libdir "\$\{exec_prefix\}/lib") set(libdir "\$\{exec_prefix\}/lib")
set(includedir "\$\{prefix\}/include") set(includedir "\$\{prefix\}/include")
set(T_LF_RELAXATION_VERSION "1.0.0") set(T_LF_RELAXATION_VERSION "1.0.0")
set(T_LF_RELAXATION_LIBRARY_NAME "TLFRelaxation") set(T_LF_RELAXATION_LIBRARY_NAME "TLFRelaxation")
configure_file("TLFRelaxation.pc.in" "TLFRelaxation.pc" @ONLY) configure_file("TLFRelaxation.pc.in" "TLFRelaxation.pc" @ONLY)
@ -45,8 +45,8 @@ set_target_properties(LFRelaxation
#--- make sure that the include directory is found ---------------------------- #--- make sure that the include directory is found ----------------------------
target_include_directories( target_include_directories(
LFRelaxation BEFORE PRIVATE LFRelaxation BEFORE PRIVATE
$<BUILD_INTERFACE:${FFTW3_INCLUDE}> $<BUILD_INTERFACE:${FFTW3_INCLUDE}>
$<BUILD_INTERFACE:${MUSRFIT_INC}> $<BUILD_INTERFACE:${MUSRFIT_INC}>
$<BUILD_INTERFACE:${BMW_TOOLS_INC}> $<BUILD_INTERFACE:${BMW_TOOLS_INC}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@ -58,9 +58,13 @@ if (OpenMP_FOUND)
endif (OpenMP_FOUND) endif (OpenMP_FOUND)
set(gomp "") set(gomp "")
if (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) if (OpenMP_FOUND)
set(gomp gomp) if (OpenMP_CXX_LIBRARIES)
endif (OpenMP_FOUND AND (${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)) set(gomp ${OpenMP_CXX_LIBRARIES})
else (OpenMP_CXX_LIBRARIES)
set(gomp ${OpenMP_CXX_FLAGS}) # for older cmake OpenMP_CXX_LIBRARIES is not defined
endif (OpenMP_CXX_LIBRARIES)
endif (OpenMP_FOUND)
target_link_libraries(LFRelaxation target_link_libraries(LFRelaxation
${gomp} ${gomp}
${GSL_LIBRARIES} FFTW3::FFTW3F ${GSL_LIBRARIES} FFTW3::FFTW3F
@ -79,9 +83,9 @@ install(
#--- install TLFRelaxation header --------------------------------------------- #--- install TLFRelaxation header ---------------------------------------------
install( install(
FILES FILES
TLFRelaxation.h TLFRelaxation.h
DESTINATION DESTINATION
include include
) )
@ -92,4 +96,3 @@ install(
DESTINATION lib/pkgconfig DESTINATION lib/pkgconfig
) )
#]==] #]==]