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

work on cleaner cmake.

Browse Source
This commit is contained in:
suter_a
2026-04-21 10:17:33 +02:00
parent cc77e2ab53
commit 9178b5ef0e
38 changed files with 426 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/classes/CMakeLists.txt
+18 -12
View File
@@ -132,7 +132,7 @@ target_include_directories(
PMusr BEFORE PRIVATE
$<BUILD_INTERFACE:${DKS_INCLUDE_DIR}>
$<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
$<BUILD_INTERFACE:${FFTW3_INCLUDE}>
$<BUILD_INTERFACE:${FFTW3_INCLUDE}>
$<BUILD_INTERFACE:${HDF4_INCLUDE_DIRS}>
$<BUILD_INTERFACE:${HDF5_INCLUDE_DIRS}>
$<BUILD_INTERFACE:${MUSRFIT_INC}>
@@ -142,6 +142,8 @@ target_include_directories(
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/mud/src>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/nexus>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
add_library(PUserFcnBase SHARED
@@ -171,14 +173,18 @@ set_target_properties(PRgeHandler
#--- make sure that the include directory is found ----------------------------
target_include_directories(
PUserFcnBase BEFORE PRIVATE
PUserFcnBase BEFORE PRIVATE
$<BUILD_INTERFACE:${MUSRFIT_INC}>
PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
target_include_directories(
PRgeHandler BEFORE PRIVATE
PRgeHandler BEFORE PRIVATE
$<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
$<BUILD_INTERFACE:${MUSRFIT_INC}>
PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
#--- add ROOT Version >= 6.24 compile options if needed -----------------------
@@ -195,7 +201,7 @@ if (DKS_FOUND)
endif (DKS_FOUND)
#--- add library dependencies -------------------------------------------------
set(DependOnLibs ${ROOT_LIBARIES})
set(DependOnLibs ${ROOT_LIBRARIES})
#set(DependOnLibs ${DependOnLibs} ${FFTW3_LIBRARY})
set(DependOnLibs ${DependOnLibs} FFTW3::FFTW3)
set(DependOnLibs ${DependOnLibs} PUserFcnBase)
@@ -220,17 +226,17 @@ if (DKS_FOUND)
endif (DKS_FOUND)
target_link_libraries(PUserFcnBase PRIVATE ${ROOT_LIBRARIES})
target_link_libraries(PRgeHandler PRIVATE ${Boost_LIBRARIES} ${ROOT_LIBRARIES})
target_link_libraries(PMusr PRIVATE ${Boost_LIBRARIES} ${DependOnLibs})
target_link_libraries(PRgeHandler PRIVATE ${BOOST_LINK_LIBS} ${ROOT_LIBRARIES})
target_link_libraries(PMusr PRIVATE ${BOOST_LINK_LIBS} ${DependOnLibs})
#--- install PUserFcnBase solib -----------------------------------------------
install(TARGETS PUserFcnBase EXPORT musrfitTargets DESTINATION lib)
install(TARGETS PUserFcnBase EXPORT musrfitTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
#--- install PRgeHandler solib -----------------------------------------------
install(TARGETS PRgeHandler EXPORT musrfitTargets DESTINATION lib)
install(TARGETS PRgeHandler EXPORT musrfitTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
#--- install PMusr solib ------------------------------------------------------
install(TARGETS PMusr EXPORT musrfitTargets DESTINATION lib)
install(TARGETS PMusr EXPORT musrfitTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
#--- install root pcm's and rootmaps ------------------------------------------
install(
@@ -248,7 +254,7 @@ install(
${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler.rootmap
${CMAKE_CURRENT_BINARY_DIR}/libPUserFcnBase_rdict.pcm
${CMAKE_CURRENT_BINARY_DIR}/libPUserFcnBase.rootmap
DESTINATION lib
DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
#--- install headers ----------------------------------------------------------
@@ -283,7 +289,7 @@ install(
${MUSRFIT_INC}/PStartupHandler.h
${MUSRFIT_INC}/PTheory.h
${MUSRFIT_INC}/PUserFcnBase.h
DESTINATION include
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
#--- install pkg-config info --------------------------------------------------
@@ -291,6 +297,6 @@ install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/PUserFcnBase.pc
${CMAKE_CURRENT_BINARY_DIR}/PRgeHandler.pc
${CMAKE_CURRENT_BINARY_DIR}/PMusr.pc
DESTINATION lib/pkgconfig
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)