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 2022-06-21 17:34:53 +02:00
commit 3c607768b9
5 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

1
src/musredit_qt6/mupp/CMakeLists.txt
View File

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

2
src/musredit_qt6/musrStep/CMakeLists.txt
View File

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

1
src/musredit_qt6/musrWiz/CMakeLists.txt
View File

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

2
src/musredit_qt6/musredit/CMakeLists.txt
View File

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