Skip to content

Commit 9f58b47

Browse files
committed
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.
1 parent fc692eb commit 9f58b47

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ before_script:
2222
- cd ${TRAVIS_BUILD_DIR}
2323
- mkdir -p bin/clBLAS
2424
- cd bin/clBLAS
25-
- cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TEST=OFF -DBUILD_CLIENT=ON ../../src
25+
- cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TEST=OFF -DBUILD_CLIENT=ON -DCMAKE_INSTALL_PREFIX:PATH=$PWD/package ../../src
2626

2727
script:
2828
- make install

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR} )
6767

6868
# On windows, it's convenient to change the default install prefix such that it does NOT point to 'program files' (permissions problems)
6969
# Need to check out CMAKE_RUNTIME_OUTPUT_DIRECTORY variable, and see if that eliminates the need to modify install path
70-
if( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
70+
if( WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT )
7171
set( CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/package" CACHE PATH "Install path prefix, prepended onto install directories" FORCE )
7272
endif( )
7373

0 commit comments

Comments
 (0)