Merged muonspin/musrfit:root6 into master
This commit is contained in:
commit
3c607768b9
@ -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)
|
||||||
|
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
@ -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
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user