diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-11-11 23:44:26 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-11-11 23:44:26 +0300 |
| commit | c932edb578b85cd157be218a0a514979558b8dc5 (patch) | |
| tree | 04d94c9218d88d1ef843e9fda501025f853a4c92 /CMakeLists.txt | |
| parent | 8c227adb8cf880a13081eac06f4c79c108e7bb5b (diff) | |
Fix: T42553 Linux cmake install now also without absolute path's
OS X cmake probably needs more checking.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 260d797531d..f11afab87a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,16 +368,19 @@ if(MSVC) set(CPACK_INSTALL_PREFIX ${CMAKE_GENERIC_PROGRAM_FILES}/${}) endif() + # By default we want to install to the directory we are compiling our executables # unless specified otherwise, which we currently do not allow +IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(MSVC) - set(BLENDER_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}) + set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE PATH "default install path" FORCE ) elseif(APPLE) - set(BLENDER_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE}) + set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE PATH "default install path" FORCE ) else() - set(BLENDER_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}) + set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH} CACHE PATH "default install path" FORCE ) +endif() endif() -set(CMAKE_INSTALL_PREFIX ${BLENDER_INSTALL_PREFIX} CACHE INTERNAL "") + # Apple @@ -1692,6 +1695,12 @@ elseif(WIN32) endif() endif() + set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender") + set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender") + set(CPACK_WIX_LICENSE_RTF ${CMAKE_SOURCE_DIR}/release/text/GPL-license.rtf) + set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/source/icons/winblender.ico) + set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A") + elseif(APPLE) if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} STRGREATER "10.5") |