Merged muonspin/musrfit:root6 into master

This commit is contained in:
Zaher Salman 2022-06-21 17:34:53 +02:00
commit 3c607768b9
5 changed files with 42 additions and 40 deletions

View File

@ -264,7 +264,7 @@ endif (OpenMP_FOUND)
if (nexus)
message("")
message(" HDF4 found in ${HDF4_INCLUDE_DIRS}")
message(" HDF4 found in ${HDF4_INCLUDE_DIRS}")
message(" HDF5 found in ${HDF5_INCLUDE_DIRS}")
message(" NeXus found in ${NEXUS_INCLUDE_DIR}")
endif (nexus)

View File

@ -104,6 +104,7 @@ if (APPLE)
MACOSX_FRAMEWORK_IDENTIFIER ch.psi.mupp
MACOSX_BUNDLE_COPYRIGHT "Andreas Suter"
RESOURCE "${RESOURCE_FILES}"
INSTALL_RPATH "${Qt6_DIR}/../.."
)
endif (APPLE)

View File

@ -62,6 +62,7 @@ if (APPLE)
MACOSX_BUNDLE_GUI_IDENTIFIER "ch.psi.lmu.musrStep"
MACOSX_BUNDLE_COPYRIGHT "Andreas Suter"
RESOURCE ${macosx_icon}
INSTALL_RPATH "${Qt6_DIR}/../.."
)
endif (APPLE)
@ -74,4 +75,3 @@ else (APPLE)
RUNTIME DESTINATION bin
)
endif (APPLE)

View File

@ -66,6 +66,7 @@ if (APPLE)
MACOSX_BUNDLE_GUI_IDENTIFIER "ch.psi.lmu.musrWiz"
MACOSX_BUNDLE_COPYRIGHT "Andreas Suter"
RESOURCE ${macosx_icon}
INSTALL_RPATH "${Qt6_DIR}/../.."
)
endif (APPLE)

View File

@ -115,6 +115,7 @@ if (APPLE)
MACOSX_BUNDLE_GUI_IDENTIFIER "ch.psi.lmu.musredit"
MACOSX_BUNDLE_COPYRIGHT "Andreas Suter"
RESOURCE ${macosx_icon}
INSTALL_RPATH "${Qt6_DIR}/../.."
)
endif (APPLE)
@ -138,4 +139,3 @@ install(
${CMAKE_INSTALL_PREFIX}/share/doc/musrfit
MESSAGE_NEVER
)