From 8c3538c3e7f816b43cb8cf33570e4082d5bec5ec Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Sat, 7 Nov 2015 22:42:21 +0100 Subject: Cmake Cpack fix cpack on Apple and Linux --- source/creator/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 8feb88278bf..08390b585ac 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -292,7 +292,8 @@ elseif(APPLE) else() set(TARGETDIR_VER blender.app/Contents/Resources/${BLENDER_VERSION}) endif() - + # Skip relinking on cpack / install + set_target_properties(blender PROPERTIES BUILD_WITH_INSTALL_RPATH true) endif() @@ -1020,7 +1021,7 @@ if(DEFINED BLENDER_TEXT_FILES_DESTINATION) " file(READ \"${CMAKE_SOURCE_DIR}/release/text/readme.html\" DATA_SRC) string(REGEX REPLACE \"BLENDER_VERSION\" \"${BLENDER_VERSION}\" DATA_DST \"\${DATA_SRC}\") - file(WRITE \"\${CMAKE_BINARY_DIR}/release/text/readme.html\" \"\${DATA_DST}\") + file(WRITE \"${CMAKE_BINARY_DIR}/release/text/readme.html\" \"\${DATA_DST}\") unset(DATA_SRC) unset(DATA_DST) " -- cgit v1.2.3