Cmake Cpack fix cpack on Apple and Linux
authorMartijn Berger <mberger@denc.nl>
Sat, 7 Nov 2015 21:42:21 +0000 (22:42 +0100)
committerMartijn Berger <mberger@denc.nl>
Sat, 7 Nov 2015 21:42:21 +0000 (22:42 +0100)
source/creator/CMakeLists.txt

index 8feb88278bfb53b17093421edee9f423443a540f..08390b585acba39beceb80c171af8b41b5129efe 100644 (file)
@@ -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)
                "