improvement dealing with rpath on macOS.

This commit is contained in:
2022-06-20 15:53:57 +02:00
parent 3bde35910c
commit 9cf5b5b49c
5 changed files with 41 additions and 39 deletions

View File

@@ -2,9 +2,9 @@
#--- check if project source is repo ------------------------------------------
if (IS_GIT_REPO)
set(HAVE_GIT_REV_H "-DHAVE_GIT_REV_H")
set(HAVE_GIT_REV_H "-DHAVE_GIT_REV_H")
else (IS_GIT_REPO)
set(HAVE_GIT_REV_H "")
set(HAVE_GIT_REV_H "")
endif (IS_GIT_REPO)
#--- instruct CMake to run moc automatically when needed ----------------------
@@ -30,10 +30,10 @@ if (APPLE)
add_executable(musrWiz MACOSX_BUNDLE
${musrWiz_src}
musrWiz.qrc
${macosx_icon}
${macosx_icon}
)
else (APPLE)
add_executable(musrWiz
add_executable(musrWiz
${musrWiz_src}
musrWiz.qrc
)
@@ -50,7 +50,7 @@ target_include_directories(musrWiz
target_compile_options(musrWiz
PRIVATE
"${HAVE_GIT_REV_H}"
"${HAVE_GIT_REV_H}"
)
target_link_libraries(musrWiz PRIVATE ${qt_libs})
@@ -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)