[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37020] trunk/blender/source/creator/ CMakeLists.txt: cmake formatting adjustment, no functional change.

Campbell Barton ideasman42 at gmail.com
Mon May 30 12:51:37 CEST 2011


Revision: 37020
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37020
Author:   campbellbarton
Date:     2011-05-30 10:51:37 +0000 (Mon, 30 May 2011)
Log Message:
-----------
cmake formatting adjustment, no functional change.

Modified Paths:
--------------
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-05-30 10:39:18 UTC (rev 37019)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-05-30 10:51:37 UTC (rev 37020)
@@ -191,10 +191,10 @@
 	set_target_properties(
 		blender
 		PROPERTIES
-				PREFIX ""
-				OUTPUT_NAME bpy
-				LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-				RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # only needed on windows
+			PREFIX ""
+			OUTPUT_NAME bpy
+			LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+			RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # only needed on windows
 	)
 	
 	if(WIN32)
@@ -257,9 +257,9 @@
 	if(WITH_INSTALL_PORTABLE)
 		install(
 			FILES
-			${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
-			${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
-			${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
+				${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
+				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
+				${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
 			DESTINATION ${TARGETDIR}
 		)
 
@@ -305,12 +305,12 @@
 		)
 		install(
 			DIRECTORY
-					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
-					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
-					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
-					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
-					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
-					${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
+				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
+				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
+				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
+				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
+				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
+				${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
 			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
 			PATTERN ".svn" EXCLUDE
 			PATTERN "*.svg" EXCLUDE
@@ -515,8 +515,8 @@
 	else()
 		install(
 			FILES
-			${LIBDIR}/png/lib/libpng.dll
-			${LIBDIR}/zlib/lib/zlib.dll
+				${LIBDIR}/png/lib/libpng.dll
+				${LIBDIR}/zlib/lib/zlib.dll
 			DESTINATION ${TARGETDIR}
 		)
 	endif()
@@ -536,11 +536,11 @@
 	if(WITH_CODEC_FFMPEG)
 		install(
 			FILES
-			${LIBDIR}/ffmpeg/lib/avcodec-52.dll
-			${LIBDIR}/ffmpeg/lib/avformat-52.dll
-			${LIBDIR}/ffmpeg/lib/avdevice-52.dll
-			${LIBDIR}/ffmpeg/lib/avutil-50.dll
-			${LIBDIR}/ffmpeg/lib/swscale-0.dll
+				${LIBDIR}/ffmpeg/lib/avcodec-52.dll
+				${LIBDIR}/ffmpeg/lib/avformat-52.dll
+				${LIBDIR}/ffmpeg/lib/avdevice-52.dll
+				${LIBDIR}/ffmpeg/lib/avutil-50.dll
+				${LIBDIR}/ffmpeg/lib/swscale-0.dll
 			DESTINATION ${TARGETDIR}
 		)
 
@@ -548,8 +548,7 @@
 
 	if(WITH_CODEC_SNDFILE)
 		install(
-			FILES
-			${LIBDIR}/sndfile/lib/libsndfile-1.dll
+			FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll
 			DESTINATION ${TARGETDIR}
 		)
 	endif()
@@ -557,8 +556,8 @@
 	if(WITH_OPENAL)
 		install(
 			FILES
-			${LIBDIR}/openal/lib/OpenAL32.dll
-			${LIBDIR}/openal/lib/wrap_oal.dll
+				${LIBDIR}/openal/lib/OpenAL32.dll
+				${LIBDIR}/openal/lib/wrap_oal.dll
 			DESTINATION ${TARGETDIR}
 		)
 	endif()
@@ -566,8 +565,7 @@
 	if(WITH_SDL)
 		if(NOT CMAKE_CL_64)
 			install(
-				FILES
-				${LIBDIR}/sdl/lib/SDL.dll
+				FILES ${LIBDIR}/sdl/lib/SDL.dll
 				DESTINATION ${TARGETDIR}
 			)
 		endif()
@@ -575,14 +573,12 @@
 
 	if(NOT CMAKE_CL_64)
 		install(
-			FILES
-			${LIBDIR}/thumbhandler/lib/BlendThumb.dll
+			FILES ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
 			DESTINATION ${TARGETDIR}
 		)
 	else()
 		install(
-			FILES
-			${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
+			FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
 			DESTINATION ${TARGETDIR}
 		)
 	endif()




More information about the Bf-blender-cvs mailing list