Skip to content

Commit 1692068

Browse files
committed
trying with bundle utilities
1 parent 8c8cdb2 commit 1692068

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build_scripts/macOS/internal/2a_appbundle.sh

-5
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ message=$(${QT_BASE_DIR}macdeployqt $INSTALL_PATH/$APPNAME \
3737
$ARGUMENTS 2>&1)
3838

3939

40-
install_name_tool -add_rpath "@executable_path/../Frameworks" $INSTALL_PATH/$APPNAME/Contents/MacOS/${APPNAME%.app}
41-
42-
dylibbundler -b -x $INSTALL_PATH/$APPNAME/Contents/MacOS/${APPNAME%.app} -d $INSTALL_PATH/$APPNAME/Contents/Frameworks -p @executable_path/../Frameworks
43-
44-
4540
# if message contains "ERROR" then macdeployqt failed
4641
if [[ $message == *"ERROR"* ]]; then
4742
echo "macdeployqt failed."

relightlab/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ file(GLOB ASSM_HEADERS ../external/assm/*.h ../external/assm/algorithms/*.h)
171171

172172

173173
add_executable(relightlab ${MACOSX_EXE_TARGET_OPTION} ${RELIGHTLAB_HEADERS} ${RELIGHTLAB_SOURCES} ${ASSM_SOURCES} ${ASSM_HEADERS} ${RELIGHTLAB_RESOURCES})
174+
175+
174176
target_include_directories(
175177
relightlab PUBLIC
176178
${CMAKE_CURRENT_SOURCE_DIR}
@@ -201,6 +203,9 @@ target_compile_definitions(relightlab
201203
RELIGHT_VERSION=${RELIGHT_VERSION})
202204

203205
if (APPLE)
206+
include(BundleUtilities)
207+
fixup_bundle("${CMAKE_CURRENT_BINARY_DIR}/relightlab.app/Contents/MacOS/relightlab" TRUE)
208+
204209
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/../build_scripts/relightlab.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
205210
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../build_scripts/relightlab.icns DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/relightlab.app/Contents/Resources/")
206211
set_target_properties(relightlab PROPERTIES

0 commit comments

Comments
 (0)