Correctly support non-portable case
authorAntony Riakiotakis <kalast@gmail.com>
Thu, 13 Nov 2014 12:52:20 +0000 (13:52 +0100)
committerAntony Riakiotakis <kalast@gmail.com>
Thu, 13 Nov 2014 12:52:20 +0000 (13:52 +0100)
CMakeLists.txt

index f11afab87a647275bbb1c9a19970bc4368791fea..3459030101a01c01a575da63d416c1239106b86d 100644 (file)
@@ -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)