[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35931] trunk/blender/source/creator/ CMakeLists.txt: fix for cmake / windows from mont29 on IRC.
Campbell Barton
ideasman42 at gmail.com
Fri Apr 1 08:39:19 CEST 2011
Revision: 35931
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35931
Author: campbellbarton
Date: 2011-04-01 06:39:19 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
fix for cmake / windows from mont29 on IRC.
Modified Paths:
--------------
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-04-01 06:14:39 UTC (rev 35930)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-04-01 06:39:19 UTC (rev 35931)
@@ -547,20 +547,21 @@
)
endif()
endif()
-
- add_custom_command(TARGET blender
- POST_BUILD
- MAIN_DEPENDENCY blender
- COMMAND copy /Y \"${LIBDIR}\\thumbhandler\\lib\\BlendThumb64.dll\" \"${TARGETDIR}\\\"
- )
- if(NOT CMAKE_CL_64)
- add_custom_command(TARGET blender
- POST_BUILD
- MAIN_DEPENDENCY blender
- COMMAND copy /Y \"${LIBDIR}\\thumbhandler\\lib\\BlendThumb.dll\" \"${TARGETDIR}\\\"
- )
- endif()
+ if(NOT CMAKE_CL_64)
+ install(
+ FILES
+ ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
+ DESTINATION ${TARGETDIR}/
+ )
+ else()
+ install(
+ FILES
+ ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
+ DESTINATION ${TARGETDIR}/
+ )
+ endif()
+
elseif(APPLE)
set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
More information about the Bf-blender-cvs
mailing list