[Bf-blender-cvs] [c9f87df] master: Correctly support non-portable case

[Antony Riakiotakis]

Commit: c9f87df47ff7a24411ae59d2550d86989fecd7a9
Author: Antony Riakiotakis
Date:   Thu Nov 13 13:52:20 2014 +0100
Branches: master
https://developer.blender.org/rBc9f87df47ff7a24411ae59d2550d86989fecd7a9

Correctly support non-portable case

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f11afab..3459030 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -371,7 +371,7 @@ 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(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)