Attachment #282163 for bug #377857




		if(WITH_PYTHON_MODULE)
			set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
		else()
			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender-cycles/${BLENDER_VERSION})
		endif()
	endif()


			install(
				PROGRAMS ${TARGETDIR}/blender
				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
				RENAME blender-cycles-bin
			)
		endif()


		install(
			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
			RENAME blender-cycles.desktop
		)
		install(
			DIRECTORY

		install(
			PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
			RENAME blender-cycles-thumbnailer.py
		)
		install(
			FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
			RENAME blender-cycles.1
		)
		install(
			DIRECTORY ${CMAKE_SOURCE_DIR}/release/text
			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender-cycles
			PATTERN ".svn" EXCLUDE
		)
	endif()

Lines 47-53 Link Here

(-)intern/cycles/CMakeLists.txt (-1 / +1 lines)
47	if(WITH_INSTALL_PORTABLE)	47	if(WITH_INSTALL_PORTABLE)
48	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})	48	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
49	else()	49	else()
50	set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})	50	set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender-cycles/${BLENDER_VERSION})
51	endif()	51	endif()
52	elseif(WIN32)	52	elseif(WIN32)
53	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})	53	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})




		DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
ENDIF()

#IF(UNIX AND NOT APPLE)
	# copy libraries to cycles lib directory
	#	SET(install_libs
	#		${OPENIMAGEIO_LIBRARY}
	#	${Boost_LIBRARIES}
	#	${OSL_LIBRARIES}
	#	${PARTIO_LIBRARIES})
	
	#	LIST(REMOVE_ITEM install_libs optimized)
	#	LIST(REMOVE_ITEM install_libs debug)

	#	INSTALL(FILES ${install_libs}
	#		DESTINATION ${CYCLES_INSTALL_PATH}/cycles/lib)
	
	# set path to look for dynamic libs
	#	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib)
	#ENDIF()


Return to bug 377857

Lines 253-259 Link Here

(-)source/creator/CMakeLists.txt (-2 / +6 lines)
253	if(WITH_PYTHON_MODULE)	253	if(WITH_PYTHON_MODULE)
254	set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})	254	set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
255	else()	255	else()
256	set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})	256	set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender-cycles/${BLENDER_VERSION})
257	endif()	257	endif()
258	endif()	258	endif()
259		259
Lines 304-309 Link Here
304	install(	304	install(
305	PROGRAMS ${TARGETDIR}/blender	305	PROGRAMS ${TARGETDIR}/blender
306	DESTINATION ${CMAKE_INSTALL_PREFIX}/bin	306	DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
		307	RENAME blender-cycles-bin
307	)	308	)
308	endif()	309	endif()
309		310
Lines 319-324 Link Here
319	install(	320	install(
320	FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop	321	FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
321	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications	322	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
		323	RENAME blender-cycles.desktop
322	)	324	)
323	install(	325	install(
324	DIRECTORY	326	DIRECTORY
Lines 339-352 Link Here
339	install(	341	install(
340	PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py	342	PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
341	DESTINATION ${CMAKE_INSTALL_PREFIX}/bin	343	DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
		344	RENAME blender-cycles-thumbnailer.py
342	)	345	)
343	install(	346	install(
344	FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1	347	FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
345	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1	348	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
		349	RENAME blender-cycles.1
346	)	350	)
347	install(	351	install(
348	DIRECTORY ${CMAKE_SOURCE_DIR}/release/text	352	DIRECTORY ${CMAKE_SOURCE_DIR}/release/text
349	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender	353	DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender-cycles
350	PATTERN ".svn" EXCLUDE	354	PATTERN ".svn" EXCLUDE
351	)	355	)
352	endif()	356	endif()

Lines 89-109 Link Here

(-)intern/cycles/blender/CMakeLists.txt (-12 / +12 lines)
89	DESTINATION ${CYCLES_INSTALL_PATH}/cycles)	89	DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
90	ENDIF()	90	ENDIF()
91		91
92	IF(UNIX AND NOT APPLE)	92	#IF(UNIX AND NOT APPLE)
93	# copy libraries to cycles lib directory	93	# copy libraries to cycles lib directory
94	SET(install_libs	94	# SET(install_libs
95	${OPENIMAGEIO_LIBRARY}	95	# ${OPENIMAGEIO_LIBRARY}
96	${Boost_LIBRARIES}	96	# ${Boost_LIBRARIES}
97	${OSL_LIBRARIES}	97	# ${OSL_LIBRARIES}
98	${PARTIO_LIBRARIES})	98	# ${PARTIO_LIBRARIES})
99		99
100	LIST(REMOVE_ITEM install_libs optimized)	100	# LIST(REMOVE_ITEM install_libs optimized)
101	LIST(REMOVE_ITEM install_libs debug)	101	# LIST(REMOVE_ITEM install_libs debug)
102		102
103	INSTALL(FILES ${install_libs}	103	# INSTALL(FILES ${install_libs}
104	DESTINATION ${CYCLES_INSTALL_PATH}/cycles/lib)	104	# DESTINATION ${CYCLES_INSTALL_PATH}/cycles/lib)
105		105
106	# set path to look for dynamic libs	106	# set path to look for dynamic libs
107	SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib)	107	# SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib)
108	ENDIF()	108	#ENDIF()
109		109