Commit: 4d35ecc3bb48efe64713d8a1750c76f5f9f4f727
Author: Antony Riakiotakis
Date: Thu Nov 13 14:10:30 2014 +0100
Branches: master
https://developer.blender.org/rB4d35ecc3bb48efe64713d8a1750c76f5f9f4f727
Only do the portable fix on linux - thanks to Martijn Berger for
noticing!
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1babdcf..7f69baa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -378,14 +378,16 @@ 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 AND WITH_INSTALL_PORTABLE)
-if(MSVC)
- set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE
PATH "default install path" FORCE )
-elseif(APPLE)
- set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE
PATH "default install path" FORCE )
-else()
- set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH} CACHE PATH "default
install path" FORCE )
-endif()
+IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ if(MSVC)
+ set(CMAKE_INSTALL_PREFIX
${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE PATH "default install path"
FORCE )
+ elseif(APPLE)
+ set(CMAKE_INSTALL_PREFIX
${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE} CACHE PATH "default install path"
FORCE )
+ else()
+ if (WITH_INSTALL_PORTABLE)
+ set(CMAKE_INSTALL_PREFIX ${EXECUTABLE_OUTPUT_PATH}
CACHE PATH "default install path" FORCE )
+ endif()
+ endif()
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
