[Bf-blender-cvs] [2aa7967] master: OSX: add also license for iomp5 using cmake and fix all textfiles wrong destination

Jens Verwiebe noreply at git.blender.org
Mon Apr 6 19:56:08 CEST 2015


Commit: 2aa79679dca564b47f5db868160508adba9e08ca
Author: Jens Verwiebe
Date:   Mon Apr 6 19:55:51 2015 +0200
Branches: master
https://developer.blender.org/rB2aa79679dca564b47f5db868160508adba9e08ca

OSX: add also license for iomp5 using cmake and fix all textfiles wrong destination

===================================================================

M	source/creator/CMakeLists.txt

===================================================================

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 193737e..c0b0c2e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -843,7 +843,7 @@ elseif(APPLE)
 	)
 
 	# install release and app files
-	set(BLENDER_TEXT_FILES_DESTINATION blender.app/Contents)
+	set(BLENDER_TEXT_FILES_DESTINATION ".")
 
 	install(
 		FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
@@ -860,6 +860,11 @@ elseif(APPLE)
 			FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
 			DESTINATION blender.app/Contents/Resources/lib/
 		)
+		install(
+			FILES ${LIBDIR}/openmp/LICENSE.txt
+			DESTINATION "."
+			RENAME LICENSE-libiomp5.txt
+		)
 	endif()
 
 	if(WITH_LLVM AND NOT LLVM_STATIC)




More information about the Bf-blender-cvs mailing list