diff options
| author | Martijn Berger <mberger@denc.nl> | 2015-11-08 00:42:21 +0300 |
|---|---|---|
| committer | Martijn Berger <mberger@denc.nl> | 2015-11-08 00:42:21 +0300 |
| commit | 8c3538c3e7f816b43cb8cf33570e4082d5bec5ec (patch) | |
| tree | 0180546b307b35cb318288477fe8435519a19486 /source/creator | |
| parent | ee8fbebd46e07ee28124d5ed7355ad19ef5c3631 (diff) | |
Cmake Cpack fix cpack on Apple and Linux
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
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) " |