[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35589] trunk/blender/source/creator/ CMakeLists.txt: missed removing WITH_INSTALL reference.
Campbell Barton
ideasman42 at gmail.com
Thu Mar 17 10:09:48 CET 2011
Revision: 35589
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35589
Author: campbellbarton
Date: 2011-03-17 09:09:48 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
missed removing WITH_INSTALL reference.
Modified Paths:
--------------
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-03-17 07:02:02 UTC (rev 35588)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-03-17 09:09:48 UTC (rev 35589)
@@ -191,197 +191,105 @@
set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH})
endif()
-if(WITH_INSTALL)
+# install target
+if(UNIX AND NOT APPLE)
- if(UNIX AND NOT APPLE)
+ if(WITH_INSTALL_PORTABLE)
+ set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
+ else()
+ set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
+ endif()
- if(WITH_INSTALL_PORTABLE)
- set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
- else()
- set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
- endif()
+ # important to make a clean install each time
+ # else old scripts get loaded.
+ install(
+ CODE
+ "file(REMOVE_RECURSE ${TARGETDIR_VER})"
+ )
- # important to make a clean install each time
- # else old scripts get loaded.
+ # message after building.
+ add_custom_command(
+ TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+ COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${TARGETDIR_VER}'
+ )
+
+ # there are a few differences between portable and system install
+ if(WITH_INSTALL_PORTABLE)
install(
- CODE
- "file(REMOVE_RECURSE ${TARGETDIR_VER})"
+ FILES
+ ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
+ ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/blender.svg
+ ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
+ DESTINATION ${TARGETDIR}
)
- # message after building.
- add_custom_command(
- TARGET blender POST_BUILD MAIN_DEPENDENCY blender
- COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${TARGETDIR_VER}'
+ install(
+ PROGRAMS
+ ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
+ DESTINATION ${TARGETDIR}
)
- # there are a few differences between portable and system install
- if(WITH_INSTALL_PORTABLE)
- install(
- FILES
- ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
- ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/blender.svg
- ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
- DESTINATION ${TARGETDIR}
- )
+ install(
+ DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/
+ DESTINATION ${TARGETDIR}
+ PATTERN ".svn" EXCLUDE
+ )
- install(
- PROGRAMS
- ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
- DESTINATION ${TARGETDIR}
- )
+ else()
+ # main blender binary
+ install(
+ PROGRAMS ${TARGETDIR}/blender
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+ )
+ if(WITH_GAMEENGINE AND WITH_PLAYER)
install(
- DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/
- DESTINATION ${TARGETDIR}
- PATTERN ".svn" EXCLUDE
- )
-
- else()
- # main blender binary
- install(
- PROGRAMS ${TARGETDIR}/blender
+ PROGRAMS ${TARGETDIR}/blenderplayer
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
)
-
- if(WITH_GAMEENGINE AND WITH_PLAYER)
- install(
- PROGRAMS ${TARGETDIR}/blenderplayer
- DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
- )
- endif()
-
- # misc files
- install(
- FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
- )
- install(
- FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/blender.svg
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
- )
- install(
- PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
- DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
- )
- install(
- FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
- )
- install(
- DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
- PATTERN ".svn" EXCLUDE
- )
endif()
+ # misc files
install(
- FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
- DESTINATION ${TARGETDIR_VER}/config
+ FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
)
-
- if(WITH_INTERNATIONAL)
- install(
- FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
- DESTINATION ${TARGETDIR_VER}/config
- )
-
- install(
- DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
- DESTINATION ${TARGETDIR_VER}/datafiles/
- PATTERN ".svn" EXCLUDE
- )
- endif()
-
- # plugins in blender 2.5 don't work at the moment.
- #
- # install(
- # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
- # DESTINATION ${TARGETDIR_VER}/
- # PATTERN ".svn" EXCLUDE
- # )
-
- if(WITH_PYTHON)
- # install(CODE "message(\"copying blender scripts...\")")
- install(
- DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
- DESTINATION ${TARGETDIR_VER}/
- PATTERN ".svn" EXCLUDE
- PATTERN "__pycache__" EXCLUDE
- )
-
- if(WITH_PYTHON_INSTALL)
- # Copy the systems python into the install directory
- # Scons copy in tools/Blender.py
- # install(CODE "message(\"copying a subset of the systems python...\")")
- install(
- DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
- DESTINATION ${TARGETDIR_VER}/python/lib/
- PATTERN ".svn" EXCLUDE
- PATTERN "__pycache__" EXCLUDE # ./distutils
- PATTERN "distutils" EXCLUDE # ./distutils
- PATTERN "lib2to3" EXCLUDE # ./lib2to3
- PATTERN "config" EXCLUDE # ./config
- PATTERN "config-*" EXCLUDE # ./config-*
- PATTERN "site-packages/*" EXCLUDE # ./site-packages/*
- PATTERN "tkinter" EXCLUDE # ./tkinter
- PATTERN "lib-dynload/_tkinter.*" EXCLUDE # ./lib-dynload/_tkinter.co
- PATTERN "test" EXCLUDE # ./test
- PATTERN "turtledemo" EXCLUDE # ./turtledemo
- )
-
- # # doesnt work, todo
- # install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
- endif()
- endif()
- elseif(WIN32)
-
- set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
-
- install( # same as linux!, deduplicate
- CODE
- "file(REMOVE_RECURSE ${TARGETDIR_VER})"
+ install(
+ FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/blender.svg
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
)
-
- install( # same as linux!, deduplicate
+ install(
+ PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+ )
+ install(
+ FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
+ )
+ install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/
- DESTINATION ${TARGETDIR}/
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
PATTERN ".svn" EXCLUDE
)
+ endif()
- install( # same as linux!, deduplicate
- FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
+ install(
+ FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
+ DESTINATION ${TARGETDIR_VER}/config
+ )
+
+ if(WITH_INTERNATIONAL)
+ install(
+ FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
DESTINATION ${TARGETDIR_VER}/config
)
- if(WITH_INTERNATIONAL) # same as linux!, deduplicate
- install(
- FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
- DESTINATION ${TARGETDIR_VER}/config
- )
- install(
- DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
- DESTINATION ${TARGETDIR_VER}/datafiles/
- PATTERN ".svn" EXCLUDE
- )
-
- if(NOT CMAKE_CL_64)
- install(
- FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
- DESTINATION ${TARGETDIR}/
- )
-
- install(
- FILES ${LIBDIR}/iconv/lib/iconv.dll
- DESTINATION ${TARGETDIR}/
- )
- endif()
- endif()
-
- install( # same as linux!, deduplicate
- DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale/
- DESTINATION ${TARGETDIR_VER}/datafiles/locale
+ install(
+ DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
+ DESTINATION ${TARGETDIR_VER}/datafiles/
PATTERN ".svn" EXCLUDE
)
+ endif()
# plugins in blender 2.5 don't work at the moment.
#
@@ -391,252 +299,341 @@
# PATTERN ".svn" EXCLUDE
# )
- if(WITH_PYTHON)
- # install(CODE "message(\"copying blender scripts...\")")
- install( # same as linux!, deduplicate
- DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
- DESTINATION ${TARGETDIR_VER}/
+ if(WITH_PYTHON)
+ # install(CODE "message(\"copying blender scripts...\")")
+ install(
+ DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
+ DESTINATION ${TARGETDIR_VER}/
+ PATTERN ".svn" EXCLUDE
+ PATTERN "__pycache__" EXCLUDE
+ )
+
+ if(WITH_PYTHON_INSTALL)
+ # Copy the systems python into the install directory
+ # Scons copy in tools/Blender.py
+ # install(CODE "message(\"copying a subset of the systems python...\")")
+ install(
+ DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
+ DESTINATION ${TARGETDIR_VER}/python/lib/
PATTERN ".svn" EXCLUDE
- PATTERN "__pycache__" EXCLUDE
+ PATTERN "__pycache__" EXCLUDE # ./distutils
+ PATTERN "distutils" EXCLUDE # ./distutils
+ PATTERN "lib2to3" EXCLUDE # ./lib2to3
+ PATTERN "config" EXCLUDE # ./config
+ PATTERN "config-*" EXCLUDE # ./config-*
+ PATTERN "site-packages/*" EXCLUDE # ./site-packages/*
+ PATTERN "tkinter" EXCLUDE # ./tkinter
+ PATTERN "lib-dynload/_tkinter.*" EXCLUDE # ./lib-dynload/_tkinter.co
+ PATTERN "test" EXCLUDE # ./test
+ PATTERN "turtledemo" EXCLUDE # ./turtledemo
)
- # TODO, multiple targets?
- install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR}/ CONFIGURATIONS Release)
- install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR}/ CONFIGURATIONS RelWithDebInfo)
- install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR}/ CONFIGURATIONS MinSizeRel)
+ # # doesnt work, todo
+ # install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
+ endif()
+ endif()
+elseif(WIN32)
- install(
- FILES ${LIBDIR}/python/lib/python32_d.dll
- DESTINATION ${TARGETDIR}/
- CONFIGURATIONS Debug
- )
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list