formatting edits only
This commit is contained in:
@@ -125,7 +125,7 @@ if(WIN32 AND NOT UNIX)
|
||||
-DBLEN_VER_RC_4=0
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
list(APPEND SRC
|
||||
../icons/winblender.rc
|
||||
@@ -198,16 +198,16 @@ if(WITH_PYTHON_MODULE)
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
|
||||
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin # only needed on windows
|
||||
)
|
||||
|
||||
|
||||
if(WIN32)
|
||||
# python modules use this
|
||||
set_target_properties(
|
||||
blender
|
||||
PROPERTIES
|
||||
SUFFIX ".pyd"
|
||||
)
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
else()
|
||||
add_executable(blender ${EXETYPE} ${SRC})
|
||||
endif()
|
||||
@@ -687,14 +687,14 @@ elseif(APPLE)
|
||||
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/python)
|
||||
|
||||
set(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
|
||||
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
|
||||
COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
|
||||
COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
|
||||
COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
|
||||
DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
|
||||
|
||||
|
||||
add_dependencies(blender extractpyzip)
|
||||
|
||||
# copy extracted python files
|
||||
@@ -728,7 +728,7 @@ elseif(APPLE)
|
||||
FILES ${PLAYER_SOURCEDIR}/Contents/PkgInfo
|
||||
DESTINATION ${TARGETDIR}/blenderplayer.app/Contents
|
||||
)
|
||||
|
||||
|
||||
install_dir(
|
||||
${PLAYER_SOURCEDIR}/Contents/Resources
|
||||
\${TARGETDIR}/blenderplayer.app/Contents/
|
||||
@@ -742,7 +742,7 @@ elseif(APPLE)
|
||||
COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
|
||||
COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
|
||||
DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
|
||||
|
||||
|
||||
# copy extracted python files
|
||||
install_dir(
|
||||
${CMAKE_CURRENT_BINARY_DIR}/python
|
||||
@@ -917,12 +917,12 @@ endif()
|
||||
message(STATUS "Blender Skipping: (${REM_MSG})")
|
||||
endif()
|
||||
target_link_libraries(blender ${BLENDER_SORTED_LIBS})
|
||||
|
||||
|
||||
unset(SEARCHLIB)
|
||||
unset(SORTLIB)
|
||||
unset(REMLIB)
|
||||
unset(REM_MSG)
|
||||
|
||||
|
||||
#else()
|
||||
# target_link_libraries(blender ${BLENDER_LINK_LIBS})
|
||||
#endif()
|
||||
|
Reference in New Issue
Block a user