[clfft] 06/107: use the default install prefix on unixes

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository clfft.

commit 2a3c219ae880d4cb3330fc043a8456f9b078b94d
Author: Gaëtan Lehmann <gaetan.lehmann at gmail.com>
Date:   Sun Feb 22 03:33:58 2015 +0100

    use the default install prefix on unixes
    
    as documented, this option mainly make sense on windows. On unixes, it is
    quite certainly not the expected behavior.
---
 .travis.yml        | 2 +-
 src/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0bb9d45..3a488ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_script:
   - cd ${TRAVIS_BUILD_DIR}
   - mkdir -p bin/clFFT
   - cd bin/clFFT
-  - cmake -DBoost_NO_SYSTEM_PATHS=OFF ../../src
+  - cmake -DBoost_NO_SYSTEM_PATHS=OFF -DCMAKE_INSTALL_PREFIX:PATH=$PWD/package ../../src
 
 script: 
   - make install
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d46c193..bc7e857 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,7 +56,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR} )
 
 # On windows, it's convenient to change the default install prefix such that it does NOT point to 'program files'
 # Need to check out CMAKE_RUNTIME_OUTPUT_DIRECTORY variable, and see if that eliminates the need to modify install path
-if( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
+if( WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
 	set( CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/package" CACHE PATH "Install path prefix, prepended onto install directories" FORCE )
 endif( )
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git