blender: Relocation WIP

This commit is contained in:
Alexpux
2014-10-09 18:51:10 +04:00
parent 801d1f147e
commit 15a3a85fc0
2 changed files with 17 additions and 11 deletions

View File

@@ -57,7 +57,7 @@ md5sums=('f39334b66d6634294b3ae179fcac6819'
'9c5a4e230d1c9081096d53d206cc03b4'
'e8dbeac11a43dc307fe826cd41100b8e'
'4d104bac37e549eb32cffd473550412e'
'78aa1afa4fa989605440a10eb61e8d18')
'3041207e37cb5dd01f5f75f35a0a7aed')
prepare() {
cd "$srcdir"/$_realname-$pkgver
@@ -82,6 +82,7 @@ build() {
#CXXFLAGS="$CFLAGS"
${MINGW_PREFIX}/bin/cmake \
-G"MSYS Makefiles" \
-DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \
-DMINGW_LIBS=${MINGW_PREFIX} \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_SYSTEM_GLEW=ON \

View File

@@ -63,19 +63,11 @@ diff -Naur blender-2.72-orig/source/creator/CMakeLists.txt blender-2.72/source/c
# Platform Specific Var: TARGETDIR_VER
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE OR MINGW)
+if((UNIX AND NOT APPLE) OR MINGW)
if(WITH_INSTALL_PORTABLE)
set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
else()
@@ -389,13 +389,14 @@
# -----------------------------------------------------------------------------
# Install Targets (Platform Specific)
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE OR MINGW)
if(NOT WITH_PYTHON_MODULE)
install(
@@ -396,6 +396,7 @@
CODE
"
execute_process(COMMAND
@@ -83,3 +75,16 @@ diff -Naur blender-2.72-orig/source/creator/CMakeLists.txt blender-2.72/source/c
${CMAKE_SOURCE_DIR}/doc/manpage/blender.1.py
${TARGETDIR}/blender
${TARGETDIR}/blender.1)
@@ -598,10 +599,10 @@
install(
FILES ${BLENDER_TEXT_FILES}
- DESTINATION ${TARGETDIR}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
)
- if(WITH_PYTHON)
+ if(WITH_PYTHON AND NOT MINGW)
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
install(