CMake: use CMAKE_INSTALL_PREFIX for the install destination
Use the variable instead of "." for the install destination. While they're equivalent, it's not discoverable where the value for "." is set. It also results in paths containing "/./", while valid isn't so nice if the paths are copied from the terminal for use elsewhere.
This commit is contained in:
parent
848e808b8a
commit
7209ed80bb
|
@ -374,7 +374,7 @@ if(UNIX AND NOT APPLE)
|
|||
else()
|
||||
if(WITH_INSTALL_PORTABLE)
|
||||
set(TARGETDIR_VER ${BLENDER_VERSION})
|
||||
set(TARGETDIR_TEXT .)
|
||||
set(TARGETDIR_TEXT "${CMAKE_INSTALL_PREFIX}")
|
||||
set(TARGETDIR_LIB lib)
|
||||
else()
|
||||
set(TARGETDIR_VER share/blender/${BLENDER_VERSION})
|
||||
|
@ -391,9 +391,9 @@ elseif(WIN32)
|
|||
set(TARGETDIR_EXE ${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/bpy)
|
||||
else()
|
||||
set(TARGETDIR_VER ${BLENDER_VERSION})
|
||||
set(TARGETDIR_TEXT .)
|
||||
set(TARGETDIR_LIB ./blender.shared)
|
||||
set(TARGETDIR_EXE .)
|
||||
set(TARGETDIR_TEXT "${CMAKE_INSTALL_PREFIX}")
|
||||
set(TARGETDIR_LIB "${CMAKE_INSTALL_PREFIX}/blender.shared")
|
||||
set(TARGETDIR_EXE "${CMAKE_INSTALL_PREFIX}")
|
||||
endif()
|
||||
elseif(APPLE)
|
||||
if(WITH_PYTHON_MODULE)
|
||||
|
@ -636,7 +636,7 @@ if(UNIX AND NOT APPLE)
|
|||
elseif(WITH_INSTALL_PORTABLE)
|
||||
install(
|
||||
TARGETS blender
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
|
||||
install(
|
||||
|
@ -644,13 +644,13 @@ if(UNIX AND NOT APPLE)
|
|||
${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
|
||||
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
|
||||
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/symbolic/apps/blender-symbolic.svg
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
|
||||
if(WITH_BLENDER_THUMBNAILER)
|
||||
install(
|
||||
TARGETS blender-thumbnailer
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
endif()
|
||||
|
||||
|
@ -664,7 +664,7 @@ if(UNIX AND NOT APPLE)
|
|||
PROGRAMS
|
||||
${CMAKE_SOURCE_DIR}/release/bin/blender-launcher
|
||||
${CMAKE_SOURCE_DIR}/release/bin/blender-softwaregl
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
|
||||
# Remove from old location, so existing builds don't start with software
|
||||
|
@ -1020,11 +1020,15 @@ elseif(WIN32)
|
|||
# on the build-bot does not support this endeavor.
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/blender_public.pdb
|
||||
DESTINATION .
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
RENAME blender.pdb
|
||||
)
|
||||
else()
|
||||
install(FILES $<TARGET_PDB_FILE:blender> DESTINATION . RENAME blender.pdb)
|
||||
install(
|
||||
FILES $<TARGET_PDB_FILE:blender>
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
RENAME blender.pdb
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
@ -1245,14 +1249,14 @@ elseif(WIN32)
|
|||
install(
|
||||
FILES
|
||||
${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}.pdb
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
|
||||
)
|
||||
|
||||
install(
|
||||
FILES
|
||||
${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}_d.pdb
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
CONFIGURATIONS Debug
|
||||
)
|
||||
endif()
|
||||
|
@ -1350,7 +1354,7 @@ elseif(WIN32)
|
|||
${LIBDIR}/audaspace/lib/audaspace.dll
|
||||
${LIBDIR}/audaspace/lib/audaspace-c.dll
|
||||
${LIBDIR}/audaspace/lib/audaspace-py.dll
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
endif()
|
||||
|
||||
|
@ -1371,7 +1375,7 @@ elseif(WIN32)
|
|||
if(WITH_BLENDER_THUMBNAILER)
|
||||
install(
|
||||
TARGETS BlendThumb
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
endif()
|
||||
|
||||
|
@ -1432,7 +1436,7 @@ elseif(APPLE)
|
|||
|
||||
install(
|
||||
TARGETS blender
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
|
||||
install(
|
||||
|
@ -1747,7 +1751,7 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
|
|||
install(
|
||||
TARGETS blender blender-launcher
|
||||
COMPONENT Blender
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
set_target_properties(
|
||||
blender
|
||||
|
@ -1805,7 +1809,7 @@ endif()\n\
|
|||
if(WITH_INSTALL_PORTABLE)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/blender.1
|
||||
DESTINATION "."
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}"
|
||||
)
|
||||
else()
|
||||
# Manual page (only with `blender` binary).
|
||||
|
|
Loading…
Reference in New Issue